From 90278d0f6391b1cb4d24db5e58bc538045b0921d Mon Sep 17 00:00:00 2001 From: Max Pozdeev Date: Wed, 25 May 2022 23:26:27 +0300 Subject: [PATCH] remove unused docker containers for php 7.0 and 7.1 --- docker/dev/mtt-php70-apache/Dockerfile | 5 --- docker/dev/mtt-php70-apache/compose.yml | 14 -------- docker/dev/mtt-php70-apache/php-mtt.ini | 7 ---- docker/dev/mtt-php70-apache/php-opcache.ini | 34 ------------------- docker/dev/mtt-php71-apache-mariadb105/.env | 1 - docker/dev/mtt-php71-apache/.env | 1 - docker/dev/mtt-php71-apache/compose.yml | 16 --------- docker/dev/mtt-php71-apache/php-mtt.ini | 7 ---- docker/dev/mtt-php71-apache/php-opcache.ini | 34 ------------------- docker/dev/mtt-php72-apache-mariadb105/.env | 1 + .../compose.yml | 6 ++-- docker/dev/mtt-php72-apache/.env | 1 + docker/dev/mtt-php72-apache/Dockerfile | 5 --- .../Dockerfile-web | 7 ++-- docker/dev/mtt-php72-apache/compose.yml | 6 ++-- .../phpinfo.conf | 0 .../phpinfo.php | 0 17 files changed, 13 insertions(+), 132 deletions(-) delete mode 100644 docker/dev/mtt-php70-apache/Dockerfile delete mode 100644 docker/dev/mtt-php70-apache/compose.yml delete mode 100644 docker/dev/mtt-php70-apache/php-mtt.ini delete mode 100644 docker/dev/mtt-php70-apache/php-opcache.ini delete mode 100644 docker/dev/mtt-php71-apache-mariadb105/.env delete mode 100644 docker/dev/mtt-php71-apache/.env delete mode 100644 docker/dev/mtt-php71-apache/compose.yml delete mode 100644 docker/dev/mtt-php71-apache/php-mtt.ini delete mode 100644 docker/dev/mtt-php71-apache/php-opcache.ini create mode 100644 docker/dev/mtt-php72-apache-mariadb105/.env rename docker/dev/{mtt-php71-apache-mariadb105 => mtt-php72-apache-mariadb105}/compose.yml (79%) create mode 100644 docker/dev/mtt-php72-apache/.env delete mode 100644 docker/dev/mtt-php72-apache/Dockerfile rename docker/dev/{mtt-php71-apache => mtt-php72-apache}/Dockerfile-web (65%) rename docker/dev/{mtt-php71-apache => mtt-php72-apache}/phpinfo.conf (100%) rename docker/dev/{mtt-php71-apache => mtt-php72-apache}/phpinfo.php (100%) diff --git a/docker/dev/mtt-php70-apache/Dockerfile b/docker/dev/mtt-php70-apache/Dockerfile deleted file mode 100644 index eabcf3e..0000000 --- a/docker/dev/mtt-php70-apache/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ - -FROM php:7.0-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-php70-apache/compose.yml b/docker/dev/mtt-php70-apache/compose.yml deleted file mode 100644 index b5acbab..0000000 --- a/docker/dev/mtt-php70-apache/compose.yml +++ /dev/null @@ -1,14 +0,0 @@ -services: - web: - build: ./ - image: mytinytodo-dev:php7.0-apache - container_name: mtt-dev-php70-apache - ports: - - "8080:80" - environment: - - MTT_ENABLE_DEBUG=YES - - MTT_DB_TYPE=sqlite - volumes: - - ../../../src:/var/www/html - - ./php-mtt.ini:/usr/local/etc/php/conf.d/php-mtt.ini - - ./php-opcache.ini:/usr/local/etc/php/conf.d/php-opcache.ini diff --git a/docker/dev/mtt-php70-apache/php-mtt.ini b/docker/dev/mtt-php70-apache/php-mtt.ini deleted file mode 100644 index 34d3284..0000000 --- a/docker/dev/mtt-php70-apache/php-mtt.ini +++ /dev/null @@ -1,7 +0,0 @@ - -; Since PHP 5.4 E_STRICT is included in E_ALL -error_reporting = E_ALL - -log_errors = On -display_errors = On -display_startup_errors = On diff --git a/docker/dev/mtt-php70-apache/php-opcache.ini b/docker/dev/mtt-php70-apache/php-opcache.ini deleted file mode 100644 index 9e1abaa..0000000 --- a/docker/dev/mtt-php70-apache/php-opcache.ini +++ /dev/null @@ -1,34 +0,0 @@ -;; opcache.ini - -;; check /usr/local/etc/php/conf.d if exists docker-php-ext-opcache.ini - -; To disable opcache just comment this line -zend_extension=opcache.so - -[opcache] -opcache.enable=0 -opcache.enable_cli=0 - -; The size of the shared memory storage used by OPcache, in megabytes. The minimum permissible value is "8", which is enforced if a smaller value is set. -; Default is 128. -opcache.memory_consumption=128 - -; The maximum number of keys (and therefore scripts) in the OPcache hash table. -; The actual value used will be the first number in the set of prime numbers -; { 223, 463, 983, 1979, 3907, 7963, 16229, 32531, 65407, 130987, 262237, 524521, 1048793 } -; that is greater than or equal to the configured value. -; The minimum value is 200. The maximum value is 1000000. Values outside of this range are clamped to the permissible range. -; Default is 10000. -opcache.max_accelerated_files=1000 - -; How often to check script timestamps for updates, in seconds. 0 will result in OPcache checking for updates on every request. -; This configuration directive is ignored if opcache.validate_timestamps is disabled. -; Default is 2. -opcache.revalidate_freq=2 - -; If enabled, OPcache will check for updated scripts every opcache.revalidate_freq seconds. -; When this directive is disabled, you must reset OPcache manually via opcache_reset(), opcache_invalidate() -; or by restarting the Web server for changes to the filesystem to take effect. -; Default is 1. -;; Override in docker-compose -opcache.validate_timestamps=1 diff --git a/docker/dev/mtt-php71-apache-mariadb105/.env b/docker/dev/mtt-php71-apache-mariadb105/.env deleted file mode 100644 index e228575..0000000 --- a/docker/dev/mtt-php71-apache-mariadb105/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php71-apache-mariadb105 diff --git a/docker/dev/mtt-php71-apache/.env b/docker/dev/mtt-php71-apache/.env deleted file mode 100644 index 439049b..0000000 --- a/docker/dev/mtt-php71-apache/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php71-apache diff --git a/docker/dev/mtt-php71-apache/compose.yml b/docker/dev/mtt-php71-apache/compose.yml deleted file mode 100644 index 77239ff..0000000 --- a/docker/dev/mtt-php71-apache/compose.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: "3.9" - -services: - web: - build: - context: . - dockerfile: Dockerfile-web - image: mytinytodo-dev:php7.1-apache - container_name: ${PLATFORM_NAME}-web - ports: - - "8080:80" - environment: - - MTT_ENABLE_DEBUG=YES - - MTT_DB_TYPE=sqlite - volumes: - - ../../../src:/var/www/html diff --git a/docker/dev/mtt-php71-apache/php-mtt.ini b/docker/dev/mtt-php71-apache/php-mtt.ini deleted file mode 100644 index 34d3284..0000000 --- a/docker/dev/mtt-php71-apache/php-mtt.ini +++ /dev/null @@ -1,7 +0,0 @@ - -; Since PHP 5.4 E_STRICT is included in E_ALL -error_reporting = E_ALL - -log_errors = On -display_errors = On -display_startup_errors = On diff --git a/docker/dev/mtt-php71-apache/php-opcache.ini b/docker/dev/mtt-php71-apache/php-opcache.ini deleted file mode 100644 index 9e1abaa..0000000 --- a/docker/dev/mtt-php71-apache/php-opcache.ini +++ /dev/null @@ -1,34 +0,0 @@ -;; opcache.ini - -;; check /usr/local/etc/php/conf.d if exists docker-php-ext-opcache.ini - -; To disable opcache just comment this line -zend_extension=opcache.so - -[opcache] -opcache.enable=0 -opcache.enable_cli=0 - -; The size of the shared memory storage used by OPcache, in megabytes. The minimum permissible value is "8", which is enforced if a smaller value is set. -; Default is 128. -opcache.memory_consumption=128 - -; The maximum number of keys (and therefore scripts) in the OPcache hash table. -; The actual value used will be the first number in the set of prime numbers -; { 223, 463, 983, 1979, 3907, 7963, 16229, 32531, 65407, 130987, 262237, 524521, 1048793 } -; that is greater than or equal to the configured value. -; The minimum value is 200. The maximum value is 1000000. Values outside of this range are clamped to the permissible range. -; Default is 10000. -opcache.max_accelerated_files=1000 - -; How often to check script timestamps for updates, in seconds. 0 will result in OPcache checking for updates on every request. -; This configuration directive is ignored if opcache.validate_timestamps is disabled. -; Default is 2. -opcache.revalidate_freq=2 - -; If enabled, OPcache will check for updated scripts every opcache.revalidate_freq seconds. -; When this directive is disabled, you must reset OPcache manually via opcache_reset(), opcache_invalidate() -; or by restarting the Web server for changes to the filesystem to take effect. -; Default is 1. -;; Override in docker-compose -opcache.validate_timestamps=1 diff --git a/docker/dev/mtt-php72-apache-mariadb105/.env b/docker/dev/mtt-php72-apache-mariadb105/.env new file mode 100644 index 0000000..32d82cd --- /dev/null +++ b/docker/dev/mtt-php72-apache-mariadb105/.env @@ -0,0 +1 @@ +PLATFORM_NAME=mtt-dev-php72-apache-mariadb105 diff --git a/docker/dev/mtt-php71-apache-mariadb105/compose.yml b/docker/dev/mtt-php72-apache-mariadb105/compose.yml similarity index 79% rename from docker/dev/mtt-php71-apache-mariadb105/compose.yml rename to docker/dev/mtt-php72-apache-mariadb105/compose.yml index 2bf8343..e34af9d 100644 --- a/docker/dev/mtt-php71-apache-mariadb105/compose.yml +++ b/docker/dev/mtt-php72-apache-mariadb105/compose.yml @@ -7,9 +7,9 @@ networks: services: web: build: - context: ../mtt-php71-apache/ + context: ../mtt-php72-apache/ dockerfile: Dockerfile-web - image: mytinytodo-dev:php7.1-apache + image: mytinytodo-dev:php7.2-apache container_name: ${PLATFORM_NAME}-web ports: - "8080:80" @@ -24,6 +24,8 @@ services: - MTT_DB_DRIVER=mysqli volumes: - ../../../src:/var/www/html + - ../mtt-php72-apache/php-mtt.ini:/usr/local/etc/php/conf.d/php-mtt.ini + - ../mtt-php72-apache/php-opcache.ini:/usr/local/etc/php/conf.d/php-opcache.ini depends_on: - db networks: diff --git a/docker/dev/mtt-php72-apache/.env b/docker/dev/mtt-php72-apache/.env new file mode 100644 index 0000000..456326f --- /dev/null +++ b/docker/dev/mtt-php72-apache/.env @@ -0,0 +1 @@ +PLATFORM_NAME=mtt-dev-php72-apache diff --git a/docker/dev/mtt-php72-apache/Dockerfile b/docker/dev/mtt-php72-apache/Dockerfile deleted file mode 100644 index 839909c..0000000 --- a/docker/dev/mtt-php72-apache/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ - -FROM php:7.2-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-php71-apache/Dockerfile-web b/docker/dev/mtt-php72-apache/Dockerfile-web similarity index 65% rename from docker/dev/mtt-php71-apache/Dockerfile-web rename to docker/dev/mtt-php72-apache/Dockerfile-web index cb4ef24..9c094b6 100644 --- a/docker/dev/mtt-php71-apache/Dockerfile-web +++ b/docker/dev/mtt-php72-apache/Dockerfile-web @@ -1,11 +1,10 @@ - -FROM php:7.1-apache +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 -COPY php-mtt.ini /usr/local/etc/php/conf.d/ -COPY php-opcache.ini /usr/local/etc/php/conf.d/ +#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-php72-apache/compose.yml b/docker/dev/mtt-php72-apache/compose.yml index 6ebd533..c7f33f3 100644 --- a/docker/dev/mtt-php72-apache/compose.yml +++ b/docker/dev/mtt-php72-apache/compose.yml @@ -1,8 +1,10 @@ services: web: - build: ./ + build: + context: . + dockerfile: Dockerfile-web image: mytinytodo-dev:php7.2-apache - container_name: mtt-dev-php72-apache + container_name: ${PLATFORM_NAME}-web ports: - "8080:80" environment: diff --git a/docker/dev/mtt-php71-apache/phpinfo.conf b/docker/dev/mtt-php72-apache/phpinfo.conf similarity index 100% rename from docker/dev/mtt-php71-apache/phpinfo.conf rename to docker/dev/mtt-php72-apache/phpinfo.conf diff --git a/docker/dev/mtt-php71-apache/phpinfo.php b/docker/dev/mtt-php72-apache/phpinfo.php similarity index 100% rename from docker/dev/mtt-php71-apache/phpinfo.php rename to docker/dev/mtt-php72-apache/phpinfo.php