From ed31e2eaff6992a4c426d82e881eb1f89861201b Mon Sep 17 00:00:00 2001 From: maxpozdeev Date: Sun, 10 Jul 2022 17:04:36 +0300 Subject: [PATCH] update dev docker files; use mariadb 10.8 with php 8.1 --- docker/dev/_mariadb108/Dockerfile-db | 3 +++ docker/dev/_mariadb108/my.cnf | 4 ++++ docker/dev/mtt-php72-apache/Dockerfile-web | 3 ++- docker/dev/mtt-php74-apache/.env | 1 + docker/dev/mtt-php74-apache/Dockerfile | 5 ----- docker/dev/mtt-php74-apache/Dockerfile-web | 11 +++++++++++ docker/dev/mtt-php74-apache/compose.yml | 6 ++++-- docker/dev/mtt-php80-apache/Dockerfile-web | 4 ++-- docker/dev/mtt-php81-apache-mariadb105/.env | 1 - docker/dev/mtt-php81-apache-mariadb108/.env | 1 + .../compose.yml | 6 +++--- docker/dev/mtt-php81-apache/Dockerfile-web | 4 ++-- 12 files changed, 33 insertions(+), 16 deletions(-) create mode 100644 docker/dev/_mariadb108/Dockerfile-db create mode 100644 docker/dev/_mariadb108/my.cnf create mode 100644 docker/dev/mtt-php74-apache/.env delete mode 100644 docker/dev/mtt-php74-apache/Dockerfile create mode 100644 docker/dev/mtt-php74-apache/Dockerfile-web delete mode 100644 docker/dev/mtt-php81-apache-mariadb105/.env create mode 100644 docker/dev/mtt-php81-apache-mariadb108/.env rename docker/dev/{mtt-php81-apache-mariadb105 => mtt-php81-apache-mariadb108}/compose.yml (88%) diff --git a/docker/dev/_mariadb108/Dockerfile-db b/docker/dev/_mariadb108/Dockerfile-db new file mode 100644 index 0000000..54655fb --- /dev/null +++ b/docker/dev/_mariadb108/Dockerfile-db @@ -0,0 +1,3 @@ +FROM mariadb:10.8 + +COPY my.cnf /etc/mysql/conf.d/ diff --git a/docker/dev/_mariadb108/my.cnf b/docker/dev/_mariadb108/my.cnf new file mode 100644 index 0000000..fa9302b --- /dev/null +++ b/docker/dev/_mariadb108/my.cnf @@ -0,0 +1,4 @@ +[mysqld] +collation-server = utf8mb4_unicode_ci +character-set-server = utf8mb4 +innodb_log_file_size=10M diff --git a/docker/dev/mtt-php72-apache/Dockerfile-web b/docker/dev/mtt-php72-apache/Dockerfile-web index 9c094b6..26b58b2 100644 --- a/docker/dev/mtt-php72-apache/Dockerfile-web +++ b/docker/dev/mtt-php72-apache/Dockerfile-web @@ -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/ diff --git a/docker/dev/mtt-php74-apache/.env b/docker/dev/mtt-php74-apache/.env new file mode 100644 index 0000000..9129463 --- /dev/null +++ b/docker/dev/mtt-php74-apache/.env @@ -0,0 +1 @@ +PLATFORM_NAME=mtt-dev-php74-apache diff --git a/docker/dev/mtt-php74-apache/Dockerfile b/docker/dev/mtt-php74-apache/Dockerfile deleted file mode 100644 index 5a8ac07..0000000 --- a/docker/dev/mtt-php74-apache/Dockerfile +++ /dev/null @@ -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" diff --git a/docker/dev/mtt-php74-apache/Dockerfile-web b/docker/dev/mtt-php74-apache/Dockerfile-web new file mode 100644 index 0000000..08ecd29 --- /dev/null +++ b/docker/dev/mtt-php74-apache/Dockerfile-web @@ -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/ diff --git a/docker/dev/mtt-php74-apache/compose.yml b/docker/dev/mtt-php74-apache/compose.yml index 8cf2f2a..a3b165f 100644 --- a/docker/dev/mtt-php74-apache/compose.yml +++ b/docker/dev/mtt-php74-apache/compose.yml @@ -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: diff --git a/docker/dev/mtt-php80-apache/Dockerfile-web b/docker/dev/mtt-php80-apache/Dockerfile-web index 30da7c6..e80fa8a 100644 --- a/docker/dev/mtt-php80-apache/Dockerfile-web +++ b/docker/dev/mtt-php80-apache/Dockerfile-web @@ -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/ diff --git a/docker/dev/mtt-php81-apache-mariadb105/.env b/docker/dev/mtt-php81-apache-mariadb105/.env deleted file mode 100644 index 9951702..0000000 --- a/docker/dev/mtt-php81-apache-mariadb105/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php81-apache-mariadb105 diff --git a/docker/dev/mtt-php81-apache-mariadb108/.env b/docker/dev/mtt-php81-apache-mariadb108/.env new file mode 100644 index 0000000..cf81ec9 --- /dev/null +++ b/docker/dev/mtt-php81-apache-mariadb108/.env @@ -0,0 +1 @@ +PLATFORM_NAME=mtt-dev-php81-apache-mariadb108 diff --git a/docker/dev/mtt-php81-apache-mariadb105/compose.yml b/docker/dev/mtt-php81-apache-mariadb108/compose.yml similarity index 88% rename from docker/dev/mtt-php81-apache-mariadb105/compose.yml rename to docker/dev/mtt-php81-apache-mariadb108/compose.yml index 8e3b511..edb2276 100644 --- a/docker/dev/mtt-php81-apache-mariadb105/compose.yml +++ b/docker/dev/mtt-php81-apache-mariadb108/compose.yml @@ -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 diff --git a/docker/dev/mtt-php81-apache/Dockerfile-web b/docker/dev/mtt-php81-apache/Dockerfile-web index 9b48b2d..79ed7d6 100644 --- a/docker/dev/mtt-php81-apache/Dockerfile-web +++ b/docker/dev/mtt-php81-apache/Dockerfile-web @@ -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/