diff --git a/AGENTS.md b/AGENTS.md index f3fbd973b..4b759b0a5 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -13,7 +13,7 @@ | `tests/` | serverspec (Ruby) and container-structure-test definitions run by the CI | | `docs/` | User documentation | -Not everything under `docker/` is built: `docker/php/7.0` to `docker/php/8.0` (and their `-alpine` variants) are dangling symlinks. The tags that are built are the `-t "webdevops/..."` lines in `.github/workflows/build.yaml`. +`docker/php/` are symlinks to `docker/php-official/`; both images are built from the same Dockerfiles. The tags that are built are the `-t "webdevops/..."` lines in `.github/workflows/build.yaml`. ## Build and test diff --git a/ci/BLACKLIST b/ci/BLACKLIST deleted file mode 100644 index 34a0ea656..000000000 --- a/ci/BLACKLIST +++ /dev/null @@ -1,8 +0,0 @@ -5.6 -7.0 -7.1 -7.2 -7.3 -7.4 -8.0 -8.1 diff --git a/conf/console.yml b/conf/console.yml index abf505dfa..344029c93 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -35,14 +35,6 @@ dockerTest: OS_FAMILY: 'alpine' OS_VERSION: '3' PHP_OFFICIAL: '1' - 'php[^:]*:5.6$': - OS_FAMILY: 'debian' - OS_VERSION: '9' - PHP_OFFICIAL: '1' - 'php[^:]*:7.0$': - OS_FAMILY: 'debian' - OS_VERSION: '9' - PHP_OFFICIAL: '1' 'php[^:]*:8.(0|1|2|3|4|5)': OS_FAMILY: 'debian' OS_VERSION: '12' diff --git a/conf/provision.yml b/conf/provision.yml index b6e0c1bc7..0194bbf03 100644 --- a/conf/provision.yml +++ b/conf/provision.yml @@ -3,7 +3,6 @@ provision: base: configuration: base/general: '*' - base/centos: centos-* base/alpine: alpine base-app: configuration: @@ -11,29 +10,19 @@ provision: apache: configuration: apache/general : '*' - apache/centos : centos-* apache/alpine : alpine nginx: configuration: nginx/general : '*' - nginx/centos : centos-* nginx/alpine : alpine - php: - configuration: - php/general : '(debian|ubuntu|centos|alpine)' - php/ubuntu-12.04 : ubuntu-12.04 - php/alpine : alpine php-apache: configuration: apache/general : '*' - apache/centos : centos-* - apache/alpine : alpine php-apache/general: '*' php-apache/alpine : '*-alpine' php-nginx: configuration: nginx/general : '*' - nginx/centos : centos-* nginx/alpine : '*-alpine' php-nginx/general : '*' php-dev: diff --git a/docker/php-apache-dev/8.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-apache-dev/8.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/8.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-apache-dev/8.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-apache-dev/8.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/8.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-apache-dev/8.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-apache-dev/8.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/8.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-apache-dev/8.2/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.2/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-apache-dev/8.2/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/8.2/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-apache-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-apache-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-apache-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-apache-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-apache-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-apache-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-apache-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-apache-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-apache-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-apache-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-apache-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-apache-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-apache/8.2/Dockerfile.jinja2 b/docker/php-apache/8.2/Dockerfile.jinja2 index 5542d2e07..1e1fcfd21 100644 --- a/docker/php-apache/8.2/Dockerfile.jinja2 +++ b/docker/php-apache/8.2/Dockerfile.jinja2 @@ -6,7 +6,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ apache.debian9() }} \ + {{ apache.debian() }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-apache/8.3/Dockerfile.jinja2 b/docker/php-apache/8.3/Dockerfile.jinja2 index b4b658c7c..75fd9ae07 100644 --- a/docker/php-apache/8.3/Dockerfile.jinja2 +++ b/docker/php-apache/8.3/Dockerfile.jinja2 @@ -6,7 +6,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ apache.debian12() }} \ + {{ apache.debian() }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-apache/8.4/Dockerfile.jinja2 b/docker/php-apache/8.4/Dockerfile.jinja2 index dd8ec549b..c1aa1c7ff 100644 --- a/docker/php-apache/8.4/Dockerfile.jinja2 +++ b/docker/php-apache/8.4/Dockerfile.jinja2 @@ -6,7 +6,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ apache.debian12() }} \ + {{ apache.debian() }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-apache/8.5/Dockerfile.jinja2 b/docker/php-apache/8.5/Dockerfile.jinja2 index 9863f453d..5455b122f 100644 --- a/docker/php-apache/8.5/Dockerfile.jinja2 +++ b/docker/php-apache/8.5/Dockerfile.jinja2 @@ -6,7 +6,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ apache.debian12() }} \ + {{ apache.debian() }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-dev/8.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-dev/8.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/8.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-dev/8.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-dev/8.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/8.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-dev/8.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-dev/8.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/8.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-dev/8.2/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.2/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-dev/8.2/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/8.2/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-nginx-dev/8.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-nginx-dev/8.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/8.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-nginx-dev/8.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-nginx-dev/8.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/8.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-nginx-dev/8.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-nginx-dev/8.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/8.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-nginx-dev/8.2/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.2/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-nginx-dev/8.2/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/8.2/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-nginx-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-nginx-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-nginx-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-nginx-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-nginx-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-nginx-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-nginx-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-nginx-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-nginx-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-nginx-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/docker/php-nginx-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/docker/php-nginx-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index ee99c23bc..a40e266fa 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && 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 \ + && 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 \ diff --git a/docker/php-official/8.2/Dockerfile.jinja2 b/docker/php-official/8.2/Dockerfile.jinja2 index 2f644a114..0f34b7a2d 100644 --- a/docker/php-official/8.2/Dockerfile.jinja2 +++ b/docker/php-official/8.2/Dockerfile.jinja2 @@ -14,7 +14,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.debian('bookworm') }} + {{ bootstrap.debian() }} RUN set -x \ {{ base.debian() }} \ @@ -28,7 +28,7 @@ RUN set -x \ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ set -x \ - {{ php.official(version='8.2',distribution='bookworm') }} \ + {{ php.official(version='8.2') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-official/8.3/Dockerfile b/docker/php-official/8.3/Dockerfile index dce9702ed..89e05d4ad 100644 --- a/docker/php-official/8.3/Dockerfile +++ b/docker/php-official/8.3/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && 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 \ + && 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 \ diff --git a/docker/php-official/8.3/Dockerfile.jinja2 b/docker/php-official/8.3/Dockerfile.jinja2 index f34099942..d31cc3db2 100644 --- a/docker/php-official/8.3/Dockerfile.jinja2 +++ b/docker/php-official/8.3/Dockerfile.jinja2 @@ -14,7 +14,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.debian('bookworm') }} + {{ bootstrap.debian() }} RUN set -x \ {{ base.debian() }} \ @@ -28,7 +28,7 @@ RUN set -x \ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ set -x \ - {{ php.official(version='8.3',distribution='bookworm') }} \ + {{ php.official(version='8.3') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-official/8.4/Dockerfile b/docker/php-official/8.4/Dockerfile index fa9d30d0e..f4f544149 100644 --- a/docker/php-official/8.4/Dockerfile +++ b/docker/php-official/8.4/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && 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 \ + && 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 \ diff --git a/docker/php-official/8.4/Dockerfile.jinja2 b/docker/php-official/8.4/Dockerfile.jinja2 index 94e3fd816..a742419b6 100644 --- a/docker/php-official/8.4/Dockerfile.jinja2 +++ b/docker/php-official/8.4/Dockerfile.jinja2 @@ -14,7 +14,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.debian('bookworm') }} + {{ bootstrap.debian() }} RUN set -x \ {{ base.debian() }} \ @@ -28,7 +28,7 @@ RUN set -x \ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ set -x \ - {{ php.official(version='8.4',distribution='bookworm') }} \ + {{ php.official(version='8.4') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-official/8.5/Dockerfile b/docker/php-official/8.5/Dockerfile index e6f993e38..c4fdb7222 100644 --- a/docker/php-official/8.5/Dockerfile +++ b/docker/php-official/8.5/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && 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 \ + && 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 \ diff --git a/docker/php-official/8.5/Dockerfile.jinja2 b/docker/php-official/8.5/Dockerfile.jinja2 index d6e5a198e..17a88b6e7 100644 --- a/docker/php-official/8.5/Dockerfile.jinja2 +++ b/docker/php-official/8.5/Dockerfile.jinja2 @@ -14,7 +14,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.debian('bookworm') }} + {{ bootstrap.debian() }} RUN set -x \ {{ base.debian() }} \ @@ -28,7 +28,7 @@ RUN set -x \ RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ set -x \ - {{ php.official(version='8.5',distribution='bookworm') }} \ + {{ php.official(version='8.5') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php/7.0 b/docker/php/7.0 deleted file mode 120000 index 92dcdb94d..000000000 --- a/docker/php/7.0 +++ /dev/null @@ -1 +0,0 @@ -../php-official/7.0 \ No newline at end of file diff --git a/docker/php/7.1 b/docker/php/7.1 deleted file mode 120000 index 0105923f0..000000000 --- a/docker/php/7.1 +++ /dev/null @@ -1 +0,0 @@ -../php-official/7.1 \ No newline at end of file diff --git a/docker/php/7.1-alpine b/docker/php/7.1-alpine deleted file mode 120000 index 918613270..000000000 --- a/docker/php/7.1-alpine +++ /dev/null @@ -1 +0,0 @@ -../php-official/7.1-alpine \ No newline at end of file diff --git a/docker/php/7.2 b/docker/php/7.2 deleted file mode 120000 index 10924ed35..000000000 --- a/docker/php/7.2 +++ /dev/null @@ -1 +0,0 @@ -../php-official/7.2 \ No newline at end of file diff --git a/docker/php/7.2-alpine b/docker/php/7.2-alpine deleted file mode 120000 index afdfc9b61..000000000 --- a/docker/php/7.2-alpine +++ /dev/null @@ -1 +0,0 @@ -../php-official/7.2-alpine \ No newline at end of file diff --git a/docker/php/7.3 b/docker/php/7.3 deleted file mode 120000 index 1d803401b..000000000 --- a/docker/php/7.3 +++ /dev/null @@ -1 +0,0 @@ -../php-official/7.3 \ No newline at end of file diff --git a/docker/php/7.3-alpine b/docker/php/7.3-alpine deleted file mode 120000 index d39b0e3df..000000000 --- a/docker/php/7.3-alpine +++ /dev/null @@ -1 +0,0 @@ -../php-official/7.3-alpine \ No newline at end of file diff --git a/docker/php/7.4 b/docker/php/7.4 deleted file mode 120000 index 1f859cc82..000000000 --- a/docker/php/7.4 +++ /dev/null @@ -1 +0,0 @@ -../php-official/7.4 \ No newline at end of file diff --git a/docker/php/7.4-alpine b/docker/php/7.4-alpine deleted file mode 120000 index 753512a0b..000000000 --- a/docker/php/7.4-alpine +++ /dev/null @@ -1 +0,0 @@ -../php-official/7.4-alpine \ No newline at end of file diff --git a/docker/php/8.0 b/docker/php/8.0 deleted file mode 120000 index adcc39bfe..000000000 --- a/docker/php/8.0 +++ /dev/null @@ -1 +0,0 @@ -../php-official/8.0 \ No newline at end of file diff --git a/docker/php/8.0-alpine b/docker/php/8.0-alpine deleted file mode 120000 index 815d9292a..000000000 --- a/docker/php/8.0-alpine +++ /dev/null @@ -1 +0,0 @@ -../php-official/8.0-alpine \ No newline at end of file diff --git a/docs/known-issues.md b/docs/known-issues.md index 11bee06a2..0ea055085 100644 --- a/docs/known-issues.md +++ b/docs/known-issues.md @@ -64,6 +64,30 @@ These options and tools are part of the images but do not work, or work only in - **Images:** the `-alpine` tags of `php-*`. It works in `base:alpine`. - **Instead:** Leave it out; `apk-install` keeps no package cache. +### `contrib` and `non-free` packages in the Debian PHP images + +- **Effect:** Only the Debian component `main` is enabled. The image build tries to add `contrib` and `non-free`, but its `sed` command expects the one-line `sources.list` format, while Debian 12 lists its sources in `/etc/apt/sources.list.d/debian.sources`. Packages from `contrib` or `non-free`, for example `unrar` or `ttf-mscorefonts-installer`, cannot be installed. +- **Images:** `php-*` with the Debian tags `8.2` to `8.5`. +- **Instead:** Enable the components in your Dockerfile: + + ```dockerfile + FROM webdevops/php:8.5 + RUN sed -i 's/^Components: main$/Components: main contrib non-free/' /etc/apt/sources.list.d/debian.sources \ + && apt-install unrar + ``` + +### Alpine 3.20 repository in the Alpine PHP images + +- **Effect:** `/etc/apk/repositories` also lists the community repository of Alpine 3.20 (`https://dl-4.alpinelinux.org/alpine/v3.20/community/`), although the images are based on a newer Alpine release, for example 3.24 in `8.5-alpine`. `apk` reads that index too, so a package that is missing from the current release can be installed from Alpine 3.20, built against older libraries. +- **Images:** `php-*` with the Alpine tags `8.2-alpine` to `8.5-alpine`. +- **Instead:** Remove the line in your Dockerfile before you install packages: `RUN sed -i '/\/v3\.20\//d' /etc/apk/repositories`. + +### Package sources in the Debian Nginx images + +- **Effect:** `/etc/apt/sources.list` holds only the nginx.org repository and ends without a line break. A line appended with `echo "deb ..." >> /etc/apt/sources.list` is joined to the last line: apt ignores the new repository and only prints warnings such as `component misspelt in sources.list`. The nginx.org key is stored in the deprecated global keyring `/etc/apt/trusted.gpg`, which apt trusts for every repository; `apt-get update` warns about it. +- **Images:** `php-nginx` and `php-nginx-dev` with the Debian tags `8.2` to `8.5`. +- **Instead:** Add your own repositories as a new file in `/etc/apt/sources.list.d/`, for example `echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list`. + ### Nginx and PHP-FPM without IPv6 - **Effect:** If the container has no IPv6, Nginx cannot listen on `[::]:80` and `[::]:443`, and PHP-FPM cannot listen on `[::]:9000` (`Address family not supported by protocol`). supervisord restarts them over and over. diff --git a/provisioning/apache/centos/bin/service.d/httpd.sh b/provisioning/apache/centos/bin/service.d/httpd.sh deleted file mode 100644 index 2ce73000c..000000000 --- a/provisioning/apache/centos/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 httpd -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/provisioning/base/centos/bin/service.d/cron.sh b/provisioning/base/centos/bin/service.d/cron.sh deleted file mode 100644 index e99eb535a..000000000 --- a/provisioning/base/centos/bin/service.d/cron.sh +++ /dev/null @@ -1,14 +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/" - -if [[ -f /sbin/crond ]]; then - exec /sbin/crond -n $SERVICE_CRON_OPTS -else - exec /usr/sbin/crond -n $SERVICE_CRON_OPTS -fi diff --git a/provisioning/nginx/centos/etc/nginx/nginx.conf b/provisioning/nginx/centos/etc/nginx/nginx.conf deleted file mode 100644 index 8321e7021..000000000 --- a/provisioning/nginx/centos/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/provisioning/php-dev/general/provision/bootstrap.d/20-php-module-xdebug.sh b/provisioning/php-dev/general/provision/bootstrap.d/20-php-module-xdebug.sh index e76310003..63f5aeab9 100644 --- a/provisioning/php-dev/general/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/provisioning/php-dev/general/provision/bootstrap.d/20-php-module-xdebug.sh @@ -1,26 +1,5 @@ #!/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' \ diff --git a/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh b/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh index 7b392587c..32f646e55 100644 --- a/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh +++ b/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh @@ -4,31 +4,7 @@ # 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/" +PHP_CONF_PATHS="/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/provisioning/php/alpine/etc/php/fpm/php-fpm.conf b/provisioning/php/alpine/etc/php/fpm/php-fpm.conf deleted file mode 100644 index b69cd8170..000000000 --- a/provisioning/php/alpine/etc/php/fpm/php-fpm.conf +++ /dev/null @@ -1,118 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;; -; FPM Configuration ; -;;;;;;;;;;;;;;;;;;;;; -; All relative paths in this configuration file are relative to PHP's install -; prefix (/usr). This prefix can be dynamically changed by using the -; '-p' argument from the command line. - -;;;;;;;;;;;;;;;;;; -; Global Options ; -;;;;;;;;;;;;;;;;;; - -[global] -; Pid file -; Note: the default prefix is /var -; Default Value: none -;pid = run/php-fpm.pid - -; Error log file -; If it's set to "syslog", log is sent to syslogd instead of being written -; in a local file. -; Note: the default prefix is /var -; Default Value: log/php-fpm.log -error_log = /var/log/php-fpm.log - -; syslog_facility is used to specify what type of program is logging the -; message. This lets syslogd specify that messages from different facilities -; will be handled differently. -; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON) -; Default Value: daemon -;syslog.facility = daemon - -; syslog_ident is prepended to every message. If you have multiple FPM -; instances running on the same server, you can change the default value -; which must suit common needs. -; Default Value: php-fpm -;syslog.ident = php-fpm - -; Log level -; Possible Values: alert, error, warning, notice, debug -; Default Value: notice -;log_level = notice - -; If this number of child processes exit with SIGSEGV or SIGBUS within the time -; interval set by emergency_restart_interval then FPM will restart. A value -; of '0' means 'Off'. -; Default Value: 0 -;emergency_restart_threshold = 0 - -; Interval of time used by emergency_restart_interval to determine when -; a graceful restart will be initiated. This can be useful to work around -; accidental corruptions in an accelerator's shared memory. -; Available Units: s(econds), m(inutes), h(ours), or d(ays) -; Default Unit: seconds -; Default Value: 0 -;emergency_restart_interval = 0 - -; Time limit for child processes to wait for a reaction on signals from master. -; Available units: s(econds), m(inutes), h(ours), or d(ays) -; Default Unit: seconds -; Default Value: 0 -;process_control_timeout = 0 - -; The maximum number of processes FPM will fork. This has been design to control -; the global number of processes when using dynamic PM within a lot of pools. -; Use it with caution. -; Note: A value of 0 indicates no limit -; Default Value: 0 -; process.max = 128 - -; Specify the nice(2) priority to apply to the master process (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool process will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging. -; Default Value: yes -;daemonize = yes - -; Set open file descriptor rlimit for the master process. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit for the master process. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Specify the event mechanism FPM will use. The following is available: -; - select (any POSIX os) -; - poll (any POSIX os) -; - epoll (linux >= 2.5.44) -; - kqueue (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0) -; - /dev/poll (Solaris >= 7) -; - port (Solaris >= 10) -; Default Value: not set (auto detection) -;events.mechanism = epoll - -; When FPM is build with systemd integration, specify the interval, -; in second, between health report notification to systemd. -; Set to 0 to disable. -; Available Units: s(econds), m(inutes), h(ours) -; Default Unit: seconds -; Default value: 10 -;systemd_interval = 10 - - - - -; Include one or more files. If glob(3) exists, it is used to include a bunch of -; files from a glob(3) pattern. This directive can be used everywhere in the -; file. -; Relative path can also be used. They will be prefixed by: -; - the global prefix if it's been set (-p argument) -; - /usr otherwise -include=/opt/docker/etc/php/fpm/pool.d/*.conf diff --git a/provisioning/php/alpine/etc/php/fpm/pool.d/application.conf b/provisioning/php/alpine/etc/php/fpm/pool.d/application.conf deleted file mode 100644 index 661b66e87..000000000 --- a/provisioning/php/alpine/etc/php/fpm/pool.d/application.conf +++ /dev/null @@ -1,420 +0,0 @@ -;;;;;;;;;;;;;;;;;;;; -; Pool Definitions ; -;;;;;;;;;;;;;;;;;;;; - -; Multiple pools of child processes may be started with different listening -; ports and different management options. The name of the pool will be -; used in logs and stats. There is no limitation on the number of pools which -; FPM can handle. Your system will tell you anyway :) - -; Start a new pool named 'www'. -; the variable $pool can we used in any directive and will be replaced by the -; pool name ('www' here) -[www] - -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = application -group = application - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all IPv4 addresses on a -; specific port; -; '[::]:port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = 127.0.0.1:9000 - -; Set listen(2) backlog. -; Default Value: 65535 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 65535 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. -; Default Values: user and group are set as the running user -; mode is set to 0660 -;listen.owner = nobody -;listen.group = nobody -;listen.mode = 0660 -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following informations: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{miliseconds}d -; - %{mili}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some exemples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_terminate_timeout = 0 - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -;chdir = /var/www - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; exectute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M diff --git a/provisioning/php/general/provision/bootstrap.d/11-php-conf.sh b/provisioning/php/general/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/provisioning/php/general/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/provisioning/php/general/provision/bootstrap.d/20-setup-php.sh b/provisioning/php/general/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/provisioning/php/general/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/provisioning/php/ubuntu-12.04/bin/service.d/php-fpm.sh b/provisioning/php/ubuntu-12.04/bin/service.d/php-fpm.sh deleted file mode 100644 index 9adb0027b..000000000 --- a/provisioning/php/ubuntu-12.04/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 $SERVICE_PHPFPM_OPTS diff --git a/template/Dockerfile/images/apache.jinja2 b/template/Dockerfile/images/apache.jinja2 index 83eb6c25d..3a176faba 100644 --- a/template/Dockerfile/images/apache.jinja2 +++ b/template/Dockerfile/images/apache.jinja2 @@ -1,6 +1,3 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} - {% macro alpine(role='') -%} # Install apache && apk-install \ @@ -17,163 +14,7 @@ ' /etc/apache2/httpd.conf {%- endmacro %} - -{% macro centos(role='') -%} - # Install apache - && yum-install \ - httpd \ - mod_ssl \ - && 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/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf -{%- endmacro %} - - -{% macro debian7(role='') -%} - # Install apache - && apt-install \ - apache2 \ - apache2-mpm-worker \ - libapache2-mod-fastcgi \ - && 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 fastcgi ssl rewrite headers expires \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} -{%- endmacro %} - -{% macro debian8(role='') -%} - # Install apache - && apt-install \ - apache2 \ - apache2-mpm-worker \ - && 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 \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} -{%- endmacro %} - - -{% macro debian9(role='') -%} - # 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 -{%- endmacro %} - -{% macro debian10(role='') -%} - # 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 -{%- endmacro %} - -{% macro debian12(role='') -%} - # 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 -{%- endmacro %} - - -{% macro ubuntu12(role='') -%} - # Install apache - && apt-install \ - apache2 \ - apache2-mpm-worker \ - libapache2-mod-fastcgi \ - && 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 fastcgi ssl rewrite headers version expires \ - && mkdir -p /var/lock/apache2 -{%- endmacro %} - - -{% macro ubuntu14(role='') -%} - # Install apache - && apt-install \ - apache2 \ - apache2-mpm-worker \ - libapache2-mod-fastcgi \ - && 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 fastcgi ssl rewrite headers expires \ - && mkdir -p /var/lock/apache2 -{%- endmacro %} - - -{% macro ubuntu15(role='') -%} - # 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/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires -{%- endmacro %} - - -{% macro ubuntu16(role='') -%} - # 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/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires -{%- endmacro %} - - -{% macro ubuntu17(role='') -%} - # 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/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires -{%- endmacro %} - - -{% macro ubuntu18(role='') -%} +{% macro debian(role='') -%} # Install apache && apt-install \ apache2 \ @@ -182,6 +23,5 @@ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires {%- endmacro %} diff --git a/template/Dockerfile/images/base.jinja2 b/template/Dockerfile/images/base.jinja2 index 6b6f54424..f63c8e508 100644 --- a/template/Dockerfile/images/base.jinja2 +++ b/template/Dockerfile/images/base.jinja2 @@ -15,22 +15,6 @@ && chmod +s /sbin/gosu {%- endmacro %} - -{% macro centos(role='') -%} - # Install services - && chmod +x /opt/docker/bin/* \ - && yum-install \ - supervisor \ - which \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu -{%- endmacro %} - - {% macro debian(role='') -%} # Install packages && chmod +x /opt/docker/bin/* \ @@ -44,7 +28,6 @@ && chmod +s /sbin/gosu {%- endmacro %} - {% macro ubuntu(role='') -%} # Install services && chmod +x /opt/docker/bin/* \ diff --git a/template/Dockerfile/images/baseapp.jinja2 b/template/Dockerfile/images/baseapp.jinja2 index 3c64466a8..3f2774467 100644 --- a/template/Dockerfile/images/baseapp.jinja2 +++ b/template/Dockerfile/images/baseapp.jinja2 @@ -16,24 +16,6 @@ git {%- endmacro %} - -{% macro centos(role='') -%} - # Install services - && yum-install \ - # Install tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - bind-utils \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales -{%- endmacro %} - - {% macro debian(role='') -%} # Install services && apt-install \ @@ -50,37 +32,6 @@ && /usr/local/bin/generate-locales {%- endmacro %} -{% macro debian9(role='') -%} - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales -{%- endmacro %} -{% macro debian10(role='') -%} - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales -{%- endmacro %} - {% macro ubuntu(role='') -%} # Install services && apt-install \ diff --git a/template/Dockerfile/images/bootstrap.jinja2 b/template/Dockerfile/images/bootstrap.jinja2 index e4c723996..e18f7c2eb 100644 --- a/template/Dockerfile/images/bootstrap.jinja2 +++ b/template/Dockerfile/images/bootstrap.jinja2 @@ -18,28 +18,12 @@ && echo 'auth sufficient pam_rootok.so' >> /etc/pam.d/su {%- endmacro %} - - -{% macro centos() -%} - # Init bootstrap - # System update - && /usr/local/bin/yum-upgrade \ - && yum-install \ - epel-release \ - && /usr/local/bin/generate-dockerimage-info -{%- endmacro %} - - -{% macro debian(distribution) -%} +{% macro debian() -%} # Init bootstrap && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free -{%- if distribution == 'bookworm' %} && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \ -{%- else %} - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ -{%- endif %} && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -51,27 +35,6 @@ gnupg {%- endmacro %} - -{% macro ubuntuOld() -%} - # Init bootstrap - # Add multiverse - && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Install base stuff - && apt-install \ - apt-transport-https \ - python-software-properties \ - ca-certificates \ - apt-transport-https \ - && apt-add-repository multiverse \ - && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ - && apt-update \ - && /usr/local/bin/generate-dockerimage-info -{%- endmacro %} - - {% macro ubuntu() -%} # Init bootstrap && apt-update \ @@ -85,4 +48,3 @@ && apt-update \ && /usr/local/bin/generate-dockerimage-info {%- endmacro %} - diff --git a/template/Dockerfile/images/nginx.jinja2 b/template/Dockerfile/images/nginx.jinja2 index 45d84edfe..1be1ae268 100644 --- a/template/Dockerfile/images/nginx.jinja2 +++ b/template/Dockerfile/images/nginx.jinja2 @@ -7,13 +7,6 @@ nginx {%- endmacro %} - -{% macro centos(role='') -%} - # Install tools - && yum-install \ - nginx -{%- endmacro %} - {% macro debian(role='') -%} # 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" \ @@ -22,10 +15,3 @@ && apt-install \ nginx {%- endmacro %} - - -{% macro ubuntu(role='') -%} - # Install nginx - && apt-install \ - nginx -{%- endmacro %} diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 48c00e83f..acd99ac3d 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -38,7 +38,7 @@ && cd / && rm -rf /tmp/xmlrpc {%- endmacro %} -{% macro official(role='', version='', distribution='') -%} +{% macro official(role='', version='') -%} # Install php environment && apt-install \ # Install tools @@ -56,12 +56,7 @@ libavif15 \ libvips42 \ librabbitmq4 \ -{%- if distribution == 'bookworm' %} libldap-2.5-0 \ -{%- else %} - libldap-2.4-2 \ - zlibc \ -{%- endif %} libxslt1.1 \ libldap-common \ zlib1g \ diff --git a/tests/structure-test/base-app/alpine-3 b/tests/structure-test/base-app/alpine-3 deleted file mode 120000 index 0120374ca..000000000 --- a/tests/structure-test/base-app/alpine-3 +++ /dev/null @@ -1 +0,0 @@ -alpine \ No newline at end of file diff --git a/tests/structure-test/base-app/centos-7 b/tests/structure-test/base-app/centos-7 deleted file mode 120000 index 0120374ca..000000000 --- a/tests/structure-test/base-app/centos-7 +++ /dev/null @@ -1 +0,0 @@ -alpine \ No newline at end of file diff --git a/tests/structure-test/base-app/debian-7/test.yaml b/tests/structure-test/base-app/debian-7/test.yaml deleted file mode 100644 index 702ec4234..000000000 --- a/tests/structure-test/base-app/debian-7/test.yaml +++ /dev/null @@ -1,7 +0,0 @@ -schemaVersion: "2.0.0" - -commandTests: - - name: "bzip2" - command: "which" - args: ["bzip2"] - expectedOutput: ["/bin/bzip2"] diff --git a/tests/structure-test/base-app/debian-8 b/tests/structure-test/base-app/debian-8 deleted file mode 120000 index c94ce26cd..000000000 --- a/tests/structure-test/base-app/debian-8 +++ /dev/null @@ -1 +0,0 @@ -debian-7 \ No newline at end of file diff --git a/tests/structure-test/base-app/debian-9 b/tests/structure-test/base-app/debian-9 deleted file mode 120000 index c94ce26cd..000000000 --- a/tests/structure-test/base-app/debian-9 +++ /dev/null @@ -1 +0,0 @@ -debian-7 \ No newline at end of file diff --git a/tests/structure-test/base-app/ubuntu-12.04 b/tests/structure-test/base-app/ubuntu-12.04 deleted file mode 120000 index c94ce26cd..000000000 --- a/tests/structure-test/base-app/ubuntu-12.04 +++ /dev/null @@ -1 +0,0 @@ -debian-7 \ No newline at end of file diff --git a/tests/structure-test/base-app/ubuntu-14.04 b/tests/structure-test/base-app/ubuntu-14.04 deleted file mode 120000 index c94ce26cd..000000000 --- a/tests/structure-test/base-app/ubuntu-14.04 +++ /dev/null @@ -1 +0,0 @@ -debian-7 \ No newline at end of file diff --git a/tests/structure-test/base-app/ubuntu-15.04 b/tests/structure-test/base-app/ubuntu-15.04 deleted file mode 120000 index c94ce26cd..000000000 --- a/tests/structure-test/base-app/ubuntu-15.04 +++ /dev/null @@ -1 +0,0 @@ -debian-7 \ No newline at end of file diff --git a/tests/structure-test/base-app/ubuntu-15.10 b/tests/structure-test/base-app/ubuntu-15.10 deleted file mode 120000 index c94ce26cd..000000000 --- a/tests/structure-test/base-app/ubuntu-15.10 +++ /dev/null @@ -1 +0,0 @@ -debian-7 \ No newline at end of file diff --git a/tests/structure-test/base-app/ubuntu-16.04 b/tests/structure-test/base-app/ubuntu-16.04 deleted file mode 120000 index c94ce26cd..000000000 --- a/tests/structure-test/base-app/ubuntu-16.04 +++ /dev/null @@ -1 +0,0 @@ -debian-7 \ No newline at end of file diff --git a/tests/structure-test/base-app/ubuntu-16.10 b/tests/structure-test/base-app/ubuntu-16.10 deleted file mode 120000 index c94ce26cd..000000000 --- a/tests/structure-test/base-app/ubuntu-16.10 +++ /dev/null @@ -1 +0,0 @@ -debian-7 \ No newline at end of file diff --git a/tests/structure-test/base-app/ubuntu-17.04 b/tests/structure-test/base-app/ubuntu-17.04 deleted file mode 120000 index c94ce26cd..000000000 --- a/tests/structure-test/base-app/ubuntu-17.04 +++ /dev/null @@ -1 +0,0 @@ -debian-7 \ No newline at end of file diff --git a/tests/structure-test/base-app/ubuntu-17.10 b/tests/structure-test/base-app/ubuntu-17.10 deleted file mode 120000 index c94ce26cd..000000000 --- a/tests/structure-test/base-app/ubuntu-17.10 +++ /dev/null @@ -1 +0,0 @@ -debian-7 \ No newline at end of file diff --git a/tests/structure-test/base-app/ubuntu-18.04 b/tests/structure-test/base-app/ubuntu-18.04 deleted file mode 120000 index c94ce26cd..000000000 --- a/tests/structure-test/base-app/ubuntu-18.04 +++ /dev/null @@ -1 +0,0 @@ -debian-7 \ No newline at end of file diff --git a/tests/structure-test/base/alpine-3 b/tests/structure-test/base/alpine-3 deleted file mode 120000 index 0120374ca..000000000 --- a/tests/structure-test/base/alpine-3 +++ /dev/null @@ -1 +0,0 @@ -alpine \ No newline at end of file diff --git a/tests/structure-test/base/centos-7/test.yaml b/tests/structure-test/base/centos-7/test.yaml deleted file mode 100644 index 1a2da33fd..000000000 --- a/tests/structure-test/base/centos-7/test.yaml +++ /dev/null @@ -1,11 +0,0 @@ -schemaVersion: "2.0.0" - -commandTests: - - name: "sed" - command: "which" - args: ["sed"] - expectedOutput: ["/usr/bin/sed"] - - name: "netstat" - command: "which" - args: ["netstat"] - expectedOutput: ["/usr/bin/netstat"] diff --git a/tests/structure-test/base/debian-7 b/tests/structure-test/base/debian-7 deleted file mode 120000 index 0120374ca..000000000 --- a/tests/structure-test/base/debian-7 +++ /dev/null @@ -1 +0,0 @@ -alpine \ No newline at end of file diff --git a/tests/structure-test/base/debian-8 b/tests/structure-test/base/debian-8 deleted file mode 120000 index 0120374ca..000000000 --- a/tests/structure-test/base/debian-8 +++ /dev/null @@ -1 +0,0 @@ -alpine \ No newline at end of file diff --git a/tests/structure-test/base/debian-9 b/tests/structure-test/base/debian-9 deleted file mode 120000 index 0120374ca..000000000 --- a/tests/structure-test/base/debian-9 +++ /dev/null @@ -1 +0,0 @@ -alpine \ No newline at end of file diff --git a/tests/structure-test/base/ubuntu-12.04 b/tests/structure-test/base/ubuntu-12.04 deleted file mode 120000 index 0120374ca..000000000 --- a/tests/structure-test/base/ubuntu-12.04 +++ /dev/null @@ -1 +0,0 @@ -alpine \ No newline at end of file diff --git a/tests/structure-test/base/ubuntu-14.04 b/tests/structure-test/base/ubuntu-14.04 deleted file mode 120000 index 0120374ca..000000000 --- a/tests/structure-test/base/ubuntu-14.04 +++ /dev/null @@ -1 +0,0 @@ -alpine \ No newline at end of file diff --git a/tests/structure-test/base/ubuntu-15.04 b/tests/structure-test/base/ubuntu-15.04 deleted file mode 120000 index 0120374ca..000000000 --- a/tests/structure-test/base/ubuntu-15.04 +++ /dev/null @@ -1 +0,0 @@ -alpine \ No newline at end of file diff --git a/tests/structure-test/base/ubuntu-15.10 b/tests/structure-test/base/ubuntu-15.10 deleted file mode 120000 index 0120374ca..000000000 --- a/tests/structure-test/base/ubuntu-15.10 +++ /dev/null @@ -1 +0,0 @@ -alpine \ No newline at end of file diff --git a/tests/structure-test/base/ubuntu-16.04 b/tests/structure-test/base/ubuntu-16.04 deleted file mode 120000 index 0120374ca..000000000 --- a/tests/structure-test/base/ubuntu-16.04 +++ /dev/null @@ -1 +0,0 @@ -alpine \ No newline at end of file diff --git a/tests/structure-test/base/ubuntu-16.10 b/tests/structure-test/base/ubuntu-16.10 deleted file mode 120000 index 0120374ca..000000000 --- a/tests/structure-test/base/ubuntu-16.10 +++ /dev/null @@ -1 +0,0 @@ -alpine \ No newline at end of file diff --git a/tests/structure-test/base/ubuntu-17.04 b/tests/structure-test/base/ubuntu-17.04 deleted file mode 120000 index 0120374ca..000000000 --- a/tests/structure-test/base/ubuntu-17.04 +++ /dev/null @@ -1 +0,0 @@ -alpine \ No newline at end of file diff --git a/tests/structure-test/base/ubuntu-17.10 b/tests/structure-test/base/ubuntu-17.10 deleted file mode 120000 index 0120374ca..000000000 --- a/tests/structure-test/base/ubuntu-17.10 +++ /dev/null @@ -1 +0,0 @@ -alpine \ No newline at end of file diff --git a/tests/structure-test/base/ubuntu-18.04 b/tests/structure-test/base/ubuntu-18.04 deleted file mode 120000 index 0120374ca..000000000 --- a/tests/structure-test/base/ubuntu-18.04 +++ /dev/null @@ -1 +0,0 @@ -alpine \ No newline at end of file diff --git a/tests/structure-test/bootstrap/centos-7/test.yaml b/tests/structure-test/bootstrap/centos-7/test.yaml deleted file mode 100644 index 07601bfe4..000000000 --- a/tests/structure-test/bootstrap/centos-7/test.yaml +++ /dev/null @@ -1,36 +0,0 @@ -schemaVersion: "2.0.0" - -metadataTest: - envVars: - - key: "PATH" - value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - -commandTests: - - name: "Check OS family" - command: "docker-image-info" - args: ["family"] - expectedOutput: ["RedHat\n"] - - name: "Check dist" - command: "docker-image-info" - args: ["dist"] - expectedOutput: ["CentOS\n"] - - name: "Check dist" - command: "docker-image-info" - args: ["dist-version"] - expectedOutput: ["7.*\n"] - - name: "Check dist release" - command: "docker-image-info" - args: ["dist-release"] - expectedOutput: ["7.*\n"] - - name: "Check dist codename" - command: "docker-image-info" - args: ["dist-codename"] - expectedOutput: ["Core\n"] - - name: "Check lsb" - command: "docker-image-info" - args: ["lsb"] - expectedOutput: ["LSB Version: :core-4.*"] - - name: "Check lsb desc" - command: "docker-image-info" - args: ["lsb-desc"] - expectedOutput: ["CentOS Linux release 7.*"] diff --git a/tests/structure-test/bootstrap/debian-8/test.yaml b/tests/structure-test/bootstrap/debian-8/test.yaml deleted file mode 100644 index 85757c1e0..000000000 --- a/tests/structure-test/bootstrap/debian-8/test.yaml +++ /dev/null @@ -1,36 +0,0 @@ -schemaVersion: "2.0.0" - -metadataTest: - envVars: - - key: "PATH" - value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - -commandTests: - - name: "Check OS family" - command: "docker-image-info" - args: ["family"] - expectedOutput: ["Debian\n"] - - name: "Check dist" - command: "docker-image-info" - args: ["dist"] - expectedOutput: ["Debian\n"] - - name: "Check dist" - command: "docker-image-info" - args: ["dist-version"] - expectedOutput: ["8.*\n"] - - name: "Check dist release" - command: "docker-image-info" - args: ["dist-release"] - expectedOutput: ["8.*\n"] - - name: "Check dist codename" - command: "docker-image-info" - args: ["dist-codename"] - expectedOutput: ["jessie\n"] - - name: "Check lsb" - command: "docker-image-info" - args: ["lsb"] - expectedOutput: ["Distributor ID: Debian.*"] - - name: "Check lsb desc" - command: "docker-image-info" - args: ["lsb-desc"] - expectedOutput: ["Debian GNU/Linux 8.*"] diff --git a/tests/structure-test/bootstrap/debian-9/test.yaml b/tests/structure-test/bootstrap/debian-9/test.yaml deleted file mode 100644 index f68e57e79..000000000 --- a/tests/structure-test/bootstrap/debian-9/test.yaml +++ /dev/null @@ -1,36 +0,0 @@ -schemaVersion: "2.0.0" - -metadataTest: - envVars: - - key: "PATH" - value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - -commandTests: - - name: "Check OS family" - command: "docker-image-info" - args: ["family"] - expectedOutput: ["Debian\n"] - - name: "Check dist" - command: "docker-image-info" - args: ["dist"] - expectedOutput: ["Debian\n"] - - name: "Check dist" - command: "docker-image-info" - args: ["dist-version"] - expectedOutput: ["9.*\n"] - - name: "Check dist release" - command: "docker-image-info" - args: ["dist-release"] - expectedOutput: ["9.*\n"] - - name: "Check dist codename" - command: "docker-image-info" - args: ["dist-codename"] - expectedOutput: ["stretch\n"] - - name: "Check lsb" - command: "docker-image-info" - args: ["lsb"] - expectedOutput: ["Distributor ID: Debian.*"] - - name: "Check lsb desc" - command: "docker-image-info" - args: ["lsb-desc"] - expectedOutput: ["Debian GNU/Linux 9.*"] diff --git a/tests/structure-test/bootstrap/ubuntu-16.04/test.yaml b/tests/structure-test/bootstrap/ubuntu-16.04/test.yaml deleted file mode 100644 index 68066082f..000000000 --- a/tests/structure-test/bootstrap/ubuntu-16.04/test.yaml +++ /dev/null @@ -1,36 +0,0 @@ -schemaVersion: "2.0.0" - -metadataTest: - envVars: - - key: "PATH" - value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - -commandTests: - - name: "Check OS family" - command: "docker-image-info" - args: ["family"] - expectedOutput: ["Debian\n"] - - name: "Check dist" - command: "docker-image-info" - args: ["dist"] - expectedOutput: ["Ubuntu\n"] - - name: "Check dist" - command: "docker-image-info" - args: ["dist-version"] - expectedOutput: ["16.04\n"] - - name: "Check dist release" - command: "docker-image-info" - args: ["dist-release"] - expectedOutput: ["16.04\n"] - - name: "Check dist codename" - command: "docker-image-info" - args: ["dist-codename"] - expectedOutput: ["xenial\n"] - - name: "Check lsb" - command: "docker-image-info" - args: ["lsb"] - expectedOutput: ["Distributor ID: Ubuntu.*"] - - name: "Check lsb desc" - command: "docker-image-info" - args: ["lsb-desc"] - expectedOutput: ["Ubuntu 16.04.*LTS"] diff --git a/tests/structure-test/bootstrap/ubuntu-16.10/test.yaml b/tests/structure-test/bootstrap/ubuntu-16.10/test.yaml deleted file mode 100644 index 34ea8daf6..000000000 --- a/tests/structure-test/bootstrap/ubuntu-16.10/test.yaml +++ /dev/null @@ -1,36 +0,0 @@ -schemaVersion: "2.0.0" - -metadataTest: - envVars: - - key: "PATH" - value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - -commandTests: - - name: "Check OS family" - command: "docker-image-info" - args: ["family"] - expectedOutput: ["Debian\n"] - - name: "Check dist" - command: "docker-image-info" - args: ["dist"] - expectedOutput: ["Ubuntu\n"] - - name: "Check dist" - command: "docker-image-info" - args: ["dist-version"] - expectedOutput: ["16.10\n"] - - name: "Check dist release" - command: "docker-image-info" - args: ["dist-release"] - expectedOutput: ["16.10\n"] - - name: "Check dist codename" - command: "docker-image-info" - args: ["dist-codename"] - expectedOutput: ["yakkety\n"] - - name: "Check lsb" - command: "docker-image-info" - args: ["lsb"] - expectedOutput: ["Distributor ID: Ubuntu.*"] - - name: "Check lsb desc" - command: "docker-image-info" - args: ["lsb-desc"] - expectedOutput: ["Ubuntu 16.10"] diff --git a/tests/structure-test/bootstrap/ubuntu-17.04/test.yaml b/tests/structure-test/bootstrap/ubuntu-17.04/test.yaml deleted file mode 100644 index 916f2fcaa..000000000 --- a/tests/structure-test/bootstrap/ubuntu-17.04/test.yaml +++ /dev/null @@ -1,36 +0,0 @@ -schemaVersion: "2.0.0" - -metadataTest: - envVars: - - key: "PATH" - value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - -commandTests: - - name: "Check OS family" - command: "docker-image-info" - args: ["family"] - expectedOutput: ["Debian\n"] - - name: "Check dist" - command: "docker-image-info" - args: ["dist"] - expectedOutput: ["Ubuntu\n"] - - name: "Check dist" - command: "docker-image-info" - args: ["dist-version"] - expectedOutput: ["17.04\n"] - - name: "Check dist release" - command: "docker-image-info" - args: ["dist-release"] - expectedOutput: ["17.04\n"] - - name: "Check dist codename" - command: "docker-image-info" - args: ["dist-codename"] - expectedOutput: ["zesty\n"] - - name: "Check lsb" - command: "docker-image-info" - args: ["lsb"] - expectedOutput: ["Distributor ID: Ubuntu.*"] - - name: "Check lsb desc" - command: "docker-image-info" - args: ["lsb-desc"] - expectedOutput: ["Ubuntu 17.04"] diff --git a/tests/structure-test/bootstrap/ubuntu-17.10/test.yaml b/tests/structure-test/bootstrap/ubuntu-17.10/test.yaml deleted file mode 100644 index 2c0052d50..000000000 --- a/tests/structure-test/bootstrap/ubuntu-17.10/test.yaml +++ /dev/null @@ -1,36 +0,0 @@ -schemaVersion: "2.0.0" - -metadataTest: - envVars: - - key: "PATH" - value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - -commandTests: - - name: "Check OS family" - command: "docker-image-info" - args: ["family"] - expectedOutput: ["Debian\n"] - - name: "Check dist" - command: "docker-image-info" - args: ["dist"] - expectedOutput: ["Ubuntu\n"] - - name: "Check dist" - command: "docker-image-info" - args: ["dist-version"] - expectedOutput: ["17.10\n"] - - name: "Check dist release" - command: "docker-image-info" - args: ["dist-release"] - expectedOutput: ["17.10\n"] - - name: "Check dist codename" - command: "docker-image-info" - args: ["dist-codename"] - expectedOutput: ["artful\n"] - - name: "Check lsb" - command: "docker-image-info" - args: ["lsb"] - expectedOutput: ["Distributor ID: Ubuntu.*"] - - name: "Check lsb desc" - command: "docker-image-info" - args: ["lsb-desc"] - expectedOutput: ["Ubuntu 17.10"] diff --git a/tests/structure-test/bootstrap/ubuntu-18.04/test.yaml b/tests/structure-test/bootstrap/ubuntu-18.04/test.yaml deleted file mode 100644 index 08db7ab31..000000000 --- a/tests/structure-test/bootstrap/ubuntu-18.04/test.yaml +++ /dev/null @@ -1,36 +0,0 @@ -schemaVersion: "2.0.0" - -metadataTest: - envVars: - - key: "PATH" - value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - -commandTests: - - name: "Check OS family" - command: "docker-image-info" - args: ["family"] - expectedOutput: ["Debian\n"] - - name: "Check dist" - command: "docker-image-info" - args: ["dist"] - expectedOutput: ["Ubuntu\n"] - - name: "Check dist" - command: "docker-image-info" - args: ["dist-version"] - expectedOutput: ["18.04\n"] - - name: "Check dist release" - command: "docker-image-info" - args: ["dist-release"] - expectedOutput: ["18.04\n"] - - name: "Check dist codename" - command: "docker-image-info" - args: ["dist-codename"] - expectedOutput: ["bionic\n"] - - name: "Check lsb" - command: "docker-image-info" - args: ["lsb"] - expectedOutput: ["Distributor ID: Ubuntu.*"] - - name: "Check lsb desc" - command: "docker-image-info" - args: ["lsb-desc"] - expectedOutput: ["Ubuntu 18.04.*LTS"]