diff --git a/docker/dev/.gitignore b/docker/dev/.gitignore deleted file mode 100644 index 369ea15..0000000 --- a/docker/dev/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*/db_data diff --git a/docker/dev/_mariadb100/my.cnf b/docker/dev/_mariadb100/my.cnf deleted file mode 100644 index fa9302b..0000000 --- a/docker/dev/_mariadb100/my.cnf +++ /dev/null @@ -1,4 +0,0 @@ -[mysqld] -collation-server = utf8mb4_unicode_ci -character-set-server = utf8mb4 -innodb_log_file_size=10M diff --git a/docker/dev/_mariadb105/my.cnf b/docker/dev/_mariadb105/my.cnf deleted file mode 100644 index fa9302b..0000000 --- a/docker/dev/_mariadb105/my.cnf +++ /dev/null @@ -1,4 +0,0 @@ -[mysqld] -collation-server = utf8mb4_unicode_ci -character-set-server = utf8mb4 -innodb_log_file_size=10M diff --git a/docker/dev/_mariadb108/my.cnf b/docker/dev/_mariadb108/my.cnf deleted file mode 100644 index fa9302b..0000000 --- a/docker/dev/_mariadb108/my.cnf +++ /dev/null @@ -1,4 +0,0 @@ -[mysqld] -collation-server = utf8mb4_unicode_ci -character-set-server = utf8mb4 -innodb_log_file_size=10M diff --git a/docker/dev/_nginx/Dockerfile-angie-alpine b/docker/dev/_nginx/Dockerfile-angie-alpine deleted file mode 100644 index 12250a6..0000000 --- a/docker/dev/_nginx/Dockerfile-angie-alpine +++ /dev/null @@ -1,23 +0,0 @@ -FROM alpine:latest - -RUN set -x \ - && apk add --no-cache ca-certificates curl \ - && curl -o /etc/apk/keys/angie-signing.rsa https://angie.software/keys/angie-signing.rsa \ - && echo "https://download.angie.software/angie/alpine/v$(egrep -o '[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \ - && apk add --no-cache angie \ - && rm /etc/apk/keys/angie-signing.rsa \ - && ln -sf /dev/stdout /var/log/angie/access.log \ - && ln -sf /dev/stderr /var/log/angie/error.log - -EXPOSE 80 -CMD ["angie", "-g", "daemon off;"] - - -RUN mv /etc/angie/http.d/default.conf /etc/angie/http.d/default.conf.bak \ - && mkdir /var/log/nginx \ - && ln -sf /var/log/angie/access.log /var/log/nginx/access.log - -# config from nginx -COPY default.conf /etc/angie/http.d/default.conf - -VOLUME /var/www/html diff --git a/docker/dev/_nginx/Dockerfile-nginx b/docker/dev/_nginx/Dockerfile-nginx deleted file mode 100644 index 84b70a0..0000000 --- a/docker/dev/_nginx/Dockerfile-nginx +++ /dev/null @@ -1,5 +0,0 @@ -FROM nginx:latest - -COPY default.conf /etc/nginx/conf.d/ - -VOLUME /var/www/html diff --git a/docker/dev/_nginx/Dockerfile-nginx-alpine b/docker/dev/_nginx/Dockerfile-nginx-alpine deleted file mode 100644 index 1312e5b..0000000 --- a/docker/dev/_nginx/Dockerfile-nginx-alpine +++ /dev/null @@ -1,5 +0,0 @@ -FROM nginx:alpine - -COPY default.conf /etc/nginx/conf.d/ - -VOLUME /var/www/html diff --git a/docker/dev/_nginx/default.conf b/docker/dev/_nginx/default.conf deleted file mode 100644 index 403e02c..0000000 --- a/docker/dev/_nginx/default.conf +++ /dev/null @@ -1,59 +0,0 @@ -# format like 'main' excluding user agent -log_format mtt '$time_local "$request" $status $body_bytes_sent "$http_referer"'; -log_format mtt2 '$remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer"'; -access_log off; - -upstream fpm { - server fpm:9000; -} - -server { - listen 80; - server_name localhost; - root /var/www/html; # same as php-fpm - - access_log /var/log/nginx/access.log mtt; - - index index.php index.html; - autoindex off; - - location = /phpinfo { - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME /var/www/phpinfo/phpinfo.php; - fastcgi_pass fpm; - } - - location /api/ { - rewrite ^/api/(.*) /api.php/$1 last; - } - - location / { - try_files $uri $uri/ =404; - } - - location ~ [^/]\.php(/|$) { - - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_index index.php; - fastcgi_pass fpm; - } - - location /db/ { - return 404; #deny all - } - - location /includes/ { - return 404; #deny all - } - - location ~ /\.ht { - return 404; #deny all - } - -} diff --git a/docker/dev/mtt-php72-angie-postgres10/.env b/docker/dev/mtt-php72-angie-postgres10/.env deleted file mode 100644 index b32391f..0000000 --- a/docker/dev/mtt-php72-angie-postgres10/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php72-angie-postgres10 diff --git a/docker/dev/mtt-php72-angie-postgres10/Dockerfile-fpm b/docker/dev/mtt-php72-angie-postgres10/Dockerfile-fpm deleted file mode 100644 index 49c5b6d..0000000 --- a/docker/dev/mtt-php72-angie-postgres10/Dockerfile-fpm +++ /dev/null @@ -1,17 +0,0 @@ -FROM php:7.2-fpm-alpine - -RUN apk add --update-cache libpq postgresql-dev && \ - docker-php-ext-install pdo_mysql pdo_pgsql && \ - apk del postgresql-dev && rm -rf /var/cache/apk/* && \ - mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \ - mkdir /var/www/phpinfo && \ - echo " /var/www/phpinfo/phpinfo.php && \ - curl -o /usr/local/bin/phpunit -fL "https://phar.phpunit.de/phpunit-8.phar" && \ - chmod +x /usr/local/bin/phpunit && \ - ln -s html /var/www/src - -COPY php-mtt.ini /usr/local/etc/php/conf.d/ -COPY php-opcache.ini /usr/local/etc/php/conf.d/ -COPY php-fpm-www.conf /usr/local/etc/php-fpm.d/www.conf - -VOLUME /var/www/html diff --git a/docker/dev/mtt-php72-angie-postgres10/compose.yml b/docker/dev/mtt-php72-angie-postgres10/compose.yml deleted file mode 100644 index 88f91df..0000000 --- a/docker/dev/mtt-php72-angie-postgres10/compose.yml +++ /dev/null @@ -1,58 +0,0 @@ -version: "3.9" - -networks: - network: - name: "${PLATFORM_NAME}-network" - -services: - web: - build: - context: ../_nginx - dockerfile: Dockerfile-angie-alpine - image: mtt-dev/angie:alpine - container_name: ${PLATFORM_NAME}-web - ports: - - "8080:80" - volumes: - - ../../../src:/var/www/html - depends_on: - - fpm - networks: - - network - - fpm: - build: - context: . - dockerfile: Dockerfile-fpm - image: mtt-dev/php:7.2-fpm-alpine - container_name: ${PLATFORM_NAME}-fpm - environment: - - MTT_ENABLE_DEBUG=YES - - MTT_DB_TYPE=postgres - - MTT_API_USE_PATH_INFO=YES - - MTT_DB_HOST=db - - MTT_DB_NAME=mtt - - MTT_DB_USER=mtt - - MTT_DB_PASSWORD=mtt - - MTT_DB_PREFIX=mtt_ - volumes: - - ../../../src:/var/www/html - - ../../../tests:/var/www/tests - - ./php-mtt.ini:/usr/local/etc/php/conf.d/php-mtt.ini - - ./php-opcache.ini:/usr/local/etc/php/conf.d/php-opcache.ini - networks: - - network - - db: - # do not use alpine image due to missing locales - image: postgres:10.0 - container_name: ${PLATFORM_NAME}-db - userns_mode: keep-id - environment: - POSTGRES_PASSWORD: mtt - POSTGRES_USER: mtt - POSTGRES_DB: mtt - volumes: - - ../_postgres10/db_data:/var/lib/postgresql/data - networks: - - network diff --git a/docker/dev/mtt-php72-angie-postgres10/php-fpm-www.conf b/docker/dev/mtt-php72-angie-postgres10/php-fpm-www.conf deleted file mode 100644 index c8c06bd..0000000 --- a/docker/dev/mtt-php72-angie-postgres10/php-fpm-www.conf +++ /dev/null @@ -1,13 +0,0 @@ -[www] -user = www-data -group = www-data -listen = 127.0.0.1:9000 -pm = dynamic -pm.max_children = 5 -pm.start_servers = 2 -pm.min_spare_servers = 1 -pm.max_spare_servers = 3 -pm.max_requests = 500 - -access.format = "%R - %u [%t] \"%m %r\" %s %f" -access.log = /dev/null diff --git a/docker/dev/mtt-php72-angie-postgres10/php-mtt.ini b/docker/dev/mtt-php72-angie-postgres10/php-mtt.ini deleted file mode 100644 index f9b6186..0000000 --- a/docker/dev/mtt-php72-angie-postgres10/php-mtt.ini +++ /dev/null @@ -1,10 +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 - -cgi.fix_pathinfo=0 -session.gc_divisor = 100 diff --git a/docker/dev/mtt-php72-angie-postgres10/php-opcache.ini b/docker/dev/mtt-php72-angie-postgres10/php-opcache.ini deleted file mode 100644 index 2866d5c..0000000 --- a/docker/dev/mtt-php72-angie-postgres10/php-opcache.ini +++ /dev/null @@ -1,42 +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=1 -opcache.enable_cli=1 - -; JIT will work only if opcache is enabled and jit_buffer_size is not zero. -; To disable JIT set the buffer size to 0. -opcache.jit_buffer_size=64M - -; JIT mode. Read more at https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.jit -; Default is tracing. -opcache.jit=tracing - -; 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-mariadb100/.env b/docker/dev/mtt-php72-apache-mariadb100/.env deleted file mode 100644 index ebb4320..0000000 --- a/docker/dev/mtt-php72-apache-mariadb100/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php72-apache-mariadb100 diff --git a/docker/dev/mtt-php72-apache-mariadb100/compose.yml b/docker/dev/mtt-php72-apache-mariadb100/compose.yml deleted file mode 100644 index 84e0c7b..0000000 --- a/docker/dev/mtt-php72-apache-mariadb100/compose.yml +++ /dev/null @@ -1,47 +0,0 @@ -version: "3.9" - -networks: - network: - name: "${PLATFORM_NAME}-network" - -services: - web: - build: - context: ../mtt-php72-apache/ - dockerfile: Dockerfile-web - image: mtt-dev/php:7.2-apache - container_name: ${PLATFORM_NAME}-web - ports: - - "8080:80" - environment: - - MTT_ENABLE_DEBUG=YES - - MTT_DB_TYPE=mysql - - MTT_DB_HOST=db - - MTT_DB_NAME=mytinytodo - - MTT_DB_USER=mtt - - MTT_DB_PASSWORD=mtt - - MTT_DB_PREFIX=mtt_ - - 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: - - network - - db: - image: mariadb:10.0.15 - container_name: ${PLATFORM_NAME}-db - #restart: always - environment: - MYSQL_ROOT_PASSWORD: JustForDev - MYSQL_USER: mtt - MYSQL_PASSWORD: mtt - MYSQL_DATABASE: mytinytodo - volumes: - - ../_mariadb100/my.cnf:/etc/mysql/conf.d/my.cnf - - ../_mariadb100/db_data:/var/lib/mysql - networks: - - network diff --git a/docker/dev/mtt-php72-apache-mariadb105/.env b/docker/dev/mtt-php72-apache-mariadb105/.env deleted file mode 100644 index 32d82cd..0000000 --- a/docker/dev/mtt-php72-apache-mariadb105/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php72-apache-mariadb105 diff --git a/docker/dev/mtt-php72-apache-mariadb105/compose.yml b/docker/dev/mtt-php72-apache-mariadb105/compose.yml deleted file mode 100644 index fd8c7dc..0000000 --- a/docker/dev/mtt-php72-apache-mariadb105/compose.yml +++ /dev/null @@ -1,47 +0,0 @@ -version: "3.9" - -networks: - network: - name: "${PLATFORM_NAME}-network" - -services: - web: - build: - context: ../mtt-php72-apache/ - dockerfile: Dockerfile-web - image: mtt-dev/php:7.2-apache - container_name: ${PLATFORM_NAME}-web - ports: - - "8080:80" - environment: - - MTT_ENABLE_DEBUG=YES - - MTT_DB_TYPE=mysql - - MTT_DB_HOST=db - - MTT_DB_NAME=mytinytodo - - MTT_DB_USER=mtt - - MTT_DB_PASSWORD=mtt - - MTT_DB_PREFIX=mtt_ - - 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: - - network - - db: - image: mariadb:10.5 - container_name: ${PLATFORM_NAME}-db - #restart: always - environment: - MARIADB_ROOT_PASSWORD: JustForDev - MARIADB_USER: mtt - MARIADB_PASSWORD: mtt - MARIADB_DATABASE: mytinytodo - volumes: - - ../_mariadb105/my.cnf:/etc/mysql/conf.d/my.cnf - - ../_mariadb105/db_data:/var/lib/mysql - networks: - - network diff --git a/docker/dev/mtt-php72-apache-postgres10/.env b/docker/dev/mtt-php72-apache-postgres10/.env deleted file mode 100644 index 927f4f3..0000000 --- a/docker/dev/mtt-php72-apache-postgres10/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php72-apache-postgres10 diff --git a/docker/dev/mtt-php72-apache-postgres10/compose.yml b/docker/dev/mtt-php72-apache-postgres10/compose.yml deleted file mode 100644 index e1b0e71..0000000 --- a/docker/dev/mtt-php72-apache-postgres10/compose.yml +++ /dev/null @@ -1,45 +0,0 @@ -version: "3.9" - -networks: - network: - name: "${PLATFORM_NAME}-network" - -services: - web: - build: - context: ../mtt-php72-apache/ - dockerfile: Dockerfile-web - image: mtt-dev/php:7.2-apache - container_name: ${PLATFORM_NAME}-web - ports: - - "8080:80" - environment: - - MTT_ENABLE_DEBUG=YES - - MTT_DB_TYPE=postgres - - MTT_DB_HOST=db - - MTT_DB_NAME=mtt - - MTT_DB_USER=mtt - - MTT_DB_PASSWORD=mtt - - MTT_DB_PREFIX=mtt_ - 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: - - network - - db: - # do not use alpine image due to missing locales - image: postgres:10.0 - container_name: ${PLATFORM_NAME}-db - userns_mode: keep-id - environment: - POSTGRES_PASSWORD: mtt - POSTGRES_USER: mtt - POSTGRES_DB: mtt - volumes: - - ../_postgres10/db_data:/var/lib/postgresql/data - networks: - - network diff --git a/docker/dev/mtt-php72-apache/.env b/docker/dev/mtt-php72-apache/.env deleted file mode 100644 index 456326f..0000000 --- a/docker/dev/mtt-php72-apache/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php72-apache diff --git a/docker/dev/mtt-php72-apache/Dockerfile-web b/docker/dev/mtt-php72-apache/Dockerfile-web deleted file mode 100644 index ee64439..0000000 --- a/docker/dev/mtt-php72-apache/Dockerfile-web +++ /dev/null @@ -1,18 +0,0 @@ -FROM php:7.2-apache-buster - -RUN apt-get update && apt-get install -y libpq5 libpq-dev && \ - docker-php-ext-install mysqli pdo_pgsql && \ - apt-get remove -y libpq-dev && apt-get -y autoremove && \ - mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \ - mkdir /var/www/phpinfo && \ - echo " /var/www/phpinfo/phpinfo.php && \ - echo 'Alias "/phpinfo" "/var/www/phpinfo/phpinfo.php"' > /etc/apache2/conf-enabled/phpinfo.conf && \ - echo 'LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\"" combined' > /etc/apache2/conf-enabled/logformat.conf && \ - a2enmod rewrite && \ - curl -o /usr/local/bin/phpunit -fL "https://phar.phpunit.de/phpunit-8.phar" && \ - chmod +x /usr/local/bin/phpunit && \ - ln -s html /var/www/src - - -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-php72-apache/compose.yml b/docker/dev/mtt-php72-apache/compose.yml deleted file mode 100644 index 5244805..0000000 --- a/docker/dev/mtt-php72-apache/compose.yml +++ /dev/null @@ -1,17 +0,0 @@ -services: - web: - build: - context: . - dockerfile: Dockerfile-web - image: mtt-dev/php:7.2-apache - container_name: ${PLATFORM_NAME}-web - ports: - - "8080:80" - environment: - - MTT_ENABLE_DEBUG=YES - - MTT_DB_TYPE=sqlite - volumes: - - ../../../src:/var/www/html - - ../../../tests:/var/www/tests - - ./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-php72-apache/php-mtt.ini b/docker/dev/mtt-php72-apache/php-mtt.ini deleted file mode 100644 index c6b0ee0..0000000 --- a/docker/dev/mtt-php72-apache/php-mtt.ini +++ /dev/null @@ -1,11 +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 - -session.gc_divisor = 100 - -allow_url_fopen=1 diff --git a/docker/dev/mtt-php72-apache/php-opcache.ini b/docker/dev/mtt-php72-apache/php-opcache.ini deleted file mode 100644 index 9e1abaa..0000000 --- a/docker/dev/mtt-php72-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-php74-apache/.env b/docker/dev/mtt-php74-apache/.env deleted file mode 100644 index 9129463..0000000 --- a/docker/dev/mtt-php74-apache/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php74-apache diff --git a/docker/dev/mtt-php74-apache/Dockerfile-web b/docker/dev/mtt-php74-apache/Dockerfile-web deleted file mode 100644 index ae0093d..0000000 --- a/docker/dev/mtt-php74-apache/Dockerfile-web +++ /dev/null @@ -1,15 +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" && \ - mkdir /var/www/phpinfo && \ - echo " /var/www/phpinfo/phpinfo.php && \ - echo 'Alias "/phpinfo" "/var/www/phpinfo/phpinfo.php"' > /etc/apache2/conf-enabled/phpinfo.conf && \ - echo 'LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\"" combined' > /etc/apache2/conf-enabled/logformat.conf && \ - a2enmod rewrite && \ - curl -o /usr/local/bin/phpunit -fL "https://phar.phpunit.de/phpunit-9.phar" && \ - chmod +x /usr/local/bin/phpunit && \ - ln -s html /var/www/src - -#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/compose.yml b/docker/dev/mtt-php74-apache/compose.yml deleted file mode 100644 index 48dca4f..0000000 --- a/docker/dev/mtt-php74-apache/compose.yml +++ /dev/null @@ -1,17 +0,0 @@ -services: - web: - build: - context: . - dockerfile: Dockerfile-web - image: mtt-dev/php:7.4-apache - container_name: ${PLATFORM_NAME}-web - ports: - - "8080:80" - environment: - - MTT_ENABLE_DEBUG=YES - - MTT_DB_TYPE=sqlite - volumes: - - ../../../src:/var/www/html - - ../../../tests:/var/www/tests - - ./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-php74-apache/php-mtt.ini b/docker/dev/mtt-php74-apache/php-mtt.ini deleted file mode 100644 index 5503e6a..0000000 --- a/docker/dev/mtt-php74-apache/php-mtt.ini +++ /dev/null @@ -1,9 +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 - -session.gc_divisor = 100 diff --git a/docker/dev/mtt-php74-apache/php-opcache.ini b/docker/dev/mtt-php74-apache/php-opcache.ini deleted file mode 100644 index 9e1abaa..0000000 --- a/docker/dev/mtt-php74-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-php74-nginx/.env b/docker/dev/mtt-php74-nginx/.env deleted file mode 100644 index 138fba2..0000000 --- a/docker/dev/mtt-php74-nginx/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php74-nginx diff --git a/docker/dev/mtt-php74-nginx/Dockerfile-fpm b/docker/dev/mtt-php74-nginx/Dockerfile-fpm deleted file mode 100644 index df1bf3d..0000000 --- a/docker/dev/mtt-php74-nginx/Dockerfile-fpm +++ /dev/null @@ -1,11 +0,0 @@ -FROM php:7.4-fpm - -RUN docker-php-ext-install mysqli && \ - mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \ - mkdir /var/www/phpinfo && \ - echo " /var/www/phpinfo/phpinfo.php - -#COPY php-mtt.ini /usr/local/etc/php/conf.d/ -#COPY php-opcache.ini /usr/local/etc/php/conf.d/ - -VOLUME /var/www/html diff --git a/docker/dev/mtt-php74-nginx/compose.yml b/docker/dev/mtt-php74-nginx/compose.yml deleted file mode 100644 index 2186d16..0000000 --- a/docker/dev/mtt-php74-nginx/compose.yml +++ /dev/null @@ -1,37 +0,0 @@ -version: "3.9" - -networks: - network: - name: "${PLATFORM_NAME}-network" - -services: - web: - build: - context: ../_nginx - dockerfile: Dockerfile-nginx - image: mtt-dev/nginx - container_name: ${PLATFORM_NAME}-web - ports: - - "8080:80" - volumes: - - ../../../src:/var/www/html - depends_on: - - fpm - networks: - - network - - fpm: - build: - context: . - dockerfile: Dockerfile-fpm - image: mtt-dev/php:7.4-fpm - container_name: ${PLATFORM_NAME}-fpm - 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 - networks: - - network diff --git a/docker/dev/mtt-php74-nginx/php-mtt.ini b/docker/dev/mtt-php74-nginx/php-mtt.ini deleted file mode 100644 index 03afd85..0000000 --- a/docker/dev/mtt-php74-nginx/php-mtt.ini +++ /dev/null @@ -1,10 +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 - -session.gc_divisor = 100 -cgi.fix_pathinfo=0 \ No newline at end of file diff --git a/docker/dev/mtt-php74-nginx/php-opcache.ini b/docker/dev/mtt-php74-nginx/php-opcache.ini deleted file mode 100644 index 2866d5c..0000000 --- a/docker/dev/mtt-php74-nginx/php-opcache.ini +++ /dev/null @@ -1,42 +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=1 -opcache.enable_cli=1 - -; JIT will work only if opcache is enabled and jit_buffer_size is not zero. -; To disable JIT set the buffer size to 0. -opcache.jit_buffer_size=64M - -; JIT mode. Read more at https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.jit -; Default is tracing. -opcache.jit=tracing - -; 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-php80-apache-mariadb105/.env b/docker/dev/mtt-php80-apache-mariadb105/.env deleted file mode 100644 index a3961ac..0000000 --- a/docker/dev/mtt-php80-apache-mariadb105/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php80-apache-mariadb105 diff --git a/docker/dev/mtt-php80-apache-mariadb105/compose.yml b/docker/dev/mtt-php80-apache-mariadb105/compose.yml deleted file mode 100644 index 8230c5c..0000000 --- a/docker/dev/mtt-php80-apache-mariadb105/compose.yml +++ /dev/null @@ -1,45 +0,0 @@ -version: "3.9" - -networks: - network: - name: "${PLATFORM_NAME}-network" - -services: - web: - build: - context: ../mtt-php80-apache/ - dockerfile: Dockerfile-web - image: mtt-dev/php:8.0-apache - container_name: ${PLATFORM_NAME}-web - ports: - - "8080:80" - environment: - - MTT_ENABLE_DEBUG=YES - - MTT_DB_TYPE=mysql - - MTT_DB_HOST=db - - MTT_DB_NAME=mytinytodo - - MTT_DB_USER=mtt - - MTT_DB_PASSWORD=mtt - - MTT_DB_PREFIX=mtt_ - - MTT_DB_DRIVER=mysqli - volumes: - - ../../../src:/var/www/html - depends_on: - - db - networks: - - network - - db: - image: mariadb:10.5 - container_name: ${PLATFORM_NAME}-db - #restart: always - environment: - MARIADB_ROOT_PASSWORD: JustForDev - MARIADB_USER: mtt - MARIADB_PASSWORD: mtt - MARIADB_DATABASE: mytinytodo - volumes: - - ../_mariadb105/my.cnf:/etc/mysql/conf.d/my.cnf - - ../_mariadb105/db_data:/var/lib/mysql - networks: - - network diff --git a/docker/dev/mtt-php80-apache/.env b/docker/dev/mtt-php80-apache/.env deleted file mode 100644 index d2988cc..0000000 --- a/docker/dev/mtt-php80-apache/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php80-apache diff --git a/docker/dev/mtt-php80-apache/Dockerfile-web b/docker/dev/mtt-php80-apache/Dockerfile-web deleted file mode 100644 index 4c7faf8..0000000 --- a/docker/dev/mtt-php80-apache/Dockerfile-web +++ /dev/null @@ -1,15 +0,0 @@ -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 && \ - echo " /var/www/phpinfo/phpinfo.php && \ - echo 'Alias "/phpinfo" "/var/www/phpinfo/phpinfo.php"' > /etc/apache2/conf-enabled/phpinfo.conf && \ - echo 'LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\"" combined' > /etc/apache2/conf-enabled/logformat.conf && \ - a2enmod rewrite && \ - curl -o /usr/local/bin/phpunit -fL "https://phar.phpunit.de/phpunit-9.phar" && \ - chmod +x /usr/local/bin/phpunit && \ - ln -s html /var/www/src - -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-php80-apache/compose.yml b/docker/dev/mtt-php80-apache/compose.yml deleted file mode 100644 index b0a0664..0000000 --- a/docker/dev/mtt-php80-apache/compose.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: "3.9" - -services: - web: - build: - context: . - dockerfile: Dockerfile-web - image: mtt-dev/php:8.0-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-php80-apache/php-mtt.ini b/docker/dev/mtt-php80-apache/php-mtt.ini deleted file mode 100644 index 5503e6a..0000000 --- a/docker/dev/mtt-php80-apache/php-mtt.ini +++ /dev/null @@ -1,9 +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 - -session.gc_divisor = 100 diff --git a/docker/dev/mtt-php80-apache/php-opcache.ini b/docker/dev/mtt-php80-apache/php-opcache.ini deleted file mode 100644 index 70c3516..0000000 --- a/docker/dev/mtt-php80-apache/php-opcache.ini +++ /dev/null @@ -1,42 +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 - -; JIT will work only if opcache is enabled and jit_buffer_size is not zero. -; To disable JIT set the buffer size to 0. -opcache.jit_buffer_size=64M - -; JIT mode. Read more at https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.jit -; Default is tracing. -opcache.jit=tracing - -; 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-php81-apache-mariadb108/.env b/docker/dev/mtt-php81-apache-mariadb108/.env deleted file mode 100644 index cf81ec9..0000000 --- a/docker/dev/mtt-php81-apache-mariadb108/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php81-apache-mariadb108 diff --git a/docker/dev/mtt-php81-apache-mariadb108/compose.yml b/docker/dev/mtt-php81-apache-mariadb108/compose.yml deleted file mode 100644 index 788e3cc..0000000 --- a/docker/dev/mtt-php81-apache-mariadb108/compose.yml +++ /dev/null @@ -1,56 +0,0 @@ -version: "3.9" - -networks: - network: - name: "${PLATFORM_NAME}-network" - -services: - web: - build: - context: ../mtt-php81-apache/ - dockerfile: Dockerfile-web - image: mtt-dev/php:8.1-apache - container_name: ${PLATFORM_NAME}-web - ports: - - "8080:80" - environment: - - MTT_ENABLE_DEBUG=YES - - MTT_DB_TYPE=mysql - - MTT_DB_HOST=db - - MTT_DB_NAME=mytinytodo - - MTT_DB_USER=mtt - - MTT_DB_PASSWORD=mtt - - MTT_DB_PREFIX=mtt_ - - MTT_DB_DRIVER=mysqli - volumes: - - ../../../src:/var/www/html - - ../../../tests:/var/www/tests - depends_on: - - db - networks: - - network - - db: - image: mariadb:10.8 - container_name: ${PLATFORM_NAME}-db - #restart: always - environment: - MARIADB_ROOT_PASSWORD: JustForDev - MARIADB_USER: mtt - MARIADB_PASSWORD: mtt - MARIADB_DATABASE: mytinytodo - volumes: - - ../_mariadb108/my.cnf:/etc/mysql/conf.d/my.cnf - - ../_mariadb108/db_data:/var/lib/mysql - networks: - - network - - adminer: - image: adminer:latest - container_name: ${PLATFORM_NAME}-adminer - environment: - ADMINER_DEFAULT_SERVER: db - ports: - - 8079:8080 - networks: - - network diff --git a/docker/dev/mtt-php81-apache/.env b/docker/dev/mtt-php81-apache/.env deleted file mode 100644 index 48f80ed..0000000 --- a/docker/dev/mtt-php81-apache/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php81-apache diff --git a/docker/dev/mtt-php81-apache/Dockerfile-web b/docker/dev/mtt-php81-apache/Dockerfile-web deleted file mode 100644 index b399e55..0000000 --- a/docker/dev/mtt-php81-apache/Dockerfile-web +++ /dev/null @@ -1,16 +0,0 @@ -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 && \ - echo " /var/www/phpinfo/phpinfo.php && \ - echo 'Alias "/phpinfo" "/var/www/phpinfo/phpinfo.php"' > /etc/apache2/conf-enabled/phpinfo.conf && \ - a2enmod rewrite && \ - echo 'LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\"" combined' > /etc/apache2/conf-enabled/logformat.conf && \ - curl -o /usr/local/bin/phpunit -fL "https://phar.phpunit.de/phpunit-9.phar" && \ - chmod +x /usr/local/bin/phpunit && \ - ln -s html /var/www/src - - -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/compose.yml b/docker/dev/mtt-php81-apache/compose.yml deleted file mode 100644 index 38011d2..0000000 --- a/docker/dev/mtt-php81-apache/compose.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: "3.9" - -services: - web: - build: - context: . - dockerfile: Dockerfile-web - image: mtt-dev/php:8.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-php81-apache/php-mtt.ini b/docker/dev/mtt-php81-apache/php-mtt.ini deleted file mode 100644 index 60882d1..0000000 --- a/docker/dev/mtt-php81-apache/php-mtt.ini +++ /dev/null @@ -1,9 +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 - -session.gc_divisor = 100 \ No newline at end of file diff --git a/docker/dev/mtt-php81-apache/php-opcache.ini b/docker/dev/mtt-php81-apache/php-opcache.ini deleted file mode 100644 index 70c3516..0000000 --- a/docker/dev/mtt-php81-apache/php-opcache.ini +++ /dev/null @@ -1,42 +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 - -; JIT will work only if opcache is enabled and jit_buffer_size is not zero. -; To disable JIT set the buffer size to 0. -opcache.jit_buffer_size=64M - -; JIT mode. Read more at https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.jit -; Default is tracing. -opcache.jit=tracing - -; 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-php82-angie-postgres10/.env b/docker/dev/mtt-php82-angie-postgres10/.env deleted file mode 100644 index ca7b6fa..0000000 --- a/docker/dev/mtt-php82-angie-postgres10/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php82-angie-postgres10 diff --git a/docker/dev/mtt-php82-angie-postgres10/compose.yml b/docker/dev/mtt-php82-angie-postgres10/compose.yml deleted file mode 100644 index 15c0695..0000000 --- a/docker/dev/mtt-php82-angie-postgres10/compose.yml +++ /dev/null @@ -1,58 +0,0 @@ -version: "3.9" - -networks: - network: - name: "${PLATFORM_NAME}-network" - -services: - web: - build: - context: ../_nginx - dockerfile: Dockerfile-angie-alpine - image: mtt-dev/angie:alpine - container_name: ${PLATFORM_NAME}-web - ports: - - "8080:80" - volumes: - - ../../../src:/var/www/html - depends_on: - - fpm - networks: - - network - - fpm: - build: - context: ../mtt-php82-angie - dockerfile: Dockerfile-fpm - image: mtt-dev/php:8.2-fpm-alpine - container_name: ${PLATFORM_NAME}-fpm - environment: - - MTT_ENABLE_DEBUG=YES - - MTT_DB_TYPE=postgres - - MTT_API_USE_PATH_INFO=YES - - MTT_DB_HOST=db - - MTT_DB_NAME=mtt - - MTT_DB_USER=mtt - - MTT_DB_PASSWORD=mtt - - MTT_DB_PREFIX=mtt_ - volumes: - - ../../../src:/var/www/html - - ../../../tests:/var/www/tests - - ../mtt-php82-angie/php-mtt.ini:/usr/local/etc/php/conf.d/php-mtt.ini - - ../mtt-php82-angie/php-opcache.ini:/usr/local/etc/php/conf.d/php-opcache.ini - networks: - - network - - db: - # do not use alpine image due to missing locales - image: postgres:10.0 - container_name: ${PLATFORM_NAME}-db - userns_mode: keep-id - environment: - POSTGRES_PASSWORD: mtt - POSTGRES_USER: mtt - POSTGRES_DB: mtt - volumes: - - ../_postgres10/db_data:/var/lib/postgresql/data - networks: - - network diff --git a/docker/dev/mtt-php82-angie/.env b/docker/dev/mtt-php82-angie/.env deleted file mode 100644 index 0993892..0000000 --- a/docker/dev/mtt-php82-angie/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php82-angie-alpine diff --git a/docker/dev/mtt-php82-angie/Dockerfile-fpm b/docker/dev/mtt-php82-angie/Dockerfile-fpm deleted file mode 100644 index b8e178c..0000000 --- a/docker/dev/mtt-php82-angie/Dockerfile-fpm +++ /dev/null @@ -1,17 +0,0 @@ -FROM php:8.2-fpm-alpine - -RUN apk add --update-cache libpq postgresql-dev icu icu-dev && \ - docker-php-ext-install pdo_mysql pdo_pgsql intl && \ - apk del postgresql-dev icu-dev && rm -rf /var/cache/apk/* && \ - mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \ - mkdir /var/www/phpinfo && \ - echo " /var/www/phpinfo/phpinfo.php && \ - curl -o /usr/local/bin/phpunit -fL "https://phar.phpunit.de/phpunit-10.phar" && \ - chmod +x /usr/local/bin/phpunit && \ - ln -s html /var/www/src - -COPY php-mtt.ini /usr/local/etc/php/conf.d/ -COPY php-opcache.ini /usr/local/etc/php/conf.d/ -COPY php-fpm-www.conf /usr/local/etc/php-fpm.d/www.conf - -VOLUME /var/www/html diff --git a/docker/dev/mtt-php82-angie/compose.yml b/docker/dev/mtt-php82-angie/compose.yml deleted file mode 100644 index 81a135f..0000000 --- a/docker/dev/mtt-php82-angie/compose.yml +++ /dev/null @@ -1,40 +0,0 @@ -version: "3.9" - -networks: - network: - name: "${PLATFORM_NAME}-network" - -services: - web: - build: - context: ../_nginx - dockerfile: Dockerfile-angie-alpine - image: mtt-dev/angie:alpine - container_name: ${PLATFORM_NAME}-web - ports: - - "8080:80" - volumes: - - ../../../src:/var/www/html - depends_on: - - fpm - networks: - - network - - fpm: - build: - context: . - dockerfile: Dockerfile-fpm - image: mtt-dev/php:8.2-fpm-alpine - container_name: ${PLATFORM_NAME}-fpm - environment: - - MTT_ENABLE_DEBUG=YES - - MTT_DB_TYPE=sqlite - - MTT_API_USE_PATH_INFO=YES - volumes: - - ../../../src:/var/www/html - - ../../../tests:/var/www/tests - - ./php-mtt.ini:/usr/local/etc/php/conf.d/php-mtt.ini - - ./php-opcache.ini:/usr/local/etc/php/conf.d/php-opcache.ini - - networks: - - network diff --git a/docker/dev/mtt-php82-angie/php-fpm-www.conf b/docker/dev/mtt-php82-angie/php-fpm-www.conf deleted file mode 100644 index c8c06bd..0000000 --- a/docker/dev/mtt-php82-angie/php-fpm-www.conf +++ /dev/null @@ -1,13 +0,0 @@ -[www] -user = www-data -group = www-data -listen = 127.0.0.1:9000 -pm = dynamic -pm.max_children = 5 -pm.start_servers = 2 -pm.min_spare_servers = 1 -pm.max_spare_servers = 3 -pm.max_requests = 500 - -access.format = "%R - %u [%t] \"%m %r\" %s %f" -access.log = /dev/null diff --git a/docker/dev/mtt-php82-angie/php-mtt.ini b/docker/dev/mtt-php82-angie/php-mtt.ini deleted file mode 100644 index 4ab4103..0000000 --- a/docker/dev/mtt-php82-angie/php-mtt.ini +++ /dev/null @@ -1,12 +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 - -cgi.fix_pathinfo=0 -session.gc_divisor = 100 - -allow_url_fopen=1 diff --git a/docker/dev/mtt-php82-angie/php-opcache.ini b/docker/dev/mtt-php82-angie/php-opcache.ini deleted file mode 100644 index 2866d5c..0000000 --- a/docker/dev/mtt-php82-angie/php-opcache.ini +++ /dev/null @@ -1,42 +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=1 -opcache.enable_cli=1 - -; JIT will work only if opcache is enabled and jit_buffer_size is not zero. -; To disable JIT set the buffer size to 0. -opcache.jit_buffer_size=64M - -; JIT mode. Read more at https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.jit -; Default is tracing. -opcache.jit=tracing - -; 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-php82-apache/.env b/docker/dev/mtt-php82-apache/.env deleted file mode 100644 index 3e2ed7e..0000000 --- a/docker/dev/mtt-php82-apache/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php82-apache diff --git a/docker/dev/mtt-php82-apache/Dockerfile-web b/docker/dev/mtt-php82-apache/Dockerfile-web deleted file mode 100644 index be632ba..0000000 --- a/docker/dev/mtt-php82-apache/Dockerfile-web +++ /dev/null @@ -1,17 +0,0 @@ -FROM php:8.2-apache-buster - -RUN apt-get update && apt-get install -y libicu-dev && \ - docker-php-ext-install mysqli intl && \ - apt-get -y autoremove && \ - mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \ - mkdir /var/www/phpinfo && \ - a2enmod rewrite && \ - echo " /var/www/phpinfo/phpinfo.php && \ - echo 'Alias "/phpinfo" "/var/www/phpinfo/phpinfo.php"' > /etc/apache2/conf-enabled/phpinfo.conf && \ - echo 'LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\"" combined' > /etc/apache2/conf-enabled/logformat.conf && \ - curl -o /usr/local/bin/phpunit -fL "https://phar.phpunit.de/phpunit-9.phar" && \ - chmod +x /usr/local/bin/phpunit && \ - ln -s html /var/www/src - -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-php82-apache/compose.yml b/docker/dev/mtt-php82-apache/compose.yml deleted file mode 100644 index 15f51f9..0000000 --- a/docker/dev/mtt-php82-apache/compose.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: "3.9" - -services: - web: - build: - context: . - dockerfile: Dockerfile-web - image: mtt-dev/php:8.2-apache - container_name: ${PLATFORM_NAME}-web - ports: - - "8080:80" - environment: - - MTT_ENABLE_DEBUG=YES - - MTT_DB_TYPE=sqlite - volumes: - - ../../../src:/var/www/html - - ../../../tests:/var/www/tests - - ./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-php82-apache/php-mtt.ini b/docker/dev/mtt-php82-apache/php-mtt.ini deleted file mode 100644 index 5503e6a..0000000 --- a/docker/dev/mtt-php82-apache/php-mtt.ini +++ /dev/null @@ -1,9 +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 - -session.gc_divisor = 100 diff --git a/docker/dev/mtt-php82-apache/php-opcache.ini b/docker/dev/mtt-php82-apache/php-opcache.ini deleted file mode 100644 index 70c3516..0000000 --- a/docker/dev/mtt-php82-apache/php-opcache.ini +++ /dev/null @@ -1,42 +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 - -; JIT will work only if opcache is enabled and jit_buffer_size is not zero. -; To disable JIT set the buffer size to 0. -opcache.jit_buffer_size=64M - -; JIT mode. Read more at https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.jit -; Default is tracing. -opcache.jit=tracing - -; 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-php83-apache/.env b/docker/dev/mtt-php83-apache/.env deleted file mode 100644 index b4f9b86..0000000 --- a/docker/dev/mtt-php83-apache/.env +++ /dev/null @@ -1 +0,0 @@ -PLATFORM_NAME=mtt-dev-php83-apache diff --git a/docker/dev/mtt-php83-apache/Dockerfile-web b/docker/dev/mtt-php83-apache/Dockerfile-web deleted file mode 100644 index 3a6f2ce..0000000 --- a/docker/dev/mtt-php83-apache/Dockerfile-web +++ /dev/null @@ -1,15 +0,0 @@ -FROM php:8.3-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 && \ - echo " /var/www/phpinfo/phpinfo.php && \ - echo 'Alias "/phpinfo" "/var/www/phpinfo/phpinfo.php"' > /etc/apache2/conf-enabled/phpinfo.conf && \ - echo 'LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\"" combined' > /etc/apache2/conf-enabled/logformat.conf && \ - curl -o /usr/local/bin/phpunit -fL "https://phar.phpunit.de/phpunit-9.phar" && \ - chmod +x /usr/local/bin/phpunit && \ - ln -s html /var/www/src - -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-php83-apache/compose.yml b/docker/dev/mtt-php83-apache/compose.yml deleted file mode 100644 index b1cc401..0000000 --- a/docker/dev/mtt-php83-apache/compose.yml +++ /dev/null @@ -1,20 +0,0 @@ -version: "3.9" - -services: - web: - build: - context: . - dockerfile: Dockerfile-web - image: mtt-dev/php:8.3-apache - container_name: ${PLATFORM_NAME}-web - hostname: web.local - ports: - - "8080:80" - environment: - - MTT_ENABLE_DEBUG=YES - - MTT_DB_TYPE=sqlite - volumes: - - ../../../src:/var/www/html - - ../../../tests:/var/www/tests - - ./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-php83-apache/php-mtt.ini b/docker/dev/mtt-php83-apache/php-mtt.ini deleted file mode 100644 index c6b0ee0..0000000 --- a/docker/dev/mtt-php83-apache/php-mtt.ini +++ /dev/null @@ -1,11 +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 - -session.gc_divisor = 100 - -allow_url_fopen=1 diff --git a/docker/dev/mtt-php83-apache/php-opcache.ini b/docker/dev/mtt-php83-apache/php-opcache.ini deleted file mode 100644 index 70c3516..0000000 --- a/docker/dev/mtt-php83-apache/php-opcache.ini +++ /dev/null @@ -1,42 +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 - -; JIT will work only if opcache is enabled and jit_buffer_size is not zero. -; To disable JIT set the buffer size to 0. -opcache.jit_buffer_size=64M - -; JIT mode. Read more at https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.jit -; Default is tracing. -opcache.jit=tracing - -; 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/readme.md b/docker/dev/readme.md deleted file mode 100644 index 30229f7..0000000 --- a/docker/dev/readme.md +++ /dev/null @@ -1,8 +0,0 @@ -Docker containers for development and testing purposes. -Not recommended for production usage! - -To run docker container: - - cd mtt-php74-apache - docker-compose build --pull - docker-compose up