From eedb01d52e4b358dbfc075d90767a2517288cb43 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Wed, 21 Oct 2026 13:29:57 +0000 Subject: [PATCH] Drop PHP 8.1 image builds and support --- .github/workflows/build.yaml | 1804 ++--------------- README.md | 12 - ci/BLACKLIST | 1 + docker/php-apache-dev/8.1-alpine/Dockerfile | 38 - .../8.1-alpine/Dockerfile.jinja2 | 11 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/8.1/Dockerfile | 32 - docker/php-apache-dev/8.1/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../8.1/conf/bin/service.d/blackfire-agent.sh | 25 - .../8.1/conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../8.1/conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache/8.1-alpine/Dockerfile | 33 - .../php-apache/8.1-alpine/Dockerfile.jinja2 | 12 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../8.1-alpine/conf/bin/service.d/httpd.sh | 13 - .../8.1-alpine/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../8.1-alpine/conf/etc/httpd/global.conf | 1 - .../8.1-alpine/conf/etc/httpd/main.conf | 10 - .../8.1-alpine/conf/etc/httpd/php.conf | 1 - .../8.1-alpine/conf/etc/httpd/ssl/server.crt | 28 - .../8.1-alpine/conf/etc/httpd/ssl/server.csr | 26 - .../8.1-alpine/conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../8.1-alpine/conf/etc/httpd/vhost.conf | 36 - .../8.1-alpine/conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/8.1/Dockerfile | 30 - docker/php-apache/8.1/Dockerfile.jinja2 | 13 - .../8.1/conf/bin/service.d/httpd.d/10-init.sh | 6 - .../8.1/conf/bin/service.d/httpd.sh | 14 - .../8.1/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../8.1/conf/etc/httpd/conf.d/10-log.conf | 4 - .../8.1/conf/etc/httpd/conf.d/10-php.conf | 37 - .../8.1/conf/etc/httpd/conf.d/10-server.conf | 18 - .../php-apache/8.1/conf/etc/httpd/global.conf | 1 - .../php-apache/8.1/conf/etc/httpd/main.conf | 10 - docker/php-apache/8.1/conf/etc/httpd/php.conf | 1 - .../8.1/conf/etc/httpd/ssl/server.crt | 28 - .../8.1/conf/etc/httpd/ssl/server.csr | 26 - .../8.1/conf/etc/httpd/ssl/server.key | 51 - .../8.1/conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../php-apache/8.1/conf/etc/httpd/vhost.conf | 36 - .../8.1/conf/etc/httpd/vhost.ssl.conf | 26 - .../8.1/conf/etc/supervisor.d/apache.conf | 14 - .../8.1/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../8.1/conf/provision/bootstrap.d/10-php.sh | 8 - .../8.1/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-dev/8.1-alpine/Dockerfile | 30 - docker/php-dev/8.1-alpine/Dockerfile.jinja2 | 7 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/8.1/Dockerfile | 24 - docker/php-dev/8.1/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../8.1/conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../8.1/conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-nginx-dev/8.1-alpine/Dockerfile | 38 - .../8.1-alpine/Dockerfile.jinja2 | 11 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/8.1/Dockerfile | 32 - docker/php-nginx-dev/8.1/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../8.1/conf/bin/service.d/blackfire-agent.sh | 25 - .../8.1/conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../8.1/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../8.1/conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx/8.1-alpine/Dockerfile | 24 - docker/php-nginx/8.1-alpine/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../8.1-alpine/conf/bin/service.d/nginx.sh | 10 - .../8.1-alpine/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../8.1-alpine/conf/etc/nginx/global.conf | 1 - .../8.1-alpine/conf/etc/nginx/main.conf | 4 - .../8.1-alpine/conf/etc/nginx/nginx.conf | 34 - .../8.1-alpine/conf/etc/nginx/php.conf | 1 - .../8.1-alpine/conf/etc/nginx/ssl/server.crt | 28 - .../8.1-alpine/conf/etc/nginx/ssl/server.csr | 26 - .../8.1-alpine/conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../8.1-alpine/conf/etc/nginx/vhost.conf | 28 - .../8.1-alpine/conf/etc/nginx/vhost.ssl.conf | 6 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/8.1/Dockerfile | 28 - docker/php-nginx/8.1/Dockerfile.jinja2 | 14 - .../8.1/conf/bin/service.d/nginx.d/10-init.sh | 5 - .../php-nginx/8.1/conf/bin/service.d/nginx.sh | 10 - .../8.1/conf/etc/nginx/conf.d/.gitkeep | 0 .../8.1/conf/etc/nginx/conf.d/10-php.conf | 3 - .../php-nginx/8.1/conf/etc/nginx/global.conf | 1 - docker/php-nginx/8.1/conf/etc/nginx/main.conf | 4 - docker/php-nginx/8.1/conf/etc/nginx/php.conf | 1 - .../8.1/conf/etc/nginx/ssl/server.crt | 28 - .../8.1/conf/etc/nginx/ssl/server.csr | 26 - .../8.1/conf/etc/nginx/ssl/server.key | 51 - .../8.1/conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../php-nginx/8.1/conf/etc/nginx/vhost.conf | 28 - .../8.1/conf/etc/nginx/vhost.ssl.conf | 6 - .../8.1/conf/etc/supervisor.d/nginx.conf | 14 - .../8.1/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../8.1/conf/provision/bootstrap.d/10-php.sh | 7 - .../8.1/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-official/8.1-alpine/Dockerfile | 253 --- .../php-official/8.1-alpine/Dockerfile.jinja2 | 35 - docker/php-official/8.1-alpine/conf/VERSION | 1 - .../8.1-alpine/conf/bin/bootstrap.sh | 3 - .../8.1-alpine/conf/bin/config.sh | 117 -- .../8.1-alpine/conf/bin/control.sh | 160 -- .../8.1-alpine/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../8.1-alpine/conf/bin/entrypoint.d/noop.sh | 7 - .../8.1-alpine/conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../8.1-alpine/conf/bin/entrypoint.sh | 46 - .../8.1-alpine/conf/bin/provision | 8 - .../8.1-alpine/conf/bin/provision.py | 328 --- .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../8.1-alpine/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../8.1-alpine/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../8.1-alpine/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../8.1-alpine/conf/bin/service.d/postfix.sh | 42 - .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../8.1-alpine/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../conf/bin/usr-bin/docker-cronjob | 26 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../conf/bin/usr-bin/docker-provision | 9 - .../conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../8.1-alpine/conf/bin/usr-bin/service | 86 - .../conf/bin/usr-bin/version-compare | 43 - .../8.1-alpine/conf/etc/cron/.gitkeep | 0 .../8.1-alpine/conf/etc/logrotate.d/php5-fpm | 12 - .../8.1-alpine/conf/etc/logrotate.d/syslog-ng | 38 - .../8.1-alpine/conf/etc/php/conf.d/.gitkeep | 0 .../8.1-alpine/conf/etc/php/fpm/.gitkeep | 0 .../8.1-alpine/conf/etc/php/php.ini | 1 - .../8.1-alpine/conf/etc/php/php.webdevops.ini | 37 - .../8.1-alpine/conf/etc/supervisor.conf | 20 - .../8.1-alpine/conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../8.1-alpine/conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 - .../8.1-alpine/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../bootstrap.d/10-user-application.sh | 8 - .../conf/provision/bootstrap.d/11-php-conf.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 11 - .../provision/bootstrap.d/30-setup-ioncube.sh | 50 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - .../conf/provision/onbuild.d/.gitkeep | 0 .../8.1-alpine/conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 - .../conf/provision/service.d/postfix.sh | 32 - .../conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../8.1-alpine/conf/provision/variables.yml | 7 - docker/php-official/8.1/8.1 | 1 - docker/php-official/8.1/Dockerfile | 238 --- docker/php-official/8.1/Dockerfile.jinja2 | 37 - docker/php-official/8.1/conf/VERSION | 1 - docker/php-official/8.1/conf/bin/bootstrap.sh | 3 - docker/php-official/8.1/conf/bin/config.sh | 117 -- docker/php-official/8.1/conf/bin/control.sh | 160 -- .../8.1/conf/bin/entrypoint.d/cli.sh | 19 - .../8.1/conf/bin/entrypoint.d/default.sh | 3 - .../8.1/conf/bin/entrypoint.d/noop.sh | 7 - .../8.1/conf/bin/entrypoint.d/root.sh | 14 - .../8.1/conf/bin/entrypoint.d/supervisord.sh | 9 - .../php-official/8.1/conf/bin/entrypoint.sh | 46 - docker/php-official/8.1/conf/bin/provision | 8 - docker/php-official/8.1/conf/bin/provision.py | 328 --- .../8.1/conf/bin/service.d/cron.d/10-init.sh | 16 - .../8.1/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../8.1/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../8.1/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../8.1/conf/bin/service.d/postfix.sh | 42 - .../8.1/conf/bin/service.d/ssh.d/10-init.sh | 7 - .../8.1/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../8.1/conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../8.1/conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../8.1/conf/bin/usr-bin/docker-cronjob | 26 - .../8.1/conf/bin/usr-bin/docker-php-setting | 44 - .../8.1/conf/bin/usr-bin/docker-provision | 9 - .../8.1/conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../php-official/8.1/conf/bin/usr-bin/service | 86 - .../8.1/conf/bin/usr-bin/version-compare | 43 - .../php-official/8.1/conf/etc/cron/.gitkeep | 0 .../8.1/conf/etc/logrotate.d/php5-fpm | 12 - .../8.1/conf/etc/logrotate.d/syslog-ng | 38 - .../8.1/conf/etc/php/conf.d/.gitkeep | 0 .../8.1/conf/etc/php/fpm/.gitkeep | 0 docker/php-official/8.1/conf/etc/php/php.ini | 1 - .../8.1/conf/etc/php/php.webdevops.ini | 37 - .../php-official/8.1/conf/etc/supervisor.conf | 20 - .../8.1/conf/etc/supervisor.d/.gitkeep | 0 .../8.1/conf/etc/supervisor.d/cron.conf | 14 - .../8.1/conf/etc/supervisor.d/dnsmasq.conf | 14 - .../8.1/conf/etc/supervisor.d/php-fpm.conf | 15 - .../8.1/conf/etc/supervisor.d/postfix.conf | 15 - .../8.1/conf/etc/supervisor.d/ssh.conf | 14 - .../8.1/conf/etc/supervisor.d/syslog.conf | 13 - .../8.1/conf/etc/syslog-ng/syslog-ng.conf | 48 - .../8.1/conf/provision/ansible.cfg | 0 .../8.1/conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/11-php-conf.sh | 10 - .../8.1/conf/provision/bootstrap.d/20-app.sh | 5 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 11 - .../provision/bootstrap.d/30-setup-ioncube.sh | 50 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../8.1/conf/provision/build.d/.gitkeep | 0 .../8.1/conf/provision/build.d/10-cleanup.sh | 7 - .../8.1/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../8.1/conf/provision/entrypoint.d/20-php.sh | 75 - .../8.1/conf/provision/onbuild.d/.gitkeep | 0 .../8.1/conf/provision/roles/.gitkeep | 0 .../8.1/conf/provision/service.d/.gitkeep | 0 .../8.1/conf/provision/service.d/cron.sh | 13 - .../8.1/conf/provision/service.d/dnsmasq.sh | 24 - .../8.1/conf/provision/service.d/postfix.sh | 32 - .../8.1/conf/provision/service.d/ssh.sh | 17 - .../8.1/conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../8.1/conf/provision/variables.yml | 7 - docker/php/8.1 | 1 - docker/php/8.1-alpine | 1 - .../dockerfiles/include/image-tag-php.rst | 4 +- template/Dockerfile/images/php.jinja2 | 22 +- tests/structure-test/php/test.yaml | 4 +- 370 files changed, 171 insertions(+), 9759 deletions(-) delete mode 100644 docker/php-apache-dev/8.1-alpine/Dockerfile delete mode 100644 docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/8.1-alpine/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/8.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/8.1-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/8.1-alpine/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/8.1/Dockerfile delete mode 100644 docker/php-apache-dev/8.1/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/8.1/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/8.1/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/8.1/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/8.1/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/8.1/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/8.1/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache/8.1-alpine/Dockerfile delete mode 100644 docker/php-apache/8.1-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-apache/8.1-alpine/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/8.1-alpine/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/8.1-alpine/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/8.1-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/8.1-alpine/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/8.1/Dockerfile delete mode 100644 docker/php-apache/8.1/Dockerfile.jinja2 delete mode 100644 docker/php-apache/8.1/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/8.1/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/8.1/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/8.1/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/8.1/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/8.1/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/8.1/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/8.1/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/8.1/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/8.1/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/8.1/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/8.1/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/8.1/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/8.1/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/8.1/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/8.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/8.1/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/8.1/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/8.1/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/8.1/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/8.1/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/8.1/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/8.1/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/8.1/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-dev/8.1-alpine/Dockerfile delete mode 100644 docker/php-dev/8.1-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/8.1-alpine/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/8.1/Dockerfile delete mode 100644 docker/php-dev/8.1/Dockerfile.jinja2 delete mode 100644 docker/php-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/8.1/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/8.1/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/8.1/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/8.1/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/8.1-alpine/Dockerfile delete mode 100644 docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/8.1-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/8.1/Dockerfile delete mode 100644 docker/php-nginx-dev/8.1/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/8.1/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/8.1/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/8.1/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx/8.1-alpine/Dockerfile delete mode 100644 docker/php-nginx/8.1-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/8.1-alpine/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/8.1-alpine/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/nginx.conf delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/8.1-alpine/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/8.1-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/8.1-alpine/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/8.1/Dockerfile delete mode 100644 docker/php-nginx/8.1/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/8.1/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/8.1/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/8.1/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/8.1/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/8.1/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/8.1/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/8.1/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/8.1/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/8.1/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/8.1/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/8.1/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/8.1/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/8.1/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/8.1/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/8.1/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/8.1/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/8.1/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/8.1/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-official/8.1-alpine/Dockerfile delete mode 100644 docker/php-official/8.1-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-official/8.1-alpine/conf/VERSION delete mode 100644 docker/php-official/8.1-alpine/conf/bin/bootstrap.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/config.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/control.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/entrypoint.sh delete mode 100755 docker/php-official/8.1-alpine/conf/bin/provision delete mode 100755 docker/php-official/8.1-alpine/conf/bin/provision.py delete mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/cron.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/postfix.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/ssh.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/supervisor.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service delete mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/php-official/8.1-alpine/conf/bin/usr-bin/service delete mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/version-compare delete mode 100644 docker/php-official/8.1-alpine/conf/etc/cron/.gitkeep delete mode 100644 docker/php-official/8.1-alpine/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php-official/8.1-alpine/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/php-official/8.1-alpine/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php-official/8.1-alpine/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php-official/8.1-alpine/conf/etc/php/php.ini delete mode 100644 docker/php-official/8.1-alpine/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php-official/8.1-alpine/conf/etc/supervisor.conf delete mode 100644 docker/php-official/8.1-alpine/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/php-official/8.1-alpine/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/php-official/8.1-alpine/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/php-official/8.1-alpine/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php-official/8.1-alpine/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/php-official/8.1-alpine/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/php-official/8.1-alpine/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/php-official/8.1-alpine/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/php-official/8.1-alpine/conf/provision/ansible.cfg delete mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/build.d/.gitkeep delete mode 100644 docker/php-official/8.1-alpine/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-official/8.1-alpine/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/php-official/8.1-alpine/conf/provision/roles/.gitkeep delete mode 100644 docker/php-official/8.1-alpine/conf/provision/service.d/.gitkeep delete mode 100644 docker/php-official/8.1-alpine/conf/provision/service.d/cron.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/service.d/postfix.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/service.d/ssh.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/service.d/syslog.sh delete mode 100644 docker/php-official/8.1-alpine/conf/provision/variables-webdevops.yml delete mode 100644 docker/php-official/8.1-alpine/conf/provision/variables.yml delete mode 120000 docker/php-official/8.1/8.1 delete mode 100644 docker/php-official/8.1/Dockerfile delete mode 100644 docker/php-official/8.1/Dockerfile.jinja2 delete mode 100644 docker/php-official/8.1/conf/VERSION delete mode 100644 docker/php-official/8.1/conf/bin/bootstrap.sh delete mode 100644 docker/php-official/8.1/conf/bin/config.sh delete mode 100644 docker/php-official/8.1/conf/bin/control.sh delete mode 100644 docker/php-official/8.1/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/php-official/8.1/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/php-official/8.1/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/php-official/8.1/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/php-official/8.1/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/php-official/8.1/conf/bin/entrypoint.sh delete mode 100755 docker/php-official/8.1/conf/bin/provision delete mode 100755 docker/php-official/8.1/conf/bin/provision.py delete mode 100644 docker/php-official/8.1/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/php-official/8.1/conf/bin/service.d/cron.sh delete mode 100644 docker/php-official/8.1/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/php-official/8.1/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/php-official/8.1/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php-official/8.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php-official/8.1/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php-official/8.1/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/php-official/8.1/conf/bin/service.d/postfix.sh delete mode 100644 docker/php-official/8.1/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/php-official/8.1/conf/bin/service.d/ssh.sh delete mode 100644 docker/php-official/8.1/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/php-official/8.1/conf/bin/service.d/supervisor.sh delete mode 100644 docker/php-official/8.1/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/php-official/8.1/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/php-official/8.1/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/php-official/8.1/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/php-official/8.1/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/php-official/8.1/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php-official/8.1/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/8.1/conf/bin/usr-bin/docker-service delete mode 100644 docker/php-official/8.1/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/php-official/8.1/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/php-official/8.1/conf/bin/usr-bin/service delete mode 100644 docker/php-official/8.1/conf/bin/usr-bin/version-compare delete mode 100644 docker/php-official/8.1/conf/etc/cron/.gitkeep delete mode 100644 docker/php-official/8.1/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php-official/8.1/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/php-official/8.1/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php-official/8.1/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php-official/8.1/conf/etc/php/php.ini delete mode 100644 docker/php-official/8.1/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php-official/8.1/conf/etc/supervisor.conf delete mode 100644 docker/php-official/8.1/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/php-official/8.1/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/php-official/8.1/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/php-official/8.1/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php-official/8.1/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/php-official/8.1/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/php-official/8.1/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/php-official/8.1/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/php-official/8.1/conf/provision/ansible.cfg delete mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/php-official/8.1/conf/provision/build.d/.gitkeep delete mode 100644 docker/php-official/8.1/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/php-official/8.1/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-official/8.1/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/php-official/8.1/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php-official/8.1/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php-official/8.1/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/php-official/8.1/conf/provision/roles/.gitkeep delete mode 100644 docker/php-official/8.1/conf/provision/service.d/.gitkeep delete mode 100644 docker/php-official/8.1/conf/provision/service.d/cron.sh delete mode 100644 docker/php-official/8.1/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/php-official/8.1/conf/provision/service.d/postfix.sh delete mode 100644 docker/php-official/8.1/conf/provision/service.d/ssh.sh delete mode 100644 docker/php-official/8.1/conf/provision/service.d/syslog.sh delete mode 100644 docker/php-official/8.1/conf/provision/variables-webdevops.yml delete mode 100644 docker/php-official/8.1/conf/provision/variables.yml delete mode 120000 docker/php/8.1 delete mode 120000 docker/php/8.1-alpine diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 234e98e00..d8442ef9b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1147,224 +1147,6 @@ jobs: sleep $((i*i)) done exit 1 - php-apache-dev_8-1: - strategy: - fail-fast: false - matrix: - include: - - - arch: amd64 - runner: ubuntu-24.04 - platform: linux/amd64 - - - arch: arm64 - runner: ubuntu-24.04-arm - platform: linux/arm64 - name: 'webdevops/php-apache-dev:8.1 (${{ matrix.arch }})' - needs: php-apache_8-1_publish - if: '${{ !failure() && !cancelled() }}' - runs-on: '${{ matrix.runner }}' - container: webdevops/dockerfile-build-env - steps: - - - uses: actions/checkout@v6 - - - uses: docker/setup-buildx-action@v3 - - - name: 'Download parent image (OCI layout): webdevops/php-apache:8.1' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/download-artifact@v4.1.9 - with: - name: 'docker-parent-php-apache_8-1-${{ matrix.arch }}' - path: .ci-oci-image/php-apache_8-1 - - - name: 'Build (load locally)' - if: "${{ github.ref == 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-apache-dev/8.1 - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - - - name: 'Build (load locally, from parent artifact)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-apache-dev/8.1 - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php-apache:8.1=oci-layout://.ci-oci-image/php-apache_8-1:ci-parent-image' - - - name: 'run serverspec' - run: |- - cd tests/serverspec - echo "FROM ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1 >> Dockerfile_test - echo "COPY conf/ /" >> Dockerfile_test - bundle install - bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Push arch image' - if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1' - php-apache-dev_8-1-alpine: - strategy: - fail-fast: false - matrix: - include: - - - arch: amd64 - runner: ubuntu-24.04 - platform: linux/amd64 - - - arch: arm64 - runner: ubuntu-24.04-arm - platform: linux/arm64 - name: 'webdevops/php-apache-dev:8.1-alpine (${{ matrix.arch }})' - needs: php-apache_8-1-alpine_publish - if: '${{ !failure() && !cancelled() }}' - runs-on: '${{ matrix.runner }}' - container: webdevops/dockerfile-build-env - steps: - - - uses: actions/checkout@v6 - - - uses: docker/setup-buildx-action@v3 - - - name: 'Download parent image (OCI layout): webdevops/php-apache:8.1-alpine' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/download-artifact@v4.1.9 - with: - name: 'docker-parent-php-apache_8-1-alpine-${{ matrix.arch }}' - path: .ci-oci-image/php-apache_8-1-alpine - - - name: 'Build (load locally)' - if: "${{ github.ref == 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-apache-dev/8.1-alpine - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - - - name: 'Build (load locally, from parent artifact)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-apache-dev/8.1-alpine - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php-apache:8.1-alpine=oci-layout://.ci-oci-image/php-apache_8-1-alpine:ci-parent-image' - - - name: 'run serverspec' - run: |- - cd tests/serverspec - echo "FROM ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine >> Dockerfile_test - echo "COPY conf/ /" >> Dockerfile_test - bundle install - bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Push arch image' - if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine' - php-apache-dev_8-1-alpine_publish: - name: 'webdevops/php-apache-dev:8.1-alpine - Publish' - runs-on: ubuntu-latest - needs: php-apache-dev_8-1-alpine - if: "${{github.ref == 'refs/heads/master'}}" - steps: - - - uses: docker/setup-buildx-action@v3 - - - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - name: 'Create and push multi-arch manifest' - run: |- - set -euo pipefail - for i in 1 2 3 4 5 6 7 8 9 10; do - docker buildx imagetools create \ - -t "webdevops/php-apache-dev:8.1-alpine" \ - -t "ghcr.io/webdevops/php-apache-dev:8.1-alpine" \ - "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-amd64-8.1-alpine" \ - "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-arm64-8.1-alpine" && exit 0 - sleep $((i*i)) - done - exit 1 - php-apache-dev_8-1_publish: - name: 'webdevops/php-apache-dev:8.1 - Publish' - runs-on: ubuntu-latest - needs: php-apache-dev_8-1 - if: "${{github.ref == 'refs/heads/master'}}" - steps: - - - uses: docker/setup-buildx-action@v3 - - - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - name: 'Create and push multi-arch manifest' - run: |- - set -euo pipefail - for i in 1 2 3 4 5 6 7 8 9 10; do - docker buildx imagetools create \ - -t "webdevops/php-apache-dev:8.1" \ - -t "ghcr.io/webdevops/php-apache-dev:8.1" \ - "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-amd64-8.1" \ - "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-arm64-8.1" && exit 0 - sleep $((i*i)) - done - exit 1 php-apache-dev_8-2: strategy: fail-fast: false @@ -2237,7 +2019,7 @@ jobs: sleep $((i*i)) done exit 1 - php-apache_8-1: + php-apache_8-2: strategy: fail-fast: false matrix: @@ -2250,8 +2032,8 @@ jobs: arch: arm64 runner: ubuntu-24.04-arm platform: linux/arm64 - name: 'webdevops/php-apache:8.1 (${{ matrix.arch }})' - needs: php_8-1_publish + name: 'webdevops/php-apache:8.2 (${{ matrix.arch }})' + needs: php_8-2_publish if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env @@ -2261,21 +2043,21 @@ jobs: - uses: docker/setup-buildx-action@v3 - - name: 'Download parent image (OCI layout): webdevops/php:8.1' + name: 'Download parent image (OCI layout): webdevops/php:8.2' if: "${{ github.ref != 'refs/heads/master' }}" uses: actions/download-artifact@v4.1.9 with: - name: 'docker-parent-php_8-1-${{ matrix.arch }}' - path: .ci-oci-image/php_8-1 + name: 'docker-parent-php_8-2-${{ matrix.arch }}' + path: .ci-oci-image/php_8-2 - name: 'Build (load locally)' if: "${{ github.ref == 'refs/heads/master' }}" uses: docker/build-push-action@v6 with: - context: docker/php-apache/8.1 + context: docker/php-apache/8.2 platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.2' cache-from: type=gha cache-to: 'type=gha,mode=max' build-args: 'TARGETARCH=${{ matrix.arch }}' @@ -2284,22 +2066,22 @@ jobs: if: "${{ github.ref != 'refs/heads/master' }}" uses: docker/build-push-action@v6 with: - context: docker/php-apache/8.1 + context: docker/php-apache/8.2 platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.2' cache-from: type=gha cache-to: 'type=gha,mode=max' build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.1=oci-layout://.ci-oci-image/php_8-1:ci-parent-image' + build-contexts: 'webdevops/php:8.2=oci-layout://.ci-oci-image/php_8-2:ci-parent-image' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1 >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install - bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -2311,30 +2093,30 @@ jobs: - name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1' + run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2' - name: 'Export image (OCI layout)' if: "${{ github.ref != 'refs/heads/master' }}" uses: docker/build-push-action@v6 with: - context: docker/php-apache/8.1 + context: docker/php-apache/8.2 platforms: '${{ matrix.platform }}' cache-from: type=gha cache-to: 'type=gha,mode=max' build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.1=oci-layout://.ci-oci-image/php_8-1:ci-parent-image' - outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-1' + build-contexts: 'webdevops/php:8.2=oci-layout://.ci-oci-image/php_8-2:ci-parent-image' + outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-2' - name: 'Upload image (OCI layout)' if: "${{ github.ref != 'refs/heads/master' }}" uses: actions/upload-artifact@v4 with: - name: 'docker-parent-php-apache_8-1-${{ matrix.arch }}' - path: .ci-oci-image/php-apache_8-1 + name: 'docker-parent-php-apache_8-2-${{ matrix.arch }}' + path: .ci-oci-image/php-apache_8-2 retention-days: 1 compression-level: 0 if-no-files-found: error - php-apache_8-1-alpine: + php-apache_8-2-alpine: strategy: fail-fast: false matrix: @@ -2347,8 +2129,8 @@ jobs: arch: arm64 runner: ubuntu-24.04-arm platform: linux/arm64 - name: 'webdevops/php-apache:8.1-alpine (${{ matrix.arch }})' - needs: php_8-1-alpine_publish + name: 'webdevops/php-apache:8.2-alpine (${{ matrix.arch }})' + needs: php_8-2-alpine_publish if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env @@ -2358,21 +2140,21 @@ jobs: - uses: docker/setup-buildx-action@v3 - - name: 'Download parent image (OCI layout): webdevops/php:8.1-alpine' + name: 'Download parent image (OCI layout): webdevops/php:8.2-alpine' if: "${{ github.ref != 'refs/heads/master' }}" uses: actions/download-artifact@v4.1.9 with: - name: 'docker-parent-php_8-1-alpine-${{ matrix.arch }}' - path: .ci-oci-image/php_8-1-alpine + name: 'docker-parent-php_8-2-alpine-${{ matrix.arch }}' + path: .ci-oci-image/php_8-2-alpine - name: 'Build (load locally)' if: "${{ github.ref == 'refs/heads/master' }}" uses: docker/build-push-action@v6 with: - context: docker/php-apache/8.1-alpine + context: docker/php-apache/8.2-alpine platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine' cache-from: type=gha cache-to: 'type=gha,mode=max' build-args: 'TARGETARCH=${{ matrix.arch }}' @@ -2381,22 +2163,22 @@ jobs: if: "${{ github.ref != 'refs/heads/master' }}" uses: docker/build-push-action@v6 with: - context: docker/php-apache/8.1-alpine + context: docker/php-apache/8.2-alpine platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine' cache-from: type=gha cache-to: 'type=gha,mode=max' build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.1-alpine=oci-layout://.ci-oci-image/php_8-1-alpine:ci-parent-image' + build-contexts: 'webdevops/php:8.2-alpine=oci-layout://.ci-oci-image/php_8-2-alpine:ci-parent-image' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install - bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -2408,33 +2190,33 @@ jobs: - name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine' + run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2-alpine' - name: 'Export image (OCI layout)' if: "${{ github.ref != 'refs/heads/master' }}" uses: docker/build-push-action@v6 with: - context: docker/php-apache/8.1-alpine + context: docker/php-apache/8.2-alpine platforms: '${{ matrix.platform }}' cache-from: type=gha cache-to: 'type=gha,mode=max' build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.1-alpine=oci-layout://.ci-oci-image/php_8-1-alpine:ci-parent-image' - outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-1-alpine' + build-contexts: 'webdevops/php:8.2-alpine=oci-layout://.ci-oci-image/php_8-2-alpine:ci-parent-image' + outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-2-alpine' - name: 'Upload image (OCI layout)' if: "${{ github.ref != 'refs/heads/master' }}" uses: actions/upload-artifact@v4 with: - name: 'docker-parent-php-apache_8-1-alpine-${{ matrix.arch }}' - path: .ci-oci-image/php-apache_8-1-alpine + name: 'docker-parent-php-apache_8-2-alpine-${{ matrix.arch }}' + path: .ci-oci-image/php-apache_8-2-alpine retention-days: 1 compression-level: 0 if-no-files-found: error - php-apache_8-1-alpine_publish: - name: 'webdevops/php-apache:8.1-alpine - Publish' + php-apache_8-2-alpine_publish: + name: 'webdevops/php-apache:8.2-alpine - Publish' runs-on: ubuntu-latest - needs: php-apache_8-1-alpine + needs: php-apache_8-2-alpine if: "${{github.ref == 'refs/heads/master'}}" steps: - @@ -2458,17 +2240,17 @@ jobs: set -euo pipefail for i in 1 2 3 4 5 6 7 8 9 10; do docker buildx imagetools create \ - -t "webdevops/php-apache:8.1-alpine" \ - -t "ghcr.io/webdevops/php-apache:8.1-alpine" \ - "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.1-alpine" \ - "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.1-alpine" && exit 0 + -t "webdevops/php-apache:8.2-alpine" \ + -t "ghcr.io/webdevops/php-apache:8.2-alpine" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.2-alpine" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.2-alpine" && exit 0 sleep $((i*i)) done exit 1 - php-apache_8-1_publish: - name: 'webdevops/php-apache:8.1 - Publish' + php-apache_8-2_publish: + name: 'webdevops/php-apache:8.2 - Publish' runs-on: ubuntu-latest - needs: php-apache_8-1 + needs: php-apache_8-2 if: "${{github.ref == 'refs/heads/master'}}" steps: - @@ -2492,14 +2274,14 @@ jobs: set -euo pipefail for i in 1 2 3 4 5 6 7 8 9 10; do docker buildx imagetools create \ - -t "webdevops/php-apache:8.1" \ - -t "ghcr.io/webdevops/php-apache:8.1" \ - "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.1" \ - "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.1" && exit 0 + -t "webdevops/php-apache:8.2" \ + -t "ghcr.io/webdevops/php-apache:8.2" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.2" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.2" && exit 0 sleep $((i*i)) done exit 1 - php-apache_8-2: + php-apache_8-3: strategy: fail-fast: false matrix: @@ -2512,8 +2294,8 @@ jobs: arch: arm64 runner: ubuntu-24.04-arm platform: linux/arm64 - name: 'webdevops/php-apache:8.2 (${{ matrix.arch }})' - needs: php_8-2_publish + name: 'webdevops/php-apache:8.3 (${{ matrix.arch }})' + needs: php_8-3_publish if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env @@ -2523,21 +2305,21 @@ jobs: - uses: docker/setup-buildx-action@v3 - - name: 'Download parent image (OCI layout): webdevops/php:8.2' + name: 'Download parent image (OCI layout): webdevops/php:8.3' if: "${{ github.ref != 'refs/heads/master' }}" uses: actions/download-artifact@v4.1.9 with: - name: 'docker-parent-php_8-2-${{ matrix.arch }}' - path: .ci-oci-image/php_8-2 + name: 'docker-parent-php_8-3-${{ matrix.arch }}' + path: .ci-oci-image/php_8-3 - name: 'Build (load locally)' if: "${{ github.ref == 'refs/heads/master' }}" uses: docker/build-push-action@v6 with: - context: docker/php-apache/8.2 + context: docker/php-apache/8.3 platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.2' + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.3' cache-from: type=gha cache-to: 'type=gha,mode=max' build-args: 'TARGETARCH=${{ matrix.arch }}' @@ -2546,22 +2328,22 @@ jobs: if: "${{ github.ref != 'refs/heads/master' }}" uses: docker/build-push-action@v6 with: - context: docker/php-apache/8.2 + context: docker/php-apache/8.3 platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.2' + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.3' cache-from: type=gha cache-to: 'type=gha,mode=max' build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.2=oci-layout://.ci-oci-image/php_8-2:ci-parent-image' + build-contexts: 'webdevops/php:8.3=oci-layout://.ci-oci-image/php_8-3:ci-parent-image' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2 >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install - bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -2573,269 +2355,7 @@ jobs: - name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2' - - - name: 'Export image (OCI layout)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-apache/8.2 - platforms: '${{ matrix.platform }}' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.2=oci-layout://.ci-oci-image/php_8-2:ci-parent-image' - outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-2' - - - name: 'Upload image (OCI layout)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/upload-artifact@v4 - with: - name: 'docker-parent-php-apache_8-2-${{ matrix.arch }}' - path: .ci-oci-image/php-apache_8-2 - retention-days: 1 - compression-level: 0 - if-no-files-found: error - php-apache_8-2-alpine: - strategy: - fail-fast: false - matrix: - include: - - - arch: amd64 - runner: ubuntu-24.04 - platform: linux/amd64 - - - arch: arm64 - runner: ubuntu-24.04-arm - platform: linux/arm64 - name: 'webdevops/php-apache:8.2-alpine (${{ matrix.arch }})' - needs: php_8-2-alpine_publish - if: '${{ !failure() && !cancelled() }}' - runs-on: '${{ matrix.runner }}' - container: webdevops/dockerfile-build-env - steps: - - - uses: actions/checkout@v6 - - - uses: docker/setup-buildx-action@v3 - - - name: 'Download parent image (OCI layout): webdevops/php:8.2-alpine' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/download-artifact@v4.1.9 - with: - name: 'docker-parent-php_8-2-alpine-${{ matrix.arch }}' - path: .ci-oci-image/php_8-2-alpine - - - name: 'Build (load locally)' - if: "${{ github.ref == 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-apache/8.2-alpine - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - - - name: 'Build (load locally, from parent artifact)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-apache/8.2-alpine - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.2-alpine=oci-layout://.ci-oci-image/php_8-2-alpine:ci-parent-image' - - - name: 'run serverspec' - run: |- - cd tests/serverspec - echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2-alpine >> Dockerfile_test - echo "COPY conf/ /" >> Dockerfile_test - bundle install - bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Push arch image' - if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2-alpine' - - - name: 'Export image (OCI layout)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-apache/8.2-alpine - platforms: '${{ matrix.platform }}' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.2-alpine=oci-layout://.ci-oci-image/php_8-2-alpine:ci-parent-image' - outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-2-alpine' - - - name: 'Upload image (OCI layout)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/upload-artifact@v4 - with: - name: 'docker-parent-php-apache_8-2-alpine-${{ matrix.arch }}' - path: .ci-oci-image/php-apache_8-2-alpine - retention-days: 1 - compression-level: 0 - if-no-files-found: error - php-apache_8-2-alpine_publish: - name: 'webdevops/php-apache:8.2-alpine - Publish' - runs-on: ubuntu-latest - needs: php-apache_8-2-alpine - if: "${{github.ref == 'refs/heads/master'}}" - steps: - - - uses: docker/setup-buildx-action@v3 - - - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - name: 'Create and push multi-arch manifest' - run: |- - set -euo pipefail - for i in 1 2 3 4 5 6 7 8 9 10; do - docker buildx imagetools create \ - -t "webdevops/php-apache:8.2-alpine" \ - -t "ghcr.io/webdevops/php-apache:8.2-alpine" \ - "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.2-alpine" \ - "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.2-alpine" && exit 0 - sleep $((i*i)) - done - exit 1 - php-apache_8-2_publish: - name: 'webdevops/php-apache:8.2 - Publish' - runs-on: ubuntu-latest - needs: php-apache_8-2 - if: "${{github.ref == 'refs/heads/master'}}" - steps: - - - uses: docker/setup-buildx-action@v3 - - - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - name: 'Create and push multi-arch manifest' - run: |- - set -euo pipefail - for i in 1 2 3 4 5 6 7 8 9 10; do - docker buildx imagetools create \ - -t "webdevops/php-apache:8.2" \ - -t "ghcr.io/webdevops/php-apache:8.2" \ - "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.2" \ - "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.2" && exit 0 - sleep $((i*i)) - done - exit 1 - php-apache_8-3: - strategy: - fail-fast: false - matrix: - include: - - - arch: amd64 - runner: ubuntu-24.04 - platform: linux/amd64 - - - arch: arm64 - runner: ubuntu-24.04-arm - platform: linux/arm64 - name: 'webdevops/php-apache:8.3 (${{ matrix.arch }})' - needs: php_8-3_publish - if: '${{ !failure() && !cancelled() }}' - runs-on: '${{ matrix.runner }}' - container: webdevops/dockerfile-build-env - steps: - - - uses: actions/checkout@v6 - - - uses: docker/setup-buildx-action@v3 - - - name: 'Download parent image (OCI layout): webdevops/php:8.3' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/download-artifact@v4.1.9 - with: - name: 'docker-parent-php_8-3-${{ matrix.arch }}' - path: .ci-oci-image/php_8-3 - - - name: 'Build (load locally)' - if: "${{ github.ref == 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-apache/8.3 - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.3' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - - - name: 'Build (load locally, from parent artifact)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-apache/8.3 - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.3' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.3=oci-layout://.ci-oci-image/php_8-3:ci-parent-image' - - - name: 'run serverspec' - run: |- - cd tests/serverspec - echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3 >> Dockerfile_test - echo "COPY conf/ /" >> Dockerfile_test - bundle install - bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Push arch image' - if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3' + run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3' - name: 'Export image (OCI layout)' if: "${{ github.ref != 'refs/heads/master' }}" @@ -3374,260 +2894,15 @@ jobs: outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-5' - name: 'Upload image (OCI layout)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/upload-artifact@v4 - with: - name: 'docker-parent-php-apache_8-5-${{ matrix.arch }}' - path: .ci-oci-image/php-apache_8-5 - retention-days: 1 - compression-level: 0 - if-no-files-found: error - php-apache_8-5-alpine: - strategy: - fail-fast: false - matrix: - include: - - - arch: amd64 - runner: ubuntu-24.04 - platform: linux/amd64 - - - arch: arm64 - runner: ubuntu-24.04-arm - platform: linux/arm64 - name: 'webdevops/php-apache:8.5-alpine (${{ matrix.arch }})' - needs: php_8-5-alpine_publish - if: '${{ !failure() && !cancelled() }}' - runs-on: '${{ matrix.runner }}' - container: webdevops/dockerfile-build-env - steps: - - - uses: actions/checkout@v6 - - - uses: docker/setup-buildx-action@v3 - - - name: 'Download parent image (OCI layout): webdevops/php:8.5-alpine' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/download-artifact@v4.1.9 - with: - name: 'docker-parent-php_8-5-alpine-${{ matrix.arch }}' - path: .ci-oci-image/php_8-5-alpine - - - name: 'Build (load locally)' - if: "${{ github.ref == 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-apache/8.5-alpine - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - - - name: 'Build (load locally, from parent artifact)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-apache/8.5-alpine - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.5-alpine=oci-layout://.ci-oci-image/php_8-5-alpine:ci-parent-image' - - - name: 'run serverspec' - run: |- - cd tests/serverspec - echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine >> Dockerfile_test - echo "COPY conf/ /" >> Dockerfile_test - bundle install - bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Push arch image' - if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine' - - - name: 'Export image (OCI layout)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-apache/8.5-alpine - platforms: '${{ matrix.platform }}' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.5-alpine=oci-layout://.ci-oci-image/php_8-5-alpine:ci-parent-image' - outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-5-alpine' - - - name: 'Upload image (OCI layout)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/upload-artifact@v4 - with: - name: 'docker-parent-php-apache_8-5-alpine-${{ matrix.arch }}' - path: .ci-oci-image/php-apache_8-5-alpine - retention-days: 1 - compression-level: 0 - if-no-files-found: error - php-apache_8-5-alpine_publish: - name: 'webdevops/php-apache:8.5-alpine - Publish' - runs-on: ubuntu-latest - needs: php-apache_8-5-alpine - if: "${{github.ref == 'refs/heads/master'}}" - steps: - - - uses: docker/setup-buildx-action@v3 - - - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - name: 'Create and push multi-arch manifest' - run: |- - set -euo pipefail - for i in 1 2 3 4 5 6 7 8 9 10; do - docker buildx imagetools create \ - -t "webdevops/php-apache:8.5-alpine" \ - -t "ghcr.io/webdevops/php-apache:8.5-alpine" \ - "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.5-alpine" \ - "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.5-alpine" && exit 0 - sleep $((i*i)) - done - exit 1 - php-apache_8-5_publish: - name: 'webdevops/php-apache:8.5 - Publish' - runs-on: ubuntu-latest - needs: php-apache_8-5 - if: "${{github.ref == 'refs/heads/master'}}" - steps: - - - uses: docker/setup-buildx-action@v3 - - - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - name: 'Create and push multi-arch manifest' - run: |- - set -euo pipefail - for i in 1 2 3 4 5 6 7 8 9 10; do - docker buildx imagetools create \ - -t "webdevops/php-apache:8.5" \ - -t "ghcr.io/webdevops/php-apache:8.5" \ - "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.5" \ - "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.5" && exit 0 - sleep $((i*i)) - done - exit 1 - php-dev_8-1: - strategy: - fail-fast: false - matrix: - include: - - - arch: amd64 - runner: ubuntu-24.04 - platform: linux/amd64 - - - arch: arm64 - runner: ubuntu-24.04-arm - platform: linux/arm64 - name: 'webdevops/php-dev:8.1 (${{ matrix.arch }})' - needs: php_8-1_publish - if: '${{ !failure() && !cancelled() }}' - runs-on: '${{ matrix.runner }}' - container: webdevops/dockerfile-build-env - steps: - - - uses: actions/checkout@v6 - - - uses: docker/setup-buildx-action@v3 - - - name: 'Download parent image (OCI layout): webdevops/php:8.1' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/download-artifact@v4.1.9 - with: - name: 'docker-parent-php_8-1-${{ matrix.arch }}' - path: .ci-oci-image/php_8-1 - - - name: 'Build (load locally)' - if: "${{ github.ref == 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-dev/8.1 - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - - - name: 'Build (load locally, from parent artifact)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-dev/8.1 - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.1=oci-layout://.ci-oci-image/php_8-1:ci-parent-image' - - - name: 'run serverspec' - run: |- - cd tests/serverspec - echo "FROM ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1 >> Dockerfile_test - echo "COPY conf/ /" >> Dockerfile_test - bundle install - bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - - name: 'run structure-test' - run: |- - cd tests/structure-test - /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1 --config php-dev/test.yaml - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Push arch image' - if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1' - php-dev_8-1-alpine: + if: "${{ github.ref != 'refs/heads/master' }}" + uses: actions/upload-artifact@v4 + with: + name: 'docker-parent-php-apache_8-5-${{ matrix.arch }}' + path: .ci-oci-image/php-apache_8-5 + retention-days: 1 + compression-level: 0 + if-no-files-found: error + php-apache_8-5-alpine: strategy: fail-fast: false matrix: @@ -3640,8 +2915,8 @@ jobs: arch: arm64 runner: ubuntu-24.04-arm platform: linux/arm64 - name: 'webdevops/php-dev:8.1-alpine (${{ matrix.arch }})' - needs: php_8-1-alpine_publish + name: 'webdevops/php-apache:8.5-alpine (${{ matrix.arch }})' + needs: php_8-5-alpine_publish if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env @@ -3651,21 +2926,21 @@ jobs: - uses: docker/setup-buildx-action@v3 - - name: 'Download parent image (OCI layout): webdevops/php:8.1-alpine' + name: 'Download parent image (OCI layout): webdevops/php:8.5-alpine' if: "${{ github.ref != 'refs/heads/master' }}" uses: actions/download-artifact@v4.1.9 with: - name: 'docker-parent-php_8-1-alpine-${{ matrix.arch }}' - path: .ci-oci-image/php_8-1-alpine + name: 'docker-parent-php_8-5-alpine-${{ matrix.arch }}' + path: .ci-oci-image/php_8-5-alpine - name: 'Build (load locally)' if: "${{ github.ref == 'refs/heads/master' }}" uses: docker/build-push-action@v6 with: - context: docker/php-dev/8.1-alpine + context: docker/php-apache/8.5-alpine platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine' cache-from: type=gha cache-to: 'type=gha,mode=max' build-args: 'TARGETARCH=${{ matrix.arch }}' @@ -3674,27 +2949,22 @@ jobs: if: "${{ github.ref != 'refs/heads/master' }}" uses: docker/build-push-action@v6 with: - context: docker/php-dev/8.1-alpine + context: docker/php-apache/8.5-alpine platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine' cache-from: type=gha cache-to: 'type=gha,mode=max' build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.1-alpine=oci-layout://.ci-oci-image/php_8-1-alpine:ci-parent-image' + build-contexts: 'webdevops/php:8.5-alpine=oci-layout://.ci-oci-image/php_8-5-alpine:ci-parent-image' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install - bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - - name: 'run structure-test' - run: |- - cd tests/structure-test - /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine --config php-dev/test.yaml + bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3706,11 +2976,33 @@ jobs: - name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine' - php-dev_8-1-alpine_publish: - name: 'webdevops/php-dev:8.1-alpine - Publish' + run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine' + - + name: 'Export image (OCI layout)' + if: "${{ github.ref != 'refs/heads/master' }}" + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.5-alpine + platforms: '${{ matrix.platform }}' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' + build-contexts: 'webdevops/php:8.5-alpine=oci-layout://.ci-oci-image/php_8-5-alpine:ci-parent-image' + outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-apache_8-5-alpine' + - + name: 'Upload image (OCI layout)' + if: "${{ github.ref != 'refs/heads/master' }}" + uses: actions/upload-artifact@v4 + with: + name: 'docker-parent-php-apache_8-5-alpine-${{ matrix.arch }}' + path: .ci-oci-image/php-apache_8-5-alpine + retention-days: 1 + compression-level: 0 + if-no-files-found: error + php-apache_8-5-alpine_publish: + name: 'webdevops/php-apache:8.5-alpine - Publish' runs-on: ubuntu-latest - needs: php-dev_8-1-alpine + needs: php-apache_8-5-alpine if: "${{github.ref == 'refs/heads/master'}}" steps: - @@ -3734,17 +3026,17 @@ jobs: set -euo pipefail for i in 1 2 3 4 5 6 7 8 9 10; do docker buildx imagetools create \ - -t "webdevops/php-dev:8.1-alpine" \ - -t "ghcr.io/webdevops/php-dev:8.1-alpine" \ - "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-amd64-8.1-alpine" \ - "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-arm64-8.1-alpine" && exit 0 + -t "webdevops/php-apache:8.5-alpine" \ + -t "ghcr.io/webdevops/php-apache:8.5-alpine" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.5-alpine" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.5-alpine" && exit 0 sleep $((i*i)) done exit 1 - php-dev_8-1_publish: - name: 'webdevops/php-dev:8.1 - Publish' + php-apache_8-5_publish: + name: 'webdevops/php-apache:8.5 - Publish' runs-on: ubuntu-latest - needs: php-dev_8-1 + needs: php-apache_8-5 if: "${{github.ref == 'refs/heads/master'}}" steps: - @@ -3768,10 +3060,10 @@ jobs: set -euo pipefail for i in 1 2 3 4 5 6 7 8 9 10; do docker buildx imagetools create \ - -t "webdevops/php-dev:8.1" \ - -t "ghcr.io/webdevops/php-dev:8.1" \ - "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-amd64-8.1" \ - "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-arm64-8.1" && exit 0 + -t "webdevops/php-apache:8.5" \ + -t "ghcr.io/webdevops/php-apache:8.5" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.5" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.5" && exit 0 sleep $((i*i)) done exit 1 @@ -4604,227 +3896,9 @@ jobs: bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - name: 'run structure-test' - run: |- - cd tests/structure-test - /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine --config php-dev/test.yaml - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Push arch image' - if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine' - php-dev_8-5-alpine_publish: - name: 'webdevops/php-dev:8.5-alpine - Publish' - runs-on: ubuntu-latest - needs: php-dev_8-5-alpine - if: "${{github.ref == 'refs/heads/master'}}" - steps: - - - uses: docker/setup-buildx-action@v3 - - - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - name: 'Create and push multi-arch manifest' - run: |- - set -euo pipefail - for i in 1 2 3 4 5 6 7 8 9 10; do - docker buildx imagetools create \ - -t "webdevops/php-dev:8.5-alpine" \ - -t "ghcr.io/webdevops/php-dev:8.5-alpine" \ - "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-amd64-8.5-alpine" \ - "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-arm64-8.5-alpine" && exit 0 - sleep $((i*i)) - done - exit 1 - php-dev_8-5_publish: - name: 'webdevops/php-dev:8.5 - Publish' - runs-on: ubuntu-latest - needs: php-dev_8-5 - if: "${{github.ref == 'refs/heads/master'}}" - steps: - - - uses: docker/setup-buildx-action@v3 - - - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - name: 'Create and push multi-arch manifest' - run: |- - set -euo pipefail - for i in 1 2 3 4 5 6 7 8 9 10; do - docker buildx imagetools create \ - -t "webdevops/php-dev:8.5" \ - -t "ghcr.io/webdevops/php-dev:8.5" \ - "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-amd64-8.5" \ - "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-arm64-8.5" && exit 0 - sleep $((i*i)) - done - exit 1 - php-nginx-dev_8-1: - strategy: - fail-fast: false - matrix: - include: - - - arch: amd64 - runner: ubuntu-24.04 - platform: linux/amd64 - - - arch: arm64 - runner: ubuntu-24.04-arm - platform: linux/arm64 - name: 'webdevops/php-nginx-dev:8.1 (${{ matrix.arch }})' - needs: php-nginx_8-1_publish - if: '${{ !failure() && !cancelled() }}' - runs-on: '${{ matrix.runner }}' - container: webdevops/dockerfile-build-env - steps: - - - uses: actions/checkout@v6 - - - uses: docker/setup-buildx-action@v3 - - - name: 'Download parent image (OCI layout): webdevops/php-nginx:8.1' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/download-artifact@v4.1.9 - with: - name: 'docker-parent-php-nginx_8-1-${{ matrix.arch }}' - path: .ci-oci-image/php-nginx_8-1 - - - name: 'Build (load locally)' - if: "${{ github.ref == 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx-dev/8.1 - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - - - name: 'Build (load locally, from parent artifact)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx-dev/8.1 - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php-nginx:8.1=oci-layout://.ci-oci-image/php-nginx_8-1:ci-parent-image' - - - name: 'run serverspec' - run: |- - cd tests/serverspec - echo "FROM ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1 >> Dockerfile_test - echo "COPY conf/ /" >> Dockerfile_test - bundle install - bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Push arch image' - if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1' - php-nginx-dev_8-1-alpine: - strategy: - fail-fast: false - matrix: - include: - - - arch: amd64 - runner: ubuntu-24.04 - platform: linux/amd64 - - - arch: arm64 - runner: ubuntu-24.04-arm - platform: linux/arm64 - name: 'webdevops/php-nginx-dev:8.1-alpine (${{ matrix.arch }})' - needs: php-nginx_8-1-alpine_publish - if: '${{ !failure() && !cancelled() }}' - runs-on: '${{ matrix.runner }}' - container: webdevops/dockerfile-build-env - steps: - - - uses: actions/checkout@v6 - - - uses: docker/setup-buildx-action@v3 - - - name: 'Download parent image (OCI layout): webdevops/php-nginx:8.1-alpine' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/download-artifact@v4.1.9 - with: - name: 'docker-parent-php-nginx_8-1-alpine-${{ matrix.arch }}' - path: .ci-oci-image/php-nginx_8-1-alpine - - - name: 'Build (load locally)' - if: "${{ github.ref == 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx-dev/8.1-alpine - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - - - name: 'Build (load locally, from parent artifact)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx-dev/8.1-alpine - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php-nginx:8.1-alpine=oci-layout://.ci-oci-image/php-nginx_8-1-alpine:ci-parent-image' - - - name: 'run serverspec' - run: |- - cd tests/serverspec - echo "FROM ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine >> Dockerfile_test - echo "COPY conf/ /" >> Dockerfile_test - bundle install - bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine --config php-dev/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -4836,11 +3910,11 @@ jobs: - name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine' - php-nginx-dev_8-1-alpine_publish: - name: 'webdevops/php-nginx-dev:8.1-alpine - Publish' + run: 'docker push "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine' + php-dev_8-5-alpine_publish: + name: 'webdevops/php-dev:8.5-alpine - Publish' runs-on: ubuntu-latest - needs: php-nginx-dev_8-1-alpine + needs: php-dev_8-5-alpine if: "${{github.ref == 'refs/heads/master'}}" steps: - @@ -4864,17 +3938,17 @@ jobs: set -euo pipefail for i in 1 2 3 4 5 6 7 8 9 10; do docker buildx imagetools create \ - -t "webdevops/php-nginx-dev:8.1-alpine" \ - -t "ghcr.io/webdevops/php-nginx-dev:8.1-alpine" \ - "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-amd64-8.1-alpine" \ - "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-arm64-8.1-alpine" && exit 0 + -t "webdevops/php-dev:8.5-alpine" \ + -t "ghcr.io/webdevops/php-dev:8.5-alpine" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-amd64-8.5-alpine" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-arm64-8.5-alpine" && exit 0 sleep $((i*i)) done exit 1 - php-nginx-dev_8-1_publish: - name: 'webdevops/php-nginx-dev:8.1 - Publish' + php-dev_8-5_publish: + name: 'webdevops/php-dev:8.5 - Publish' runs-on: ubuntu-latest - needs: php-nginx-dev_8-1 + needs: php-dev_8-5 if: "${{github.ref == 'refs/heads/master'}}" steps: - @@ -4898,10 +3972,10 @@ jobs: set -euo pipefail for i in 1 2 3 4 5 6 7 8 9 10; do docker buildx imagetools create \ - -t "webdevops/php-nginx-dev:8.1" \ - -t "ghcr.io/webdevops/php-nginx-dev:8.1" \ - "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-amd64-8.1" \ - "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-arm64-8.1" && exit 0 + -t "webdevops/php-dev:8.5" \ + -t "ghcr.io/webdevops/php-dev:8.5" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-amd64-8.5" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-arm64-8.5" && exit 0 sleep $((i*i)) done exit 1 @@ -5699,292 +4773,20 @@ jobs: bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Push arch image' - if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine' - php-nginx-dev_8-5-alpine_publish: - name: 'webdevops/php-nginx-dev:8.5-alpine - Publish' - runs-on: ubuntu-latest - needs: php-nginx-dev_8-5-alpine - if: "${{github.ref == 'refs/heads/master'}}" - steps: - - - uses: docker/setup-buildx-action@v3 - - - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - name: 'Create and push multi-arch manifest' - run: |- - set -euo pipefail - for i in 1 2 3 4 5 6 7 8 9 10; do - docker buildx imagetools create \ - -t "webdevops/php-nginx-dev:8.5-alpine" \ - -t "ghcr.io/webdevops/php-nginx-dev:8.5-alpine" \ - "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-amd64-8.5-alpine" \ - "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-arm64-8.5-alpine" && exit 0 - sleep $((i*i)) - done - exit 1 - php-nginx-dev_8-5_publish: - name: 'webdevops/php-nginx-dev:8.5 - Publish' - runs-on: ubuntu-latest - needs: php-nginx-dev_8-5 - if: "${{github.ref == 'refs/heads/master'}}" - steps: - - - uses: docker/setup-buildx-action@v3 - - - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - name: 'Create and push multi-arch manifest' - run: |- - set -euo pipefail - for i in 1 2 3 4 5 6 7 8 9 10; do - docker buildx imagetools create \ - -t "webdevops/php-nginx-dev:8.5" \ - -t "ghcr.io/webdevops/php-nginx-dev:8.5" \ - "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-amd64-8.5" \ - "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-arm64-8.5" && exit 0 - sleep $((i*i)) - done - exit 1 - php-nginx_8-1: - strategy: - fail-fast: false - matrix: - include: - - - arch: amd64 - runner: ubuntu-24.04 - platform: linux/amd64 - - - arch: arm64 - runner: ubuntu-24.04-arm - platform: linux/arm64 - name: 'webdevops/php-nginx:8.1 (${{ matrix.arch }})' - needs: php_8-1_publish - if: '${{ !failure() && !cancelled() }}' - runs-on: '${{ matrix.runner }}' - container: webdevops/dockerfile-build-env - steps: - - - uses: actions/checkout@v6 - - - uses: docker/setup-buildx-action@v3 - - - name: 'Download parent image (OCI layout): webdevops/php:8.1' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/download-artifact@v4.1.9 - with: - name: 'docker-parent-php_8-1-${{ matrix.arch }}' - path: .ci-oci-image/php_8-1 - - - name: 'Build (load locally)' - if: "${{ github.ref == 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx/8.1 - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - - - name: 'Build (load locally, from parent artifact)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx/8.1 - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.1=oci-layout://.ci-oci-image/php_8-1:ci-parent-image' - - - name: 'run serverspec' - run: |- - cd tests/serverspec - echo "FROM ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1 >> Dockerfile_test - echo "COPY conf/ /" >> Dockerfile_test - bundle install - bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test - - - name: 'run structure-test' - run: |- - cd tests/structure-test - /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.1 --config php-nginx/test.yaml - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Push arch image' - if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1' - - - name: 'Export image (OCI layout)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx/8.1 - platforms: '${{ matrix.platform }}' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.1=oci-layout://.ci-oci-image/php_8-1:ci-parent-image' - outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-nginx_8-1' - - - name: 'Upload image (OCI layout)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/upload-artifact@v4 - with: - name: 'docker-parent-php-nginx_8-1-${{ matrix.arch }}' - path: .ci-oci-image/php-nginx_8-1 - retention-days: 1 - compression-level: 0 - if-no-files-found: error - php-nginx_8-1-alpine: - strategy: - fail-fast: false - matrix: - include: - - - arch: amd64 - runner: ubuntu-24.04 - platform: linux/amd64 - - - arch: arm64 - runner: ubuntu-24.04-arm - platform: linux/arm64 - name: 'webdevops/php-nginx:8.1-alpine (${{ matrix.arch }})' - needs: php_8-1-alpine_publish - if: '${{ !failure() && !cancelled() }}' - runs-on: '${{ matrix.runner }}' - container: webdevops/dockerfile-build-env - steps: - - - uses: actions/checkout@v6 - - - uses: docker/setup-buildx-action@v3 - - - name: 'Download parent image (OCI layout): webdevops/php:8.1-alpine' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/download-artifact@v4.1.9 - with: - name: 'docker-parent-php_8-1-alpine-${{ matrix.arch }}' - path: .ci-oci-image/php_8-1-alpine - - - name: 'Build (load locally)' - if: "${{ github.ref == 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx/8.1-alpine - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - - - name: 'Build (load locally, from parent artifact)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx/8.1-alpine - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.1-alpine=oci-layout://.ci-oci-image/php_8-1-alpine:ci-parent-image' - - - name: 'run serverspec' - run: |- - cd tests/serverspec - echo "FROM ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine >> Dockerfile_test - echo "COPY conf/ /" >> Dockerfile_test - bundle install - bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - - name: 'run structure-test' - run: |- - cd tests/structure-test - /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine --config php-nginx/test.yaml - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Push arch image' - if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine' - - - name: 'Export image (OCI layout)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx/8.1-alpine - platforms: '${{ matrix.platform }}' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/php:8.1-alpine=oci-layout://.ci-oci-image/php_8-1-alpine:ci-parent-image' - outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php-nginx_8-1-alpine' - - - name: 'Upload image (OCI layout)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/upload-artifact@v4 + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - name: 'docker-parent-php-nginx_8-1-alpine-${{ matrix.arch }}' - path: .ci-oci-image/php-nginx_8-1-alpine - retention-days: 1 - compression-level: 0 - if-no-files-found: error - php-nginx_8-1-alpine_publish: - name: 'webdevops/php-nginx:8.1-alpine - Publish' + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Push arch image' + if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine' + php-nginx-dev_8-5-alpine_publish: + name: 'webdevops/php-nginx-dev:8.5-alpine - Publish' runs-on: ubuntu-latest - needs: php-nginx_8-1-alpine + needs: php-nginx-dev_8-5-alpine if: "${{github.ref == 'refs/heads/master'}}" steps: - @@ -6008,17 +4810,17 @@ jobs: set -euo pipefail for i in 1 2 3 4 5 6 7 8 9 10; do docker buildx imagetools create \ - -t "webdevops/php-nginx:8.1-alpine" \ - -t "ghcr.io/webdevops/php-nginx:8.1-alpine" \ - "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-amd64-8.1-alpine" \ - "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-arm64-8.1-alpine" && exit 0 + -t "webdevops/php-nginx-dev:8.5-alpine" \ + -t "ghcr.io/webdevops/php-nginx-dev:8.5-alpine" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-amd64-8.5-alpine" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-arm64-8.5-alpine" && exit 0 sleep $((i*i)) done exit 1 - php-nginx_8-1_publish: - name: 'webdevops/php-nginx:8.1 - Publish' + php-nginx-dev_8-5_publish: + name: 'webdevops/php-nginx-dev:8.5 - Publish' runs-on: ubuntu-latest - needs: php-nginx_8-1 + needs: php-nginx-dev_8-5 if: "${{github.ref == 'refs/heads/master'}}" steps: - @@ -6042,10 +4844,10 @@ jobs: set -euo pipefail for i in 1 2 3 4 5 6 7 8 9 10; do docker buildx imagetools create \ - -t "webdevops/php-nginx:8.1" \ - -t "ghcr.io/webdevops/php-nginx:8.1" \ - "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-amd64-8.1" \ - "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-arm64-8.1" && exit 0 + -t "webdevops/php-nginx-dev:8.5" \ + -t "ghcr.io/webdevops/php-nginx-dev:8.5" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-amd64-8.5" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-arm64-8.5" && exit 0 sleep $((i*i)) done exit 1 @@ -7137,282 +5939,6 @@ jobs: sleep $((i*i)) done exit 1 - php_8-1: - strategy: - fail-fast: false - matrix: - include: - - - arch: amd64 - runner: ubuntu-24.04 - platform: linux/amd64 - - - arch: arm64 - runner: ubuntu-24.04-arm - platform: linux/arm64 - name: 'webdevops/php:8.1 (${{ matrix.arch }})' - needs: toolbox_latest_publish - if: '${{ !failure() && !cancelled() }}' - runs-on: '${{ matrix.runner }}' - container: webdevops/dockerfile-build-env - steps: - - - uses: actions/checkout@v6 - - - uses: docker/setup-buildx-action@v3 - - - name: 'Download parent image (OCI layout): webdevops/toolbox:latest' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/download-artifact@v4.1.9 - with: - name: 'docker-parent-toolbox_latest-${{ matrix.arch }}' - path: .ci-oci-image/toolbox_latest - - - name: 'Build (load locally)' - if: "${{ github.ref == 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-official/8.1 - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - - - name: 'Build (load locally, from parent artifact)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-official/8.1 - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image' - - - name: 'run serverspec' - run: |- - cd tests/serverspec - echo "FROM ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1 >> Dockerfile_test - echo "COPY conf/ /" >> Dockerfile_test - bundle install - bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test - - - name: 'run structure-test' - run: |- - cd tests/structure-test - /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.1 --config php/test.yaml - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Push arch image' - if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1' - - - name: 'Export image (OCI layout)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-official/8.1 - platforms: '${{ matrix.platform }}' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image' - outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php_8-1' - - - name: 'Upload image (OCI layout)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/upload-artifact@v4 - with: - name: 'docker-parent-php_8-1-${{ matrix.arch }}' - path: .ci-oci-image/php_8-1 - retention-days: 1 - compression-level: 0 - if-no-files-found: error - php_8-1-alpine: - strategy: - fail-fast: false - matrix: - include: - - - arch: amd64 - runner: ubuntu-24.04 - platform: linux/amd64 - - - arch: arm64 - runner: ubuntu-24.04-arm - platform: linux/arm64 - name: 'webdevops/php:8.1-alpine (${{ matrix.arch }})' - needs: toolbox_latest_publish - if: '${{ !failure() && !cancelled() }}' - runs-on: '${{ matrix.runner }}' - container: webdevops/dockerfile-build-env - steps: - - - uses: actions/checkout@v6 - - - uses: docker/setup-buildx-action@v3 - - - name: 'Download parent image (OCI layout): webdevops/toolbox:latest' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/download-artifact@v4.1.9 - with: - name: 'docker-parent-toolbox_latest-${{ matrix.arch }}' - path: .ci-oci-image/toolbox_latest - - - name: 'Build (load locally)' - if: "${{ github.ref == 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-official/8.1-alpine - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - - - name: 'Build (load locally, from parent artifact)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-official/8.1-alpine - platforms: '${{ matrix.platform }}' - load: true - tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image' - - - name: 'run serverspec' - run: |- - cd tests/serverspec - echo "FROM ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine >> Dockerfile_test - echo "COPY conf/ /" >> Dockerfile_test - bundle install - bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - - name: 'run structure-test' - run: |- - cd tests/structure-test - /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine --config php/test.yaml - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Push arch image' - if: "${{github.ref == 'refs/heads/master'}}" - run: 'docker push "ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine' - - - name: 'Export image (OCI layout)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: docker/build-push-action@v6 - with: - context: docker/php-official/8.1-alpine - platforms: '${{ matrix.platform }}' - cache-from: type=gha - cache-to: 'type=gha,mode=max' - build-args: 'TARGETARCH=${{ matrix.arch }}' - build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image' - outputs: 'type=oci,tar=false,name=ci-parent-image,dest=.ci-oci-image/php_8-1-alpine' - - - name: 'Upload image (OCI layout)' - if: "${{ github.ref != 'refs/heads/master' }}" - uses: actions/upload-artifact@v4 - with: - name: 'docker-parent-php_8-1-alpine-${{ matrix.arch }}' - path: .ci-oci-image/php_8-1-alpine - retention-days: 1 - compression-level: 0 - if-no-files-found: error - php_8-1-alpine_publish: - name: 'webdevops/php:8.1-alpine - Publish' - runs-on: ubuntu-latest - needs: php_8-1-alpine - if: "${{github.ref == 'refs/heads/master'}}" - steps: - - - uses: docker/setup-buildx-action@v3 - - - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - name: 'Create and push multi-arch manifest' - run: |- - set -euo pipefail - for i in 1 2 3 4 5 6 7 8 9 10; do - docker buildx imagetools create \ - -t "webdevops/php:8.1-alpine" \ - -t "ghcr.io/webdevops/php:8.1-alpine" \ - -t "webdevops/php-official:8.1-alpine" \ - -t "ghcr.io/webdevops/php-official:8.1-alpine" \ - "ghcr.io/webdevops/php:sha-${{ github.sha }}-amd64-8.1-alpine" \ - "ghcr.io/webdevops/php:sha-${{ github.sha }}-arm64-8.1-alpine" && exit 0 - sleep $((i*i)) - done - exit 1 - php_8-1_publish: - name: 'webdevops/php:8.1 - Publish' - runs-on: ubuntu-latest - needs: php_8-1 - if: "${{github.ref == 'refs/heads/master'}}" - steps: - - - uses: docker/setup-buildx-action@v3 - - - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - name: 'Create and push multi-arch manifest' - run: |- - set -euo pipefail - for i in 1 2 3 4 5 6 7 8 9 10; do - docker buildx imagetools create \ - -t "webdevops/php:8.1" \ - -t "ghcr.io/webdevops/php:8.1" \ - -t "webdevops/php-official:8.1" \ - -t "ghcr.io/webdevops/php-official:8.1" \ - "ghcr.io/webdevops/php:sha-${{ github.sha }}-amd64-8.1" \ - "ghcr.io/webdevops/php:sha-${{ github.sha }}-arm64-8.1" && exit 0 - sleep $((i*i)) - done - exit 1 php_8-2: strategy: fail-fast: false diff --git a/README.md b/README.md index e8887c0cb..697e3cde7 100644 --- a/README.md +++ b/README.md @@ -64,32 +64,26 @@ As in many projects the documentation is kind of up to date 😅. The following images which are currently supported are based on `php:{VER}-fpm-buster`. -* `webdevops/php:8.1` * `webdevops/php:8.2` * `webdevops/php:8.3` * `webdevops/php:8.4` * `webdevops/php:8.5` -* `webdevops/php-dev:8.1` * `webdevops/php-dev:8.2` * `webdevops/php-dev:8.3` * `webdevops/php-dev:8.4` * `webdevops/php-dev:8.5` -* `webdevops/php-apache:8.1` * `webdevops/php-apache:8.2` * `webdevops/php-apache:8.3` * `webdevops/php-apache:8.4` * `webdevops/php-apache:8.5` -* `webdevops/php-apache-dev:8.1` * `webdevops/php-apache-dev:8.2` * `webdevops/php-apache-dev:8.3` * `webdevops/php-apache-dev:8.4` * `webdevops/php-apache-dev:8.5` -* `webdevops/php-nginx:8.1` * `webdevops/php-nginx:8.2` * `webdevops/php-nginx:8.3` * `webdevops/php-nginx:8.4` * `webdevops/php-nginx:8.5` -* `webdevops/php-nginx-dev:8.1` * `webdevops/php-nginx-dev:8.2` * `webdevops/php-nginx-dev:8.3` * `webdevops/php-nginx-dev:8.4` @@ -100,32 +94,26 @@ The following images which are currently supported are based on `php:{VER}-fpm-b The following images which are currently supported are based on `php:{VER}-fpm-alpine`. -* `webdevops/php:8.1-alpine` * `webdevops/php:8.2-alpine` * `webdevops/php:8.3-alpine` * `webdevops/php:8.4-alpine` * `webdevops/php:8.5-alpine` -* `webdevops/php-dev:8.1-alpine` * `webdevops/php-dev:8.2-alpine` * `webdevops/php-dev:8.3-alpine` * `webdevops/php-dev:8.4-alpine` * `webdevops/php-dev:8.5-alpine` -* `webdevops/php-apache:8.1-alpine` * `webdevops/php-apache:8.2-alpine` * `webdevops/php-apache:8.3-alpine` * `webdevops/php-apache:8.4-alpine` * `webdevops/php-apache:8.5-alpine` -* `webdevops/php-apache-dev:8.1-alpine` * `webdevops/php-apache-dev:8.2-alpine` * `webdevops/php-apache-dev:8.3-alpine` * `webdevops/php-apache-dev:8.4-alpine` * `webdevops/php-apache-dev:8.5-alpine` -* `webdevops/php-nginx:8.1-alpine` * `webdevops/php-nginx:8.2-alpine` * `webdevops/php-nginx:8.3-alpine` * `webdevops/php-nginx:8.4-alpine` * `webdevops/php-nginx:8.5-alpine` -* `webdevops/php-nginx-dev:8.1-alpine` * `webdevops/php-nginx-dev:8.2-alpine` * `webdevops/php-nginx-dev:8.3-alpine` * `webdevops/php-nginx-dev:8.4-alpine` diff --git a/ci/BLACKLIST b/ci/BLACKLIST index fa626e512..421289673 100644 --- a/ci/BLACKLIST +++ b/ci/BLACKLIST @@ -5,4 +5,5 @@ 7.3 7.4 8.0 +8.1 ssh diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile b/docker/php-apache-dev/8.1-alpine/Dockerfile deleted file mode 100644 index c9fcf72fe..000000000 --- a/docker/php-apache-dev/8.1-alpine/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:8.1-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:8.1-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 deleted file mode 100644 index fff6f7d7c..000000000 --- a/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,11 +0,0 @@ -{{ docker.from("php-apache", "8.1-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="8.1") }} \ - {{ provision.runBootstrap() }} diff --git a/docker/php-apache-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/8.1-alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.1-alpine/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/8.1-alpine/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/8.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/8.1-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/8.1-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/8.1-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 59b4f08b8..000000000 --- a/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi diff --git a/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/8.1-alpine/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.1-alpine/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/8.1-alpine/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/8.1/Dockerfile b/docker/php-apache-dev/8.1/Dockerfile deleted file mode 100644 index 060fb1027..000000000 --- a/docker/php-apache-dev/8.1/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:8.1 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:8.1 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/8.1/Dockerfile.jinja2 b/docker/php-apache-dev/8.1/Dockerfile.jinja2 deleted file mode 100644 index 797fe355c..000000000 --- a/docker/php-apache-dev/8.1/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "8.1") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="8.1") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/8.1/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.1/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/8.1/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/8.1/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.1/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/8.1/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/8.1/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.1/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/8.1/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/8.1/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/8.1/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 59b4f08b8..000000000 --- a/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi diff --git a/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/8.1/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.1/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/8.1/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache/8.1-alpine/Dockerfile b/docker/php-apache/8.1-alpine/Dockerfile deleted file mode 100644 index 921f97317..000000000 --- a/docker/php-apache/8.1-alpine/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:8.1-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:8.1-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apk-install \ - apache2 \ - apache2-ctl \ - apache2-utils \ - apache2-proxy \ - apache2-ssl \ - # Fix issue with module loading order of lbmethod_* (see https://serverfault.com/questions/922573/apache2-fails-to-start-after-recent-update-to-2-4-34-no-clue-why) - && sed -i '2,5{H;d}; ${p;x;s/^\n//}' /etc/apache2/conf.d/proxy.conf \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap - -EXPOSE 80 443 diff --git a/docker/php-apache/8.1-alpine/Dockerfile.jinja2 b/docker/php-apache/8.1-alpine/Dockerfile.jinja2 deleted file mode 100644 index 314711d47..000000000 --- a/docker/php-apache/8.1-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php", "8.1-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.alpine() }} \ - {{ provision.runBootstrap() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.1-alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.1-alpine/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/8.1-alpine/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/8.1-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/8.1-alpine/conf/bin/service.d/httpd.sh deleted file mode 100644 index f88544c62..000000000 --- a/docker/php-apache/8.1-alpine/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid - -exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/global.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/8.1-alpine/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/main.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/8.1-alpine/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/php.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/8.1-alpine/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/8.1-alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.1-alpine/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/8.1-alpine/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/8.1-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.1-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/8.1-alpine/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.1-alpine/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/8.1-alpine/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/8.1/Dockerfile b/docker/php-apache/8.1/Dockerfile deleted file mode 100644 index c25caa8c6..000000000 --- a/docker/php-apache/8.1/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:8.1 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:8.1 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/8.1/Dockerfile.jinja2 b/docker/php-apache/8.1/Dockerfile.jinja2 deleted file mode 100644 index d8302f97f..000000000 --- a/docker/php-apache/8.1/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "8.1") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian9() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.1/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.1/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/8.1/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/8.1/conf/bin/service.d/httpd.sh b/docker/php-apache/8.1/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/8.1/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/8.1/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.1/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/8.1/conf/etc/httpd/global.conf b/docker/php-apache/8.1/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/8.1/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/8.1/conf/etc/httpd/main.conf b/docker/php-apache/8.1/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/8.1/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/8.1/conf/etc/httpd/php.conf b/docker/php-apache/8.1/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/8.1/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/8.1/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.1/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/8.1/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/8.1/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.1/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/8.1/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/8.1/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.1/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/8.1/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/8.1/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.1/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/8.1/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/8.1/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.1/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/8.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/8.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/8.1/conf/etc/httpd/vhost.conf b/docker/php-apache/8.1/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/8.1/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/8.1/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.1/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/8.1/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/8.1/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.1/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/8.1/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/8.1/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.1/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/8.1/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.1/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/8.1/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/8.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.1/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/8.1/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/8.1/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.1/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/8.1/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.1/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/8.1/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-dev/8.1-alpine/Dockerfile b/docker/php-dev/8.1-alpine/Dockerfile deleted file mode 100644 index 8befbec67..000000000 --- a/docker/php-dev/8.1-alpine/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:8.1-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:8.1-alpine - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap diff --git a/docker/php-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-dev/8.1-alpine/Dockerfile.jinja2 deleted file mode 100644 index 172b7e225..000000000 --- a/docker/php-dev/8.1-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("php", "8.1-alpine") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="8.1") }} \ - {{ provision.runBootstrap() }} diff --git a/docker/php-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/8.1-alpine/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.1-alpine/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/8.1-alpine/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 59b4f08b8..000000000 --- a/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi diff --git a/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/8.1/Dockerfile b/docker/php-dev/8.1/Dockerfile deleted file mode 100644 index 08f9fa287..000000000 --- a/docker/php-dev/8.1/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:8.1 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:8.1 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/8.1/Dockerfile.jinja2 b/docker/php-dev/8.1/Dockerfile.jinja2 deleted file mode 100644 index f216cf16d..000000000 --- a/docker/php-dev/8.1/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "8.1") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="8.1") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/8.1/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.1/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/8.1/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/8.1/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.1/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/8.1/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/8.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.1/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 59b4f08b8..000000000 --- a/docker/php-dev/8.1/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi diff --git a/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.1/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.1/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/8.1/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile b/docker/php-nginx-dev/8.1-alpine/Dockerfile deleted file mode 100644 index e2f717632..000000000 --- a/docker/php-nginx-dev/8.1-alpine/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:8.1-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:8.1-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 deleted file mode 100644 index ca0551600..000000000 --- a/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,11 +0,0 @@ -{{ docker.from("php-nginx", "8.1-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="8.1") }} \ - {{ provision.runBootstrap() }} diff --git a/docker/php-nginx-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 59b4f08b8..000000000 --- a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi diff --git a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.1-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.1-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/8.1-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/8.1/Dockerfile b/docker/php-nginx-dev/8.1/Dockerfile deleted file mode 100644 index b6af3a3d8..000000000 --- a/docker/php-nginx-dev/8.1/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:8.1 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:8.1 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.1/Dockerfile.jinja2 b/docker/php-nginx-dev/8.1/Dockerfile.jinja2 deleted file mode 100644 index 29b063c47..000000000 --- a/docker/php-nginx-dev/8.1/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "8.1") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="8.1") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/8.1/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.1/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/8.1/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/8.1/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.1/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/8.1/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 59b4f08b8..000000000 --- a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi diff --git a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.1/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.1/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/8.1/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx/8.1-alpine/Dockerfile b/docker/php-nginx/8.1-alpine/Dockerfile deleted file mode 100644 index bf47a72e4..000000000 --- a/docker/php-nginx/8.1-alpine/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:8.1-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:8.1-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apk-install \ - nginx \ - && docker-run-bootstrap - -EXPOSE 80 443 diff --git a/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 deleted file mode 100644 index 6d53a2548..000000000 --- a/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "8.1-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.alpine() }} \ - {{ provision.runBootstrap() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.1-alpine/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/8.1-alpine/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/8.1-alpine/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/8.1-alpine/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.1-alpine/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/8.1-alpine/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/8.1-alpine/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/global.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/main.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/nginx.conf deleted file mode 100644 index b9cb4ebc4..000000000 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,34 +0,0 @@ -# For more information on configuration, see: -# * Official English Documentation: http://nginx.org/en/docs/ -# * Official Russian Documentation: http://nginx.org/ru/docs/ - -user nginx; -worker_processes auto; -error_log /docker.stdout; -pid /run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /docker.stdout main; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - # Load modular configuration files from the /etc/nginx/conf.d directory. - # See http://nginx.org/en/docs/ngx_core_module.html#include - # for more information. - include /etc/nginx/conf.d/*.conf; -} diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/php.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.key b/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf deleted file mode 100644 index b4df6d710..000000000 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 ssl default_server; - listen [::]:443 ssl default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 28e8aab17..000000000 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,6 +0,0 @@ -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/8.1-alpine/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.1-alpine/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/8.1-alpine/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/8.1-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.1-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/8.1-alpine/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.1-alpine/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/8.1-alpine/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/8.1/Dockerfile b/docker/php-nginx/8.1/Dockerfile deleted file mode 100644 index 18a6087b7..000000000 --- a/docker/php-nginx/8.1/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:8.1 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:8.1 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/8.1/Dockerfile.jinja2 b/docker/php-nginx/8.1/Dockerfile.jinja2 deleted file mode 100644 index 4c3912db2..000000000 --- a/docker/php-nginx/8.1/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "8.1") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.1/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/8.1/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/8.1/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/8.1/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.1/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/8.1/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/8.1/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/8.1/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/8.1/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.1/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/8.1/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/8.1/conf/etc/nginx/global.conf b/docker/php-nginx/8.1/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/8.1/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/8.1/conf/etc/nginx/main.conf b/docker/php-nginx/8.1/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/8.1/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/8.1/conf/etc/nginx/php.conf b/docker/php-nginx/8.1/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/8.1/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.key b/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf deleted file mode 100644 index b4df6d710..000000000 --- a/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 ssl default_server; - listen [::]:443 ssl default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 28e8aab17..000000000 --- a/docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,6 +0,0 @@ -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/8.1/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.1/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/8.1/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/8.1/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.1/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/8.1/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.1/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/8.1/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/8.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.1/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/8.1/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/8.1/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.1/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/8.1/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.1/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/8.1/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile deleted file mode 100644 index a8664fc4e..000000000 --- a/docker/php-official/8.1-alpine/Dockerfile +++ /dev/null @@ -1,253 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:8.1-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM php:8.1-fpm-alpine - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" -ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" -ENV COMPOSER_VERSION="2" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Init bootstrap - # Add community - && echo https://dl-4.alpinelinux.org/alpine/v3.20/community/ >> /etc/apk/repositories \ - # System update - && /usr/local/bin/apk-upgrade \ - # Install base stuff - && apk-install \ - bash \ - ca-certificates \ - openssl \ - && update-ca-certificates \ - && /usr/local/bin/generate-dockerimage-info \ - ## Fix su execution (eg for tests) - && mkdir -p /etc/pam.d/ \ - && echo 'auth sufficient pam_rootok.so' >> /etc/pam.d/su - -RUN set -x \ - # Install services - && chmod +x /opt/docker/bin/* \ - && apk-install \ - supervisor \ - wget \ - curl \ - vim \ - sed \ - tzdata \ - busybox-suid \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap - -RUN set -x \ - && apk-install shadow \ - && apk-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - drill \ - ldns \ - openssh-client \ - rsync \ - patch \ - git \ - && docker-run-bootstrap - -RUN set -x \ - # Install php environment - && apk-install \ - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - pngcrush \ - optipng \ - pngquant \ - vips \ - rabbitmq-c \ - c-client \ - # Libraries - libavif \ - libldap \ - icu-libs \ - libintl \ - libpq \ - libxslt \ - libgomp \ - libzip \ - libmemcached \ - yaml \ - # Build dependencies - linux-headers \ - autoconf \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - libavif-dev \ - freetype-dev \ - gmp-dev \ - libjpeg-turbo-dev \ - libpng-dev \ - vips-dev \ - krb5-dev \ - openssl-dev \ - imap-dev \ - imagemagick-dev \ - rabbitmq-c-dev \ - openldap-dev \ - icu-dev \ - postgresql-dev \ - libxml2-dev \ - ldb-dev \ - pcre-dev \ - libxslt-dev \ - libzip-dev \ - libmemcached-dev \ - yaml-dev \ - # Install guetzli - && wget https://github.com/google/guetzli/archive/master.zip \ - && unzip master.zip \ - && make -C guetzli-master \ - && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ - && rm -rf master.zip guetzli-master \ - # https://github.com/docker-library/php/issues/240 - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ - # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ - && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ - # Install extensions - && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ - && docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \ - && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ - && cd /usr/src/php/ext/amqp && git submodule update --init \ - && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install \ - bcmath \ - bz2 \ - calendar \ - exif \ - ftp \ - gmp \ - ffi \ - imagick \ - amqp \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xsl \ - zip \ - gd \ - opcache \ - # Install extensions for PHP 7.x - # Memcached for 7.3 can currently only be built from master - && MEMCACHED="`mktemp -d`" \ - && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \ - && docker-php-ext-configure $MEMCACHED \ - && docker-php-ext-install $MEMCACHED \ - && rm -rf $MEMCACHED \ - && pecl install apcu \ - && pecl install excimer \ - && pecl install opentelemetry \ - && pecl install protobuf-4.33.5 \ - && pecl install vips \ - && pecl install yaml \ - && pecl install redis \ - && pecl install mongodb \ - && pecl install xmlrpc-1.0.0RC3 \ - && docker-php-ext-enable \ - apcu \ - excimer \ - opentelemetry \ - protobuf \ - vips \ - yaml \ - redis \ - xmlrpc \ - imagick \ - mongodb \ - # Uninstall dev and header packages - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - libavif-dev \ - freetype-dev \ - gmp-dev \ - libjpeg-turbo-dev \ - libpng-dev \ - vips-dev \ - krb5-dev \ - openssl-dev \ - imap-dev \ - rabbitmq-c-dev \ - imagemagick-dev \ - openldap-dev \ - icu-dev \ - postgresql-dev \ - libxml2-dev \ - ldb-dev \ - pcre-dev \ - libxslt-dev \ - libzip-dev \ - libmemcached-dev \ - yaml-dev \ - && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap - -WORKDIR / -EXPOSE 9000 -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/php-official/8.1-alpine/Dockerfile.jinja2 b/docker/php-official/8.1-alpine/Dockerfile.jinja2 deleted file mode 100644 index b8f6232f7..000000000 --- a/docker/php-official/8.1-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,35 +0,0 @@ - -{{ docker.fromOfficial("php", "8.1-fpm-alpine") }} - -{{ docker.version() }} - -{{ environment.general() }} -{{ environment.base() }} -{{ environment.baseApp() }} -{{ environment.phpOfficialSendmailWorkaround() }} {# Check if needed #} -{{ environment.phpAlpineIconvWorkaround() }} -{{ environment.phpComposerVersion() }} - -{{ baselayout.copy() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ bootstrap.alpine('3.20') }} - -RUN set -x \ - {{ base.alpine() }} \ - {{ provision.runBootstrap() }} - -RUN set -x \ - {{ baseapp.alpine() }} \ - {{ provision.runBootstrap() }} - -RUN set -x \ - {{ php.officialAlpine(version='8.1') }} \ - {{ provision.runBootstrap() }} - -{{ docker.workdir('/') }} -{{ docker.expose('9000') }} -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/8.1-alpine/conf/VERSION b/docker/php-official/8.1-alpine/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/php-official/8.1-alpine/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/php-official/8.1-alpine/conf/bin/bootstrap.sh b/docker/php-official/8.1-alpine/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/php-official/8.1-alpine/conf/bin/config.sh b/docker/php-official/8.1-alpine/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/php-official/8.1-alpine/conf/bin/control.sh b/docker/php-official/8.1-alpine/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/php-official/8.1-alpine/conf/bin/entrypoint.sh b/docker/php-official/8.1-alpine/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/php-official/8.1-alpine/conf/bin/provision b/docker/php-official/8.1-alpine/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/8.1-alpine/conf/bin/provision.py b/docker/php-official/8.1-alpine/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/cron.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/cron.sh deleted file mode 100644 index 5af135768..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/crond -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/postfix.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/ssh.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/supervisor.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.1-alpine/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-provision b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/service b/docker/php-official/8.1-alpine/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/version-compare b/docker/php-official/8.1-alpine/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/php-official/8.1-alpine/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/php-official/8.1-alpine/conf/etc/cron/.gitkeep b/docker/php-official/8.1-alpine/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1-alpine/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.1-alpine/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php-official/8.1-alpine/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php-official/8.1-alpine/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.1-alpine/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/php-official/8.1-alpine/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/php-official/8.1-alpine/conf/etc/php/conf.d/.gitkeep b/docker/php-official/8.1-alpine/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1-alpine/conf/etc/php/fpm/.gitkeep b/docker/php-official/8.1-alpine/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1-alpine/conf/etc/php/php.ini b/docker/php-official/8.1-alpine/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php-official/8.1-alpine/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php-official/8.1-alpine/conf/etc/php/php.webdevops.ini b/docker/php-official/8.1-alpine/conf/etc/php/php.webdevops.ini deleted file mode 100644 index 3225cb602..000000000 --- a/docker/php-official/8.1-alpine/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,37 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -; Enable session-based upload progress only when an application needs it. -session.upload_progress.enabled = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php-official/8.1-alpine/conf/etc/supervisor.conf b/docker/php-official/8.1-alpine/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/php-official/8.1-alpine/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1-alpine/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.1-alpine/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/php-official/8.1-alpine/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/php-official/8.1-alpine/conf/provision/ansible.cfg b/docker/php-official/8.1-alpine/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 7a7b42f6b..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Add group -addgroup -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -adduser -D -u "$APPLICATION_UID" -h "/home/application" -s /bin/bash -G $APPLICATION_GROUP "$APPLICATION_USER" - diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index ee56ccaae..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -PHP_ETC_DIR=/usr/local/etc/php -PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf -PHP_POOL_CONF=www.conf -PHP_POOL_DIR=/usr/local/etc/php-fpm.d -PHP_FPM_BIN=/usr/local/sbin/php-fpm -PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index 71caa48d3..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu|Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" - ;; -esac diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 4a348a38a..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -if [ $IMAGE_FAMILY == "Alpine" ]; then - echo "Skipping ionCube installation on Alpine" - return -fi - -echo "Installing ionCube loader" - -DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/php-official/8.1-alpine/conf/provision/build.d/.gitkeep b/docker/php-official/8.1-alpine/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1-alpine/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.1-alpine/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/8.1-alpine/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.1-alpine/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1-alpine/conf/provision/roles/.gitkeep b/docker/php-official/8.1-alpine/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1-alpine/conf/provision/service.d/.gitkeep b/docker/php-official/8.1-alpine/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1-alpine/conf/provision/service.d/cron.sh b/docker/php-official/8.1-alpine/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/php-official/8.1-alpine/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.1-alpine/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/php-official/8.1-alpine/conf/provision/service.d/postfix.sh b/docker/php-official/8.1-alpine/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/php-official/8.1-alpine/conf/provision/service.d/ssh.sh b/docker/php-official/8.1-alpine/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/php-official/8.1-alpine/conf/provision/service.d/syslog.sh b/docker/php-official/8.1-alpine/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/8.1-alpine/conf/provision/variables-webdevops.yml b/docker/php-official/8.1-alpine/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.1-alpine/conf/provision/variables.yml b/docker/php-official/8.1-alpine/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/8.1-alpine/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.1/8.1 b/docker/php-official/8.1/8.1 deleted file mode 120000 index 8d1eec65a..000000000 --- a/docker/php-official/8.1/8.1 +++ /dev/null @@ -1 +0,0 @@ -8.1 \ No newline at end of file diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile deleted file mode 100644 index 6074944e0..000000000 --- a/docker/php-official/8.1/Dockerfile +++ /dev/null @@ -1,238 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:8.1 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM php:8.1-fpm-bookworm - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" -ENV COMPOSER_VERSION="2" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Init bootstrap - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Base stuff - && apt-install \ - apt-transport-https \ - ca-certificates \ - locales \ - gnupg - -RUN set -x \ - # Install packages - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Libraries - libavif15 \ - libvips42 \ - librabbitmq4 \ - libldap-2.5-0 \ - libxslt1.1 \ - libldap-common \ - zlib1g \ - libpq5 \ - libpng16-16 \ - libmcrypt4 \ - libzip4 \ - libyaml-0-2 \ - libc-client2007e \ - # Dev and headers - libavif-dev \ - libjpeg62-turbo-dev \ - libwebp-dev \ - libfreetype6-dev \ - libbz2-dev \ - libicu-dev \ - libldap2-dev \ - libldb-dev \ - libmcrypt-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - libmemcached-dev \ - libpng-dev \ - libpq-dev \ - libzip-dev \ - libc-client-dev \ - libc-client2007e-dev \ - libkrb5-dev \ - libvips-dev \ - librabbitmq-dev \ - libmagick++-dev \ - libgmp-dev \ - libyaml-dev \ - # Install guetzli - && wget https://github.com/google/guetzli/archive/master.zip \ - && unzip master.zip \ - && make -C guetzli-master \ - && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ - && rm -rf master.zip guetzli-master \ - # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ - && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ - # Install extensions - && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ - && docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \ - && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ - && cd /usr/src/php/ext/amqp && git submodule update --init \ - && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install \ - bcmath \ - amqp \ - imagick \ - ffi \ - bz2 \ - calendar \ - exif \ - ftp \ - gmp \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xsl \ - zip \ - gd \ - opcache \ - && pecl install memcached \ - && pecl install apcu \ - && pecl install excimer \ - && pecl install opentelemetry \ - && pecl install protobuf-4.33.5 \ - && pecl install xmlrpc-1.0.0RC3 \ - && pecl install vips \ - && pecl install yaml \ - && pecl install redis \ - && pecl install mongodb \ - && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ - && echo extension=excimer.so > /usr/local/etc/php/conf.d/excimer.ini \ - && echo extension=opentelemetry.so > /usr/local/etc/php/conf.d/opentelemetry.ini \ - && echo extension=protobuf.so > /usr/local/etc/php/conf.d/protobuf.ini \ - && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ - && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ - && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ - && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ - && echo extension=yaml.so > /usr/local/etc/php/conf.d/yaml.ini \ - && echo extension=xmlrpc.so > /usr/local/etc/php/conf.d/xmlrpc.ini \ - # Uninstall dev and header packages - && apt-get purge -y -f --force-yes \ - libc-client-dev \ - libc-client2007e-dev \ - libkrb5-dev \ - libbz2-dev \ - libavif-dev \ - libicu-dev \ - libldap2-dev \ - libldb-dev \ - libmcrypt-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - libpng-dev \ - libwebp-dev \ - libpq-dev \ - libzip-dev \ - libvips-dev \ - librabbitmq-dev \ - libmagick++-dev \ - libgmp-dev \ - libyaml-dev \ - && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -WORKDIR / -EXPOSE 9000 -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/php-official/8.1/Dockerfile.jinja2 b/docker/php-official/8.1/Dockerfile.jinja2 deleted file mode 100644 index b04f11f2a..000000000 --- a/docker/php-official/8.1/Dockerfile.jinja2 +++ /dev/null @@ -1,37 +0,0 @@ - -{{ docker.fromOfficial("php", "8.1-fpm-bookworm") }} - -{{ docker.version() }} - -{{ environment.general() }} -{{ environment.base() }} -{{ environment.baseApp() }} -{{ environment.phpOfficialSendmailWorkaround() }} -{{ environment.phpComposerVersion() }} - -{{ baselayout.copy() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ bootstrap.debian('bookworm') }} - -RUN set -x \ - {{ base.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ baseapp.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ php.official(version='8.1',distribution='bookworm') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.workdir('/') }} -{{ docker.expose('9000') }} -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/8.1/conf/VERSION b/docker/php-official/8.1/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/php-official/8.1/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/php-official/8.1/conf/bin/bootstrap.sh b/docker/php-official/8.1/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/php-official/8.1/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/php-official/8.1/conf/bin/config.sh b/docker/php-official/8.1/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/php-official/8.1/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/php-official/8.1/conf/bin/control.sh b/docker/php-official/8.1/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/php-official/8.1/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/php-official/8.1/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.1/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/php-official/8.1/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/php-official/8.1/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.1/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/php-official/8.1/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/php-official/8.1/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.1/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/php-official/8.1/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/php-official/8.1/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.1/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/php-official/8.1/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/php-official/8.1/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.1/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/php-official/8.1/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/php-official/8.1/conf/bin/entrypoint.sh b/docker/php-official/8.1/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/php-official/8.1/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/php-official/8.1/conf/bin/provision b/docker/php-official/8.1/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/php-official/8.1/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/8.1/conf/bin/provision.py b/docker/php-official/8.1/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/php-official/8.1/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/php-official/8.1/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/8.1/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/php-official/8.1/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/php-official/8.1/conf/bin/service.d/cron.sh b/docker/php-official/8.1/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/php-official/8.1/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/8.1/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/8.1/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/php-official/8.1/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/php-official/8.1/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.1/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/php-official/8.1/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/8.1/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/8.1/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php-official/8.1/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php-official/8.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/8.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php-official/8.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-official/8.1/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.1/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php-official/8.1/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/8.1/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/8.1/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/php-official/8.1/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/php-official/8.1/conf/bin/service.d/postfix.sh b/docker/php-official/8.1/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/php-official/8.1/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/php-official/8.1/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/8.1/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/php-official/8.1/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/php-official/8.1/conf/bin/service.d/ssh.sh b/docker/php-official/8.1/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/php-official/8.1/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/8.1/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/8.1/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-official/8.1/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-official/8.1/conf/bin/service.d/supervisor.sh b/docker/php-official/8.1/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/php-official/8.1/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/8.1/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/8.1/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/php-official/8.1/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/php-official/8.1/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.1/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/php-official/8.1/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/8.1/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.1/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/php-official/8.1/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/php-official/8.1/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.1/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/php-official/8.1/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/php-official/8.1/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.1/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/php-official/8.1/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/8.1/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.1/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php-official/8.1/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php-official/8.1/conf/bin/usr-bin/docker-provision b/docker/php-official/8.1/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/php-official/8.1/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/8.1/conf/bin/usr-bin/docker-service b/docker/php-official/8.1/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/php-official/8.1/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/php-official/8.1/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.1/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/php-official/8.1/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/php-official/8.1/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.1/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/php-official/8.1/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/php-official/8.1/conf/bin/usr-bin/service b/docker/php-official/8.1/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/php-official/8.1/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/php-official/8.1/conf/bin/usr-bin/version-compare b/docker/php-official/8.1/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/php-official/8.1/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/php-official/8.1/conf/etc/cron/.gitkeep b/docker/php-official/8.1/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.1/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php-official/8.1/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php-official/8.1/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.1/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/php-official/8.1/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/php-official/8.1/conf/etc/php/conf.d/.gitkeep b/docker/php-official/8.1/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1/conf/etc/php/fpm/.gitkeep b/docker/php-official/8.1/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1/conf/etc/php/php.ini b/docker/php-official/8.1/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php-official/8.1/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php-official/8.1/conf/etc/php/php.webdevops.ini b/docker/php-official/8.1/conf/etc/php/php.webdevops.ini deleted file mode 100644 index 3225cb602..000000000 --- a/docker/php-official/8.1/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,37 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -; Enable session-based upload progress only when an application needs it. -session.upload_progress.enabled = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php-official/8.1/conf/etc/supervisor.conf b/docker/php-official/8.1/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/php-official/8.1/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/8.1/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.1/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.1/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/php-official/8.1/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.1/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/php-official/8.1/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.1/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php-official/8.1/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php-official/8.1/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.1/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/php-official/8.1/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.1/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/php-official/8.1/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.1/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/php-official/8.1/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.1/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/php-official/8.1/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/php-official/8.1/conf/provision/ansible.cfg b/docker/php-official/8.1/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.1/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/php-official/8.1/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/php-official/8.1/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php-official/8.1/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/php-official/8.1/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/php-official/8.1/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index ee56ccaae..000000000 --- a/docker/php-official/8.1/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -PHP_ETC_DIR=/usr/local/etc/php -PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf -PHP_POOL_CONF=www.conf -PHP_POOL_DIR=/usr/local/etc/php-fpm.d -PHP_FPM_BIN=/usr/local/sbin/php-fpm -PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/php-official/8.1/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index c1e716300..000000000 --- a/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" - ;; -esac diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 4a348a38a..000000000 --- a/docker/php-official/8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -if [ $IMAGE_FAMILY == "Alpine" ]; then - echo "Skipping ionCube installation on Alpine" - return -fi - -echo "Installing ionCube loader" - -DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/php-official/8.1/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/php-official/8.1/conf/provision/build.d/.gitkeep b/docker/php-official/8.1/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.1/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/php-official/8.1/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/php-official/8.1/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.1/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.1/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/php-official/8.1/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/php-official/8.1/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.1/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php-official/8.1/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php-official/8.1/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.1/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php-official/8.1/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/8.1/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.1/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1/conf/provision/roles/.gitkeep b/docker/php-official/8.1/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1/conf/provision/service.d/.gitkeep b/docker/php-official/8.1/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.1/conf/provision/service.d/cron.sh b/docker/php-official/8.1/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/php-official/8.1/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/php-official/8.1/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.1/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/php-official/8.1/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/php-official/8.1/conf/provision/service.d/postfix.sh b/docker/php-official/8.1/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/php-official/8.1/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/php-official/8.1/conf/provision/service.d/ssh.sh b/docker/php-official/8.1/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/php-official/8.1/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/php-official/8.1/conf/provision/service.d/syslog.sh b/docker/php-official/8.1/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/php-official/8.1/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/8.1/conf/provision/variables-webdevops.yml b/docker/php-official/8.1/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/8.1/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.1/conf/provision/variables.yml b/docker/php-official/8.1/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/8.1/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php/8.1 b/docker/php/8.1 deleted file mode 120000 index bceb000f2..000000000 --- a/docker/php/8.1 +++ /dev/null @@ -1 +0,0 @@ -../php-official/8.1 \ No newline at end of file diff --git a/docker/php/8.1-alpine b/docker/php/8.1-alpine deleted file mode 120000 index 87a0269b1..000000000 --- a/docker/php/8.1-alpine +++ /dev/null @@ -1 +0,0 @@ -../php-official/8.1-alpine \ No newline at end of file diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst index c010499b2..d7c69ed3d 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst @@ -8,7 +8,7 @@ Tag Distribution name PHP Version ``7.3`` *deprecated* PHP 7.3 ``7.4`` *customized official php image* PHP 7.4 ``8.0`` *customized official php image* PHP 8.0 -``8.1`` *customized official php image* PHP 8.1 +``8.1`` *deprecated* PHP 8.1 ``8.2`` *customized official php image* PHP 8.2 ``8.3`` *customized official php image* PHP 8.3 ``8.4`` *customized official php image* PHP 8.4 @@ -18,7 +18,7 @@ Tag Distribution name PHP Version ``7.3-alpine`` *deprecated* PHP 7.3 ``7.4-alpine`` *customized official php image* PHP 7.4 ``8.0-alpine`` *customized official php image* PHP 8.0 -``8.1-alpine`` *customized official php image* PHP 8.1 +``8.1-alpine`` *deprecated* PHP 8.1 ``8.2-alpine`` *customized official php image* PHP 8.2 ``8.3-alpine`` *customized official php image* PHP 8.3 ``8.4-alpine`` *customized official php image* PHP 8.4 diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 7a27302cc..928657687 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -34,7 +34,7 @@ libmcrypt4 \ libzip4 \ libyaml-0-2 \ -{%- if version == '8.1' or version == '8.2' or version == '8.3' %} +{%- if version == '8.2' or version == '8.3' %} libc-client2007e \ {%- endif %} # Dev and headers @@ -62,9 +62,7 @@ libmagick++-dev \ libgmp-dev \ libyaml-dev \ -{%- if version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} libssl-dev \ -{%- endif %} # Install guetzli && wget https://github.com/google/guetzli/archive/master.zip \ && unzip master.zip \ @@ -126,11 +124,7 @@ && pecl install apcu \ && pecl install excimer \ && pecl install opentelemetry \ -{%- if version == '8.1' %} - && pecl install protobuf-4.33.5 \ -{%- else %} && pecl install protobuf \ -{%- endif %} && pecl install xmlrpc-1.0.0RC3 \ && pecl install vips \ && pecl install yaml \ @@ -169,9 +163,7 @@ libmagick++-dev \ libgmp-dev \ libyaml-dev \ -{%- if version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} libssl-dev \ -{%- endif %} && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ @@ -226,11 +218,7 @@ icu-dev \ postgresql-dev \ libxml2-dev \ - {%- if version == '8.1' %} - ldb-dev \ - {%- else %} samba-dev \ - {%- endif %} pcre-dev \ libxslt-dev \ libzip-dev \ @@ -305,11 +293,7 @@ && pecl install apcu \ && pecl install excimer \ && pecl install opentelemetry \ -{%- if version == '8.1' %} - && pecl install protobuf-4.33.5 \ -{%- else %} && pecl install protobuf \ -{%- endif %} && pecl install vips \ && pecl install yaml \ && pecl install redis \ @@ -350,11 +334,7 @@ icu-dev \ postgresql-dev \ libxml2-dev \ - {%- if version == '8.1' %} - ldb-dev \ - {%- else %} samba-dev \ - {%- endif %} pcre-dev \ libxslt-dev \ libzip-dev \ diff --git a/tests/structure-test/php/test.yaml b/tests/structure-test/php/test.yaml index b952f72d5..8f3be2655 100644 --- a/tests/structure-test/php/test.yaml +++ b/tests/structure-test/php/test.yaml @@ -136,10 +136,10 @@ commandTests: command: "which" args: ["patch"] expectedOutput: ["/usr/bin/patch"] - - name: "PHP version is 8.1 or newer" + - name: "PHP version is 8.2 or newer" command: "php" args: ["-v"] - expectedOutput: ['PHP 8\.[1-9][0-9]*\.'] + expectedOutput: ['PHP 8\.([2-9]|[1-9][0-9]+)\.'] - name: "fpm config test" command: "/usr/local/bin/php-fpm" args: ["-t"]