update dev docker files; use mariadb 10.8 with php 8.1

This commit is contained in:
maxpozdeev 2022-07-10 17:04:36 +03:00
parent ffa6bc0740
commit ed31e2eaff
12 changed files with 33 additions and 16 deletions

View file

@ -0,0 +1,3 @@
FROM mariadb:10.8
COPY my.cnf /etc/mysql/conf.d/

View file

@ -0,0 +1,4 @@
[mysqld]
collation-server = utf8mb4_unicode_ci
character-set-server = utf8mb4
innodb_log_file_size=10M

View file

@ -2,7 +2,8 @@ FROM php:7.2-apache
RUN docker-php-ext-install mysqli && \
mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
mkdir /var/www/phpinfo
mkdir /var/www/phpinfo && \
a2enmod rewrite
#COPY php-mtt.ini /usr/local/etc/php/conf.d/
#COPY php-opcache.ini /usr/local/etc/php/conf.d/

View file

@ -0,0 +1 @@
PLATFORM_NAME=mtt-dev-php74-apache

View file

@ -1,5 +0,0 @@
FROM php:7.4-apache
RUN docker-php-ext-install mysqli && \
mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"

View file

@ -0,0 +1,11 @@
FROM php:7.4-apache
RUN docker-php-ext-install mysqli && \
mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
mkdir /var/www/phpinfo && \
a2enmod rewrite
#COPY php-mtt.ini /usr/local/etc/php/conf.d/
#COPY php-opcache.ini /usr/local/etc/php/conf.d/
COPY phpinfo.conf /etc/apache2/conf-enabled/
COPY phpinfo.php /var/www/phpinfo/

View file

@ -1,8 +1,10 @@
services:
web:
build: ./
build:
context: .
dockerfile: Dockerfile-web
image: mytinytodo-dev:php7.4-apache
container_name: mtt-dev-php74-apache
container_name: ${PLATFORM_NAME}-web
ports:
- "8080:80"
environment:

View file

@ -1,9 +1,9 @@
FROM php:8.0-apache
RUN docker-php-ext-install mysqli && \
mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
mkdir /var/www/phpinfo
mkdir /var/www/phpinfo && \
a2enmod rewrite
COPY php-mtt.ini /usr/local/etc/php/conf.d/
COPY php-opcache.ini /usr/local/etc/php/conf.d/

View file

@ -1 +0,0 @@
PLATFORM_NAME=mtt-dev-php81-apache-mariadb105

View file

@ -0,0 +1 @@
PLATFORM_NAME=mtt-dev-php81-apache-mariadb108

View file

@ -31,9 +31,9 @@ services:
db:
build:
context: ../_mariadb105
context: ../_mariadb108
dockerfile: Dockerfile-db
image: mytinytodo-dev:mariadb10.5
image: mytinytodo-dev:mariadb10.8
container_name: ${PLATFORM_NAME}-db
#restart: always
environment:
@ -42,6 +42,6 @@ services:
MARIADB_PASSWORD: mtt
MARIADB_DATABASE: mytinytodo
volumes:
- ../_mariadb105/db_data:/var/lib/mysql
- ../_mariadb108/db_data:/var/lib/mysql
networks:
- network

View file

@ -1,9 +1,9 @@
FROM php:8.1-apache
RUN docker-php-ext-install mysqli && \
mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
mkdir /var/www/phpinfo
mkdir /var/www/phpinfo && \
a2enmod rewrite
COPY php-mtt.ini /usr/local/etc/php/conf.d/
COPY php-opcache.ini /usr/local/etc/php/conf.d/