diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile
deleted file mode 100644
index 44de9a194..000000000
--- a/docker/php-apache-dev/5.6/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache-dev:5.6
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-apache:5.6
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug-2.5.5 \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-apache-dev/5.6/Dockerfile.jinja2 b/docker/php-apache-dev/5.6/Dockerfile.jinja2
deleted file mode 100644
index 8ab1976a9..000000000
--- a/docker/php-apache-dev/5.6/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-apache", "5.6") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="5.6") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 75e5f4396..000000000
--- a/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
-
-LogLevel info
diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-">
- FileETag None
-
-
- Header unset ETag
- Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
- Header set Pragma "no-cache"
- Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-
-
diff --git a/docker/php-apache-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-apache-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/20-apache-dev.sh
deleted file mode 100644
index a9d2c6e92..000000000
--- a/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/20-apache-dev.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-go-replace \
- -s "" -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
diff --git a/docker/php-apache-dev/7.0/Dockerfile b/docker/php-apache-dev/7.0/Dockerfile
deleted file mode 100644
index 636680b78..000000000
--- a/docker/php-apache-dev/7.0/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache-dev:7.0
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-apache:7.0
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug-2.8.1 \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-apache-dev/7.0/Dockerfile.jinja2 b/docker/php-apache-dev/7.0/Dockerfile.jinja2
deleted file mode 100644
index 476b9f009..000000000
--- a/docker/php-apache-dev/7.0/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-apache", "7.0") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="7.0") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 75e5f4396..000000000
--- a/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
-
-LogLevel info
diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-">
- FileETag None
-
-
- Header unset ETag
- Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
- Header set Pragma "no-cache"
- Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-
-
diff --git a/docker/php-apache-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-apache-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/20-apache-dev.sh
deleted file mode 100644
index a9d2c6e92..000000000
--- a/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/20-apache-dev.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-go-replace \
- -s "" -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
diff --git a/docker/php-apache-dev/7.1-alpine/Dockerfile b/docker/php-apache-dev/7.1-alpine/Dockerfile
deleted file mode 100644
index 61af6c5a2..000000000
--- a/docker/php-apache-dev/7.1-alpine/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache-dev:7.1-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-apache:7.1-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && apk-install \
- linux-headers \
- make \
- autoconf \
- g++ \
- && pecl install xdebug-2.8.1 \
- && apk del -f --purge \
- autoconf \
- linux-headers \
- g++ \
- make \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-apache-dev/7.1-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/7.1-alpine/Dockerfile.jinja2
deleted file mode 100644
index db426431b..000000000
--- a/docker/php-apache-dev/7.1-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-apache", "7.1-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopmentAlpine(version="7.1") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-apache-dev/7.1-alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.1-alpine/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 75e5f4396..000000000
--- a/docker/php-apache-dev/7.1-alpine/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
-
-LogLevel info
diff --git a/docker/php-apache-dev/7.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache-dev/7.1-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.1-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-apache-dev/7.1-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-">
- FileETag None
-
-
- Header unset ETag
- Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
- Header set Pragma "no-cache"
- Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-
-
diff --git a/docker/php-apache-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-apache-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/20-apache-dev.sh
deleted file mode 100644
index a9d2c6e92..000000000
--- a/docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/20-apache-dev.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-go-replace \
- -s "" -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
diff --git a/docker/php-apache-dev/7.1/Dockerfile b/docker/php-apache-dev/7.1/Dockerfile
deleted file mode 100644
index 30b9940f2..000000000
--- a/docker/php-apache-dev/7.1/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache-dev:7.1
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-apache:7.1
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug-2.8.1 \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-apache-dev/7.1/Dockerfile.jinja2 b/docker/php-apache-dev/7.1/Dockerfile.jinja2
deleted file mode 100644
index dfce87d70..000000000
--- a/docker/php-apache-dev/7.1/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-apache", "7.1") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="7.1") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 75e5f4396..000000000
--- a/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
-
-LogLevel info
diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-">
- FileETag None
-
-
- Header unset ETag
- Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
- Header set Pragma "no-cache"
- Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-
-
diff --git a/docker/php-apache-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-apache-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/20-apache-dev.sh
deleted file mode 100644
index a9d2c6e92..000000000
--- a/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/20-apache-dev.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-go-replace \
- -s "" -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
diff --git a/docker/php-apache-dev/7.2-alpine/Dockerfile b/docker/php-apache-dev/7.2-alpine/Dockerfile
deleted file mode 100644
index 549a651b4..000000000
--- a/docker/php-apache-dev/7.2-alpine/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache-dev:7.2-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-apache:7.2-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && apk-install \
- linux-headers \
- make \
- autoconf \
- g++ \
- && pecl install xdebug \
- && apk del -f --purge \
- autoconf \
- linux-headers \
- g++ \
- make \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-apache-dev/7.2-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/7.2-alpine/Dockerfile.jinja2
deleted file mode 100644
index e89c70b13..000000000
--- a/docker/php-apache-dev/7.2-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-apache", "7.2-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopmentAlpine(version="7.2") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-apache-dev/7.2-alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.2-alpine/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 75e5f4396..000000000
--- a/docker/php-apache-dev/7.2-alpine/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
-
-LogLevel info
diff --git a/docker/php-apache-dev/7.2-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.2-alpine/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache-dev/7.2-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.2-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-apache-dev/7.2-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-">
- FileETag None
-
-
- Header unset ETag
- Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
- Header set Pragma "no-cache"
- Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-
-
diff --git a/docker/php-apache-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-apache-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/20-apache-dev.sh
deleted file mode 100644
index a9d2c6e92..000000000
--- a/docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/20-apache-dev.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-go-replace \
- -s "" -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
diff --git a/docker/php-apache-dev/7.2/Dockerfile b/docker/php-apache-dev/7.2/Dockerfile
deleted file mode 100644
index 7940bb2de..000000000
--- a/docker/php-apache-dev/7.2/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache-dev:7.2
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-apache:7.2
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-apache-dev/7.2/Dockerfile.jinja2 b/docker/php-apache-dev/7.2/Dockerfile.jinja2
deleted file mode 100644
index 47eaa3a98..000000000
--- a/docker/php-apache-dev/7.2/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-apache", "7.2") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="7.2") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-apache-dev/7.2/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.2/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 75e5f4396..000000000
--- a/docker/php-apache-dev/7.2/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
-
-LogLevel info
diff --git a/docker/php-apache-dev/7.2/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.2/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache-dev/7.2/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.2/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-apache-dev/7.2/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-">
- FileETag None
-
-
- Header unset ETag
- Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
- Header set Pragma "no-cache"
- Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-
-
diff --git a/docker/php-apache-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-apache-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/20-apache-dev.sh
deleted file mode 100644
index a9d2c6e92..000000000
--- a/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/20-apache-dev.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-go-replace \
- -s "" -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
diff --git a/docker/php-apache-dev/7.3-alpine/Dockerfile b/docker/php-apache-dev/7.3-alpine/Dockerfile
deleted file mode 100644
index 342570707..000000000
--- a/docker/php-apache-dev/7.3-alpine/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache-dev:7.3-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-apache:7.3-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && apk-install \
- linux-headers \
- make \
- autoconf \
- g++ \
- && pecl install xdebug \
- && apk del -f --purge \
- autoconf \
- linux-headers \
- g++ \
- make \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-apache-dev/7.3-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/7.3-alpine/Dockerfile.jinja2
deleted file mode 100644
index de49b5af5..000000000
--- a/docker/php-apache-dev/7.3-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-apache", "7.3-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopmentAlpine(version="7.3") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-apache-dev/7.3-alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.3-alpine/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 75e5f4396..000000000
--- a/docker/php-apache-dev/7.3-alpine/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
-
-LogLevel info
diff --git a/docker/php-apache-dev/7.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache-dev/7.3-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.3-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-apache-dev/7.3-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-">
- FileETag None
-
-
- Header unset ETag
- Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
- Header set Pragma "no-cache"
- Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-
-
diff --git a/docker/php-apache-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-apache-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/20-apache-dev.sh
deleted file mode 100644
index a9d2c6e92..000000000
--- a/docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/20-apache-dev.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-go-replace \
- -s "" -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
diff --git a/docker/php-apache-dev/7.3/Dockerfile b/docker/php-apache-dev/7.3/Dockerfile
deleted file mode 100644
index 8b26ff0ce..000000000
--- a/docker/php-apache-dev/7.3/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache-dev:7.3
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-apache:7.3
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-apache-dev/7.3/Dockerfile.jinja2 b/docker/php-apache-dev/7.3/Dockerfile.jinja2
deleted file mode 100644
index 92b911b81..000000000
--- a/docker/php-apache-dev/7.3/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-apache", "7.3") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="7.3") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-apache-dev/7.3/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.3/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 75e5f4396..000000000
--- a/docker/php-apache-dev/7.3/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
-
-LogLevel info
diff --git a/docker/php-apache-dev/7.3/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.3/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache-dev/7.3/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.3/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-apache-dev/7.3/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-">
- FileETag None
-
-
- Header unset ETag
- Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
- Header set Pragma "no-cache"
- Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-
-
diff --git a/docker/php-apache-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-apache-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/20-apache-dev.sh
deleted file mode 100644
index a9d2c6e92..000000000
--- a/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/20-apache-dev.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-go-replace \
- -s "" -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
diff --git a/docker/php-apache-dev/7.4-alpine/Dockerfile b/docker/php-apache-dev/7.4-alpine/Dockerfile
deleted file mode 100644
index 5fa32afe4..000000000
--- a/docker/php-apache-dev/7.4-alpine/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache-dev:7.4-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-apache:7.4-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && apk-install \
- linux-headers \
- make \
- autoconf \
- g++ \
- && pecl install xdebug-3.1.6 \
- && apk del -f --purge \
- autoconf \
- linux-headers \
- g++ \
- make \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-apache-dev/7.4-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/7.4-alpine/Dockerfile.jinja2
deleted file mode 100644
index 1bd2244da..000000000
--- a/docker/php-apache-dev/7.4-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-apache", "7.4-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopmentAlpine(version="7.4") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-apache-dev/7.4-alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.4-alpine/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 75e5f4396..000000000
--- a/docker/php-apache-dev/7.4-alpine/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
-
-LogLevel info
diff --git a/docker/php-apache-dev/7.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache-dev/7.4-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.4-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-apache-dev/7.4-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-">
- FileETag None
-
-
- Header unset ETag
- Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
- Header set Pragma "no-cache"
- Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-
-
diff --git a/docker/php-apache-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-apache-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/20-apache-dev.sh
deleted file mode 100644
index a9d2c6e92..000000000
--- a/docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/20-apache-dev.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-go-replace \
- -s "" -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
diff --git a/docker/php-apache-dev/7.4/Dockerfile b/docker/php-apache-dev/7.4/Dockerfile
deleted file mode 100644
index b9aa2deea..000000000
--- a/docker/php-apache-dev/7.4/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache-dev:7.4
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-apache:7.4
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug-3.1.6 \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-apache-dev/7.4/Dockerfile.jinja2 b/docker/php-apache-dev/7.4/Dockerfile.jinja2
deleted file mode 100644
index 608ae77e6..000000000
--- a/docker/php-apache-dev/7.4/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-apache", "7.4") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="7.4") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-apache-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache-dev/7.4/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.4/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-apache-dev/7.4/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-apache-dev/7.4/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.4/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 75e5f4396..000000000
--- a/docker/php-apache-dev/7.4/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
-
-LogLevel info
diff --git a/docker/php-apache-dev/7.4/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.4/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache-dev/7.4/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.4/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-apache-dev/7.4/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-">
- FileETag None
-
-
- Header unset ETag
- Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
- Header set Pragma "no-cache"
- Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-
-
diff --git a/docker/php-apache-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-apache-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/20-apache-dev.sh
deleted file mode 100644
index a9d2c6e92..000000000
--- a/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/20-apache-dev.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-go-replace \
- -s "" -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile
deleted file mode 100644
index 281dd770e..000000000
--- a/docker/php-apache-dev/8.0-alpine/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache-dev:8.0-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-apache:8.0-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && apk-install \
- linux-headers \
- make \
- autoconf \
- g++ \
- && pecl install xdebug \
- && apk del -f --purge \
- autoconf \
- linux-headers \
- g++ \
- make \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap
diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2
deleted file mode 100644
index a0050e801..000000000
--- a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,11 +0,0 @@
-{{ docker.from("php-apache", "8.0-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopmentAlpine(version="8.0") }} \
- {{ provision.runBootstrap() }}
diff --git a/docker/php-apache-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-apache-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-apache-dev/8.0-alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.0-alpine/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 75e5f4396..000000000
--- a/docker/php-apache-dev/8.0-alpine/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
-
-LogLevel info
diff --git a/docker/php-apache-dev/8.0-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.0-alpine/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache-dev/8.0-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/8.0-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-apache-dev/8.0-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-">
- FileETag None
-
-
- Header unset ETag
- Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
- Header set Pragma "no-cache"
- Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-
-
diff --git a/docker/php-apache-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-apache-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/20-apache-dev.sh
deleted file mode 100644
index a9d2c6e92..000000000
--- a/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/20-apache-dev.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-go-replace \
- -s "" -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
diff --git a/docker/php-apache-dev/8.0/Dockerfile b/docker/php-apache-dev/8.0/Dockerfile
deleted file mode 100644
index 81859cc64..000000000
--- a/docker/php-apache-dev/8.0/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache-dev:8.0
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-apache:8.0
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-apache-dev/8.0/Dockerfile.jinja2 b/docker/php-apache-dev/8.0/Dockerfile.jinja2
deleted file mode 100644
index c326cb319..000000000
--- a/docker/php-apache-dev/8.0/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-apache", "8.0") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="8.0") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-apache-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache-dev/8.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.0/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-apache-dev/8.0/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-apache-dev/8.0/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.0/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 75e5f4396..000000000
--- a/docker/php-apache-dev/8.0/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
-
-LogLevel info
diff --git a/docker/php-apache-dev/8.0/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.0/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache-dev/8.0/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/8.0/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-apache-dev/8.0/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-">
- FileETag None
-
-
- Header unset ETag
- Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
- Header set Pragma "no-cache"
- Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-
-
diff --git a/docker/php-apache-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-apache-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/20-apache-dev.sh
deleted file mode 100644
index a9d2c6e92..000000000
--- a/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/20-apache-dev.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-go-replace \
- -s "" -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
diff --git a/docker/php-apache-dev/8.5-alpine/Dockerfile b/docker/php-apache-dev/8.5-alpine/Dockerfile
index 37e099787..02781dc8b 100644
--- a/docker/php-apache-dev/8.5-alpine/Dockerfile
+++ b/docker/php-apache-dev/8.5-alpine/Dockerfile
@@ -24,10 +24,7 @@ RUN set -x \
make \
autoconf \
g++ \
- && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
- && chmod +x /usr/local/bin/pie \
- && pie install xdebug/xdebug:^3.5.0@alpha \
- && rm -f /usr/local/bin/pie \
+ && pecl install xdebug \
&& apk del -f --purge \
autoconf \
linux-headers \
diff --git a/docker/php-apache/5.6/Dockerfile b/docker/php-apache/5.6/Dockerfile
deleted file mode 100644
index 814756aaf..000000000
--- a/docker/php-apache/5.6/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache:5.6
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:5.6
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install apache
- && apt-install \
- apache2 \
- && sed -ri ' \
- s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
- s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
- ' /etc/apache2/apache2.conf \
- && rm -f /etc/apache2/sites-enabled/* \
- && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-apache/5.6/Dockerfile.jinja2 b/docker/php-apache/5.6/Dockerfile.jinja2
deleted file mode 100644
index c5a340291..000000000
--- a/docker/php-apache/5.6/Dockerfile.jinja2
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ docker.from("php", "5.6") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ apache.debian9() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-apache/5.6/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/5.6/conf/bin/service.d/httpd.d/10-init.sh
deleted file mode 100644
index 4ef318a1e..000000000
--- a/docker/php-apache/5.6/conf/bin/service.d/httpd.d/10-init.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
-
diff --git a/docker/php-apache/5.6/conf/bin/service.d/httpd.sh b/docker/php-apache/5.6/conf/bin/service.d/httpd.sh
deleted file mode 100644
index 1d871e7ea..000000000
--- a/docker/php-apache/5.6/conf/bin/service.d/httpd.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
-
-# Apache gets grumpy about PID files pre-existing
-rm -f /var/run/apache2/apache2*.pid
-
-source /etc/apache2/envvars
-exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS
diff --git a/docker/php-apache/5.6/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/5.6/conf/etc/httpd/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-error-document.conf
deleted file mode 100644
index ebabf87e4..000000000
--- a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-error-document.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#######################################
-# Faster error documents
-#######################################
-
- ErrorDocument 400 "400 Bad Request"
- ErrorDocument 401 "401 Unauthorized"
- ErrorDocument 403 "403 Forbidden"
- ErrorDocument 404 "404 Not Found"
- ErrorDocument 405 "405 Method Not Allowed"
-
- ErrorDocument 500 "500 Internal Server Error"
- ErrorDocument 501 "501 Not Implemented"
- ErrorDocument 502 "502 Bad Gateway"
- ErrorDocument 503 "503 Service Unavailable"
-
diff --git a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-log.conf
deleted file mode 100644
index 950e45105..000000000
--- a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-log.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog
-LogLevel warn
-CustomLog /docker.stdout dockerlog
-ErrorLog /docker.stderr
diff --git a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-php.conf
deleted file mode 100644
index cd62792e2..000000000
--- a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-php.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################
-# mod_proxy_fcgi
-# official solution
-# apache 2.4 and later
-#############################
-
-
- >
- ProxySet connectiontimeout=5 timeout=
-
-
-
- SetHandler "proxy:fcgi://"
-
-
-
-#############################
-# mod_fastcgi
-# apaache 2.2 and 2.4
-#############################
-
-
- AddHandler php-fcgi .php
- Action php-fcgi /php-fcgi
- Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi
- FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout
-
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
-
-
diff --git a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-server.conf
deleted file mode 100644
index 80b971734..000000000
--- a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-server.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Settings
-TimeOut 1000
-ServerName ""
-
-DirectoryIndex
-DocumentRoot ""
-
-">
- Options FollowSymLinks
- AllowOverride All
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
diff --git a/docker/php-apache/5.6/conf/etc/httpd/global.conf b/docker/php-apache/5.6/conf/etc/httpd/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/5.6/conf/etc/httpd/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/5.6/conf/etc/httpd/main.conf b/docker/php-apache/5.6/conf/etc/httpd/main.conf
deleted file mode 100644
index fb04614ca..000000000
--- a/docker/php-apache/5.6/conf/etc/httpd/main.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-Include /opt/docker/etc/httpd/global.conf
-Include /opt/docker/etc/httpd/php.conf
-
-
- Include /opt/docker/etc/httpd/conf.d/*.conf
-
-= 2.4>
- IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf
-
-Include /opt/docker/etc/httpd/vhost.conf
diff --git a/docker/php-apache/5.6/conf/etc/httpd/php.conf b/docker/php-apache/5.6/conf/etc/httpd/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/5.6/conf/etc/httpd/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/5.6/conf/etc/httpd/ssl/server.crt b/docker/php-apache/5.6/conf/etc/httpd/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-apache/5.6/conf/etc/httpd/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-apache/5.6/conf/etc/httpd/ssl/server.csr b/docker/php-apache/5.6/conf/etc/httpd/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-apache/5.6/conf/etc/httpd/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-apache/5.6/conf/etc/httpd/ssl/server.key b/docker/php-apache/5.6/conf/etc/httpd/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-apache/5.6/conf/etc/httpd/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-apache/5.6/conf/etc/httpd/vhost.common.conf b/docker/php-apache/5.6/conf/etc/httpd/vhost.common.conf
deleted file mode 100644
index 384696b4e..000000000
--- a/docker/php-apache/5.6/conf/etc/httpd/vhost.common.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
diff --git a/docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache/5.6/conf/etc/httpd/vhost.conf b/docker/php-apache/5.6/conf/etc/httpd/vhost.conf
deleted file mode 100644
index c04a94318..000000000
--- a/docker/php-apache/5.6/conf/etc/httpd/vhost.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#######################################
-# Vhost
-#######################################
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
-
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
- Include /opt/docker/etc/httpd/vhost.ssl.conf
-
diff --git a/docker/php-apache/5.6/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/5.6/conf/etc/httpd/vhost.ssl.conf
deleted file mode 100644
index cf5fbc604..000000000
--- a/docker/php-apache/5.6/conf/etc/httpd/vhost.ssl.conf
+++ /dev/null
@@ -1,26 +0,0 @@
- ############
- # SSL
- ############
-
- SSLEngine on
- SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt
- SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key
-
-
- SSLOptions +StdEnvVars
-
-
- SSLOptions +StdEnvVars
-
-
- BrowserMatch "MSIE [2-6]" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
- # MSIE 7 and newer should be able to use keepalive
- # This regexp is ok with 17-9!
- BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
- ## SSL Hardening
- SSLProtocol All -SSLv2 -SSLv3
- SSLHonorCipherOrder on
- SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'
diff --git a/docker/php-apache/5.6/conf/etc/supervisor.d/apache.conf b/docker/php-apache/5.6/conf/etc/supervisor.d/apache.conf
deleted file mode 100644
index 12a6f86f7..000000000
--- a/docker/php-apache/5.6/conf/etc/supervisor.d/apache.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:apache]
-programs=apached
-priority=20
-
-[program:apached]
-command = /opt/docker/bin/service.d/httpd.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache/5.6/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/5.6/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/5.6/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/5.6/conf/provision/bootstrap.d/10-apache.sh
deleted file mode 100644
index e9feb08b4..000000000
--- a/docker/php-apache/5.6/conf/provision/bootstrap.d/10-apache.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-IMAGE_DISTRIBUTION=$(docker-image-info dist)
-IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version)
-IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g')
-
-# Collect environment variables
-case "$IMAGE_FAMILY" in
- Debian|Ubuntu)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf
- ;;
-
- RedHat)
- APACHE_MAIN_PATH=/etc/httpd/
- APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf
- ;;
-
- Alpine)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf
- ;;
-esac
-
-# Enable apache main config
-ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST"
-
-# Ensure /var/run/apache2 exists
-mkdir -p -- "/var/run/apache2"
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- mkdir -p -- "/run/apache2"
-fi
-
-# Maintain lock directory
-if [[ "$IMAGE_FAMILY" == "Debian" ]]; then
- mkdir -p -- "/var/lock/apache2"
- chmod 0750 -- "/var/lock/apache2"
- chown www-data:www-data -- "/var/lock/apache2"
-fi
-
-APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log')
-
-# Change log to Docker stdout
-go-replace --regex --regex-backrefs \
- -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \
- -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \
- --path="$APACHE_MAIN_PATH" \
- --path-regex='(.*\.conf|default.*|.*log)$'
-
-# Switch MPM to event
-if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -- /etc/httpd/conf.modules.d/00-mpm.conf
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \
- -- /etc/apache2/httpd.conf \
- /etc/apache2/conf.d/ssl.conf \
- /etc/apache2/conf.d/proxy.conf
-
- # Remove default vhost
- sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf
-fi
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/httpd/ssl
-find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-apache/5.6/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/5.6/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index c8669ca25..000000000
--- a/docker/php-apache/5.6/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
-
diff --git a/docker/php-apache/5.6/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/5.6/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/5.6/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/5.6/conf/provision/entrypoint.d/20-apache.sh
deleted file mode 100644
index 42ef48932..000000000
--- a/docker/php-apache/5.6/conf/provision/entrypoint.d/20-apache.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
-fi
diff --git a/docker/php-apache/7.0/Dockerfile b/docker/php-apache/7.0/Dockerfile
deleted file mode 100644
index b64dd568a..000000000
--- a/docker/php-apache/7.0/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache:7.0
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.0
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install apache
- && apt-install \
- apache2 \
- && sed -ri ' \
- s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
- s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
- ' /etc/apache2/apache2.conf \
- && rm -f /etc/apache2/sites-enabled/* \
- && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-apache/7.0/Dockerfile.jinja2 b/docker/php-apache/7.0/Dockerfile.jinja2
deleted file mode 100644
index 4e656bcc4..000000000
--- a/docker/php-apache/7.0/Dockerfile.jinja2
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ docker.from("php", "7.0") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ apache.debian9() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-apache/7.0/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.0/conf/bin/service.d/httpd.d/10-init.sh
deleted file mode 100644
index 4ef318a1e..000000000
--- a/docker/php-apache/7.0/conf/bin/service.d/httpd.d/10-init.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
-
diff --git a/docker/php-apache/7.0/conf/bin/service.d/httpd.sh b/docker/php-apache/7.0/conf/bin/service.d/httpd.sh
deleted file mode 100644
index 1d871e7ea..000000000
--- a/docker/php-apache/7.0/conf/bin/service.d/httpd.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
-
-# Apache gets grumpy about PID files pre-existing
-rm -f /var/run/apache2/apache2*.pid
-
-source /etc/apache2/envvars
-exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS
diff --git a/docker/php-apache/7.0/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.0/conf/etc/httpd/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-error-document.conf
deleted file mode 100644
index ebabf87e4..000000000
--- a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-error-document.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#######################################
-# Faster error documents
-#######################################
-
- ErrorDocument 400 "400 Bad Request"
- ErrorDocument 401 "401 Unauthorized"
- ErrorDocument 403 "403 Forbidden"
- ErrorDocument 404 "404 Not Found"
- ErrorDocument 405 "405 Method Not Allowed"
-
- ErrorDocument 500 "500 Internal Server Error"
- ErrorDocument 501 "501 Not Implemented"
- ErrorDocument 502 "502 Bad Gateway"
- ErrorDocument 503 "503 Service Unavailable"
-
diff --git a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-log.conf
deleted file mode 100644
index 950e45105..000000000
--- a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-log.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog
-LogLevel warn
-CustomLog /docker.stdout dockerlog
-ErrorLog /docker.stderr
diff --git a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-php.conf
deleted file mode 100644
index cd62792e2..000000000
--- a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-php.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################
-# mod_proxy_fcgi
-# official solution
-# apache 2.4 and later
-#############################
-
-
- >
- ProxySet connectiontimeout=5 timeout=
-
-
-
- SetHandler "proxy:fcgi://"
-
-
-
-#############################
-# mod_fastcgi
-# apaache 2.2 and 2.4
-#############################
-
-
- AddHandler php-fcgi .php
- Action php-fcgi /php-fcgi
- Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi
- FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout
-
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
-
-
diff --git a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-server.conf
deleted file mode 100644
index 80b971734..000000000
--- a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-server.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Settings
-TimeOut 1000
-ServerName ""
-
-DirectoryIndex
-DocumentRoot ""
-
-">
- Options FollowSymLinks
- AllowOverride All
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
diff --git a/docker/php-apache/7.0/conf/etc/httpd/global.conf b/docker/php-apache/7.0/conf/etc/httpd/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.0/conf/etc/httpd/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.0/conf/etc/httpd/main.conf b/docker/php-apache/7.0/conf/etc/httpd/main.conf
deleted file mode 100644
index fb04614ca..000000000
--- a/docker/php-apache/7.0/conf/etc/httpd/main.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-Include /opt/docker/etc/httpd/global.conf
-Include /opt/docker/etc/httpd/php.conf
-
-
- Include /opt/docker/etc/httpd/conf.d/*.conf
-
-= 2.4>
- IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf
-
-Include /opt/docker/etc/httpd/vhost.conf
diff --git a/docker/php-apache/7.0/conf/etc/httpd/php.conf b/docker/php-apache/7.0/conf/etc/httpd/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.0/conf/etc/httpd/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.0/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.0/conf/etc/httpd/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-apache/7.0/conf/etc/httpd/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-apache/7.0/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.0/conf/etc/httpd/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-apache/7.0/conf/etc/httpd/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-apache/7.0/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.0/conf/etc/httpd/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-apache/7.0/conf/etc/httpd/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-apache/7.0/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.0/conf/etc/httpd/vhost.common.conf
deleted file mode 100644
index 384696b4e..000000000
--- a/docker/php-apache/7.0/conf/etc/httpd/vhost.common.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
diff --git a/docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache/7.0/conf/etc/httpd/vhost.conf b/docker/php-apache/7.0/conf/etc/httpd/vhost.conf
deleted file mode 100644
index c04a94318..000000000
--- a/docker/php-apache/7.0/conf/etc/httpd/vhost.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#######################################
-# Vhost
-#######################################
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
-
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
- Include /opt/docker/etc/httpd/vhost.ssl.conf
-
diff --git a/docker/php-apache/7.0/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.0/conf/etc/httpd/vhost.ssl.conf
deleted file mode 100644
index cf5fbc604..000000000
--- a/docker/php-apache/7.0/conf/etc/httpd/vhost.ssl.conf
+++ /dev/null
@@ -1,26 +0,0 @@
- ############
- # SSL
- ############
-
- SSLEngine on
- SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt
- SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key
-
-
- SSLOptions +StdEnvVars
-
-
- SSLOptions +StdEnvVars
-
-
- BrowserMatch "MSIE [2-6]" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
- # MSIE 7 and newer should be able to use keepalive
- # This regexp is ok with 17-9!
- BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
- ## SSL Hardening
- SSLProtocol All -SSLv2 -SSLv3
- SSLHonorCipherOrder on
- SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'
diff --git a/docker/php-apache/7.0/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.0/conf/etc/supervisor.d/apache.conf
deleted file mode 100644
index 12a6f86f7..000000000
--- a/docker/php-apache/7.0/conf/etc/supervisor.d/apache.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:apache]
-programs=apached
-priority=20
-
-[program:apached]
-command = /opt/docker/bin/service.d/httpd.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache/7.0/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.0/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.0/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.0/conf/provision/bootstrap.d/10-apache.sh
deleted file mode 100644
index e9feb08b4..000000000
--- a/docker/php-apache/7.0/conf/provision/bootstrap.d/10-apache.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-IMAGE_DISTRIBUTION=$(docker-image-info dist)
-IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version)
-IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g')
-
-# Collect environment variables
-case "$IMAGE_FAMILY" in
- Debian|Ubuntu)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf
- ;;
-
- RedHat)
- APACHE_MAIN_PATH=/etc/httpd/
- APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf
- ;;
-
- Alpine)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf
- ;;
-esac
-
-# Enable apache main config
-ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST"
-
-# Ensure /var/run/apache2 exists
-mkdir -p -- "/var/run/apache2"
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- mkdir -p -- "/run/apache2"
-fi
-
-# Maintain lock directory
-if [[ "$IMAGE_FAMILY" == "Debian" ]]; then
- mkdir -p -- "/var/lock/apache2"
- chmod 0750 -- "/var/lock/apache2"
- chown www-data:www-data -- "/var/lock/apache2"
-fi
-
-APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log')
-
-# Change log to Docker stdout
-go-replace --regex --regex-backrefs \
- -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \
- -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \
- --path="$APACHE_MAIN_PATH" \
- --path-regex='(.*\.conf|default.*|.*log)$'
-
-# Switch MPM to event
-if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -- /etc/httpd/conf.modules.d/00-mpm.conf
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \
- -- /etc/apache2/httpd.conf \
- /etc/apache2/conf.d/ssl.conf \
- /etc/apache2/conf.d/proxy.conf
-
- # Remove default vhost
- sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf
-fi
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/httpd/ssl
-find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-apache/7.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.0/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index c8669ca25..000000000
--- a/docker/php-apache/7.0/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
-
diff --git a/docker/php-apache/7.0/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.0/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.0/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.0/conf/provision/entrypoint.d/20-apache.sh
deleted file mode 100644
index 42ef48932..000000000
--- a/docker/php-apache/7.0/conf/provision/entrypoint.d/20-apache.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
-fi
diff --git a/docker/php-apache/7.1-alpine/Dockerfile b/docker/php-apache/7.1-alpine/Dockerfile
deleted file mode 100644
index 75b10d69a..000000000
--- a/docker/php-apache/7.1-alpine/Dockerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache:7.1-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.1-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install apache
- && apk-install \
- apache2 \
- apache2-ctl \
- apache2-utils \
- apache2-proxy \
- apache2-ssl \
- # Fix issue with module loading order of lbmethod_* (see https://serverfault.com/questions/922573/apache2-fails-to-start-after-recent-update-to-2-4-34-no-clue-why)
- && sed -i '2,5{H;d}; ${p;x;s/^\n//}' /etc/apache2/conf.d/proxy.conf \
- && sed -ri ' \
- s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
- s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
- ' /etc/apache2/httpd.conf \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-apache/7.1-alpine/Dockerfile.jinja2 b/docker/php-apache/7.1-alpine/Dockerfile.jinja2
deleted file mode 100644
index b4b06a628..000000000
--- a/docker/php-apache/7.1-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ docker.from("php", "7.1-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ apache.alpine() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.d/10-init.sh
deleted file mode 100644
index 4ef318a1e..000000000
--- a/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.d/10-init.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
-
diff --git a/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.sh
deleted file mode 100644
index f88544c62..000000000
--- a/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
-
-# Apache gets grumpy about PID files pre-existing
-rm -f /var/run/httpd/httpd.pid
-
-exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS
diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-error-document.conf
deleted file mode 100644
index ebabf87e4..000000000
--- a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-error-document.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#######################################
-# Faster error documents
-#######################################
-
- ErrorDocument 400 "400 Bad Request"
- ErrorDocument 401 "401 Unauthorized"
- ErrorDocument 403 "403 Forbidden"
- ErrorDocument 404 "404 Not Found"
- ErrorDocument 405 "405 Method Not Allowed"
-
- ErrorDocument 500 "500 Internal Server Error"
- ErrorDocument 501 "501 Not Implemented"
- ErrorDocument 502 "502 Bad Gateway"
- ErrorDocument 503 "503 Service Unavailable"
-
diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-log.conf
deleted file mode 100644
index 950e45105..000000000
--- a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-log.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog
-LogLevel warn
-CustomLog /docker.stdout dockerlog
-ErrorLog /docker.stderr
diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-php.conf
deleted file mode 100644
index cd62792e2..000000000
--- a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-php.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################
-# mod_proxy_fcgi
-# official solution
-# apache 2.4 and later
-#############################
-
-
- >
- ProxySet connectiontimeout=5 timeout=
-
-
-
- SetHandler "proxy:fcgi://"
-
-
-
-#############################
-# mod_fastcgi
-# apaache 2.2 and 2.4
-#############################
-
-
- AddHandler php-fcgi .php
- Action php-fcgi /php-fcgi
- Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi
- FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout
-
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
-
-
diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-server.conf
deleted file mode 100644
index 80b971734..000000000
--- a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-server.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Settings
-TimeOut 1000
-ServerName ""
-
-DirectoryIndex
-DocumentRoot ""
-
-">
- Options FollowSymLinks
- AllowOverride All
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/global.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.1-alpine/conf/etc/httpd/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/main.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/main.conf
deleted file mode 100644
index fb04614ca..000000000
--- a/docker/php-apache/7.1-alpine/conf/etc/httpd/main.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-Include /opt/docker/etc/httpd/global.conf
-Include /opt/docker/etc/httpd/php.conf
-
-
- Include /opt/docker/etc/httpd/conf.d/*.conf
-
-= 2.4>
- IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf
-
-Include /opt/docker/etc/httpd/vhost.conf
diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/php.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.1-alpine/conf/etc/httpd/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.conf
deleted file mode 100644
index 384696b4e..000000000
--- a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.conf
deleted file mode 100644
index c04a94318..000000000
--- a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#######################################
-# Vhost
-#######################################
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
-
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
- Include /opt/docker/etc/httpd/vhost.ssl.conf
-
diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.ssl.conf
deleted file mode 100644
index cf5fbc604..000000000
--- a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.ssl.conf
+++ /dev/null
@@ -1,26 +0,0 @@
- ############
- # SSL
- ############
-
- SSLEngine on
- SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt
- SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key
-
-
- SSLOptions +StdEnvVars
-
-
- SSLOptions +StdEnvVars
-
-
- BrowserMatch "MSIE [2-6]" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
- # MSIE 7 and newer should be able to use keepalive
- # This regexp is ok with 17-9!
- BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
- ## SSL Hardening
- SSLProtocol All -SSLv2 -SSLv3
- SSLHonorCipherOrder on
- SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'
diff --git a/docker/php-apache/7.1-alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.1-alpine/conf/etc/supervisor.d/apache.conf
deleted file mode 100644
index 12a6f86f7..000000000
--- a/docker/php-apache/7.1-alpine/conf/etc/supervisor.d/apache.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:apache]
-programs=apached
-priority=20
-
-[program:apached]
-command = /opt/docker/bin/service.d/httpd.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/10-apache.sh
deleted file mode 100644
index e9feb08b4..000000000
--- a/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/10-apache.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-IMAGE_DISTRIBUTION=$(docker-image-info dist)
-IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version)
-IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g')
-
-# Collect environment variables
-case "$IMAGE_FAMILY" in
- Debian|Ubuntu)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf
- ;;
-
- RedHat)
- APACHE_MAIN_PATH=/etc/httpd/
- APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf
- ;;
-
- Alpine)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf
- ;;
-esac
-
-# Enable apache main config
-ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST"
-
-# Ensure /var/run/apache2 exists
-mkdir -p -- "/var/run/apache2"
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- mkdir -p -- "/run/apache2"
-fi
-
-# Maintain lock directory
-if [[ "$IMAGE_FAMILY" == "Debian" ]]; then
- mkdir -p -- "/var/lock/apache2"
- chmod 0750 -- "/var/lock/apache2"
- chown www-data:www-data -- "/var/lock/apache2"
-fi
-
-APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log')
-
-# Change log to Docker stdout
-go-replace --regex --regex-backrefs \
- -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \
- -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \
- --path="$APACHE_MAIN_PATH" \
- --path-regex='(.*\.conf|default.*|.*log)$'
-
-# Switch MPM to event
-if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -- /etc/httpd/conf.modules.d/00-mpm.conf
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \
- -- /etc/apache2/httpd.conf \
- /etc/apache2/conf.d/ssl.conf \
- /etc/apache2/conf.d/proxy.conf
-
- # Remove default vhost
- sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf
-fi
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/httpd/ssl
-find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index c8669ca25..000000000
--- a/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
-
diff --git a/docker/php-apache/7.1-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.1-alpine/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.1-alpine/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.1-alpine/conf/provision/entrypoint.d/20-apache.sh
deleted file mode 100644
index 42ef48932..000000000
--- a/docker/php-apache/7.1-alpine/conf/provision/entrypoint.d/20-apache.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
-fi
diff --git a/docker/php-apache/7.1/Dockerfile b/docker/php-apache/7.1/Dockerfile
deleted file mode 100644
index edf258c27..000000000
--- a/docker/php-apache/7.1/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache:7.1
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.1
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install apache
- && apt-install \
- apache2 \
- && sed -ri ' \
- s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
- s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
- ' /etc/apache2/apache2.conf \
- && rm -f /etc/apache2/sites-enabled/* \
- && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-apache/7.1/Dockerfile.jinja2 b/docker/php-apache/7.1/Dockerfile.jinja2
deleted file mode 100644
index fdec6e0a6..000000000
--- a/docker/php-apache/7.1/Dockerfile.jinja2
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ docker.from("php", "7.1") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ apache.debian9() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-apache/7.1/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.1/conf/bin/service.d/httpd.d/10-init.sh
deleted file mode 100644
index 4ef318a1e..000000000
--- a/docker/php-apache/7.1/conf/bin/service.d/httpd.d/10-init.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
-
diff --git a/docker/php-apache/7.1/conf/bin/service.d/httpd.sh b/docker/php-apache/7.1/conf/bin/service.d/httpd.sh
deleted file mode 100644
index 1d871e7ea..000000000
--- a/docker/php-apache/7.1/conf/bin/service.d/httpd.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
-
-# Apache gets grumpy about PID files pre-existing
-rm -f /var/run/apache2/apache2*.pid
-
-source /etc/apache2/envvars
-exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS
diff --git a/docker/php-apache/7.1/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.1/conf/etc/httpd/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-error-document.conf
deleted file mode 100644
index ebabf87e4..000000000
--- a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-error-document.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#######################################
-# Faster error documents
-#######################################
-
- ErrorDocument 400 "400 Bad Request"
- ErrorDocument 401 "401 Unauthorized"
- ErrorDocument 403 "403 Forbidden"
- ErrorDocument 404 "404 Not Found"
- ErrorDocument 405 "405 Method Not Allowed"
-
- ErrorDocument 500 "500 Internal Server Error"
- ErrorDocument 501 "501 Not Implemented"
- ErrorDocument 502 "502 Bad Gateway"
- ErrorDocument 503 "503 Service Unavailable"
-
diff --git a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-log.conf
deleted file mode 100644
index 950e45105..000000000
--- a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-log.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog
-LogLevel warn
-CustomLog /docker.stdout dockerlog
-ErrorLog /docker.stderr
diff --git a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-php.conf
deleted file mode 100644
index cd62792e2..000000000
--- a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-php.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################
-# mod_proxy_fcgi
-# official solution
-# apache 2.4 and later
-#############################
-
-
- >
- ProxySet connectiontimeout=5 timeout=
-
-
-
- SetHandler "proxy:fcgi://"
-
-
-
-#############################
-# mod_fastcgi
-# apaache 2.2 and 2.4
-#############################
-
-
- AddHandler php-fcgi .php
- Action php-fcgi /php-fcgi
- Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi
- FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout
-
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
-
-
diff --git a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-server.conf
deleted file mode 100644
index 80b971734..000000000
--- a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-server.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Settings
-TimeOut 1000
-ServerName ""
-
-DirectoryIndex
-DocumentRoot ""
-
-">
- Options FollowSymLinks
- AllowOverride All
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
diff --git a/docker/php-apache/7.1/conf/etc/httpd/global.conf b/docker/php-apache/7.1/conf/etc/httpd/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.1/conf/etc/httpd/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.1/conf/etc/httpd/main.conf b/docker/php-apache/7.1/conf/etc/httpd/main.conf
deleted file mode 100644
index fb04614ca..000000000
--- a/docker/php-apache/7.1/conf/etc/httpd/main.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-Include /opt/docker/etc/httpd/global.conf
-Include /opt/docker/etc/httpd/php.conf
-
-
- Include /opt/docker/etc/httpd/conf.d/*.conf
-
-= 2.4>
- IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf
-
-Include /opt/docker/etc/httpd/vhost.conf
diff --git a/docker/php-apache/7.1/conf/etc/httpd/php.conf b/docker/php-apache/7.1/conf/etc/httpd/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.1/conf/etc/httpd/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.1/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.1/conf/etc/httpd/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-apache/7.1/conf/etc/httpd/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-apache/7.1/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.1/conf/etc/httpd/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-apache/7.1/conf/etc/httpd/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-apache/7.1/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.1/conf/etc/httpd/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-apache/7.1/conf/etc/httpd/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-apache/7.1/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.1/conf/etc/httpd/vhost.common.conf
deleted file mode 100644
index 384696b4e..000000000
--- a/docker/php-apache/7.1/conf/etc/httpd/vhost.common.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
diff --git a/docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache/7.1/conf/etc/httpd/vhost.conf b/docker/php-apache/7.1/conf/etc/httpd/vhost.conf
deleted file mode 100644
index c04a94318..000000000
--- a/docker/php-apache/7.1/conf/etc/httpd/vhost.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#######################################
-# Vhost
-#######################################
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
-
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
- Include /opt/docker/etc/httpd/vhost.ssl.conf
-
diff --git a/docker/php-apache/7.1/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.1/conf/etc/httpd/vhost.ssl.conf
deleted file mode 100644
index cf5fbc604..000000000
--- a/docker/php-apache/7.1/conf/etc/httpd/vhost.ssl.conf
+++ /dev/null
@@ -1,26 +0,0 @@
- ############
- # SSL
- ############
-
- SSLEngine on
- SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt
- SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key
-
-
- SSLOptions +StdEnvVars
-
-
- SSLOptions +StdEnvVars
-
-
- BrowserMatch "MSIE [2-6]" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
- # MSIE 7 and newer should be able to use keepalive
- # This regexp is ok with 17-9!
- BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
- ## SSL Hardening
- SSLProtocol All -SSLv2 -SSLv3
- SSLHonorCipherOrder on
- SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'
diff --git a/docker/php-apache/7.1/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.1/conf/etc/supervisor.d/apache.conf
deleted file mode 100644
index 12a6f86f7..000000000
--- a/docker/php-apache/7.1/conf/etc/supervisor.d/apache.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:apache]
-programs=apached
-priority=20
-
-[program:apached]
-command = /opt/docker/bin/service.d/httpd.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache/7.1/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.1/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.1/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.1/conf/provision/bootstrap.d/10-apache.sh
deleted file mode 100644
index e9feb08b4..000000000
--- a/docker/php-apache/7.1/conf/provision/bootstrap.d/10-apache.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-IMAGE_DISTRIBUTION=$(docker-image-info dist)
-IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version)
-IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g')
-
-# Collect environment variables
-case "$IMAGE_FAMILY" in
- Debian|Ubuntu)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf
- ;;
-
- RedHat)
- APACHE_MAIN_PATH=/etc/httpd/
- APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf
- ;;
-
- Alpine)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf
- ;;
-esac
-
-# Enable apache main config
-ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST"
-
-# Ensure /var/run/apache2 exists
-mkdir -p -- "/var/run/apache2"
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- mkdir -p -- "/run/apache2"
-fi
-
-# Maintain lock directory
-if [[ "$IMAGE_FAMILY" == "Debian" ]]; then
- mkdir -p -- "/var/lock/apache2"
- chmod 0750 -- "/var/lock/apache2"
- chown www-data:www-data -- "/var/lock/apache2"
-fi
-
-APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log')
-
-# Change log to Docker stdout
-go-replace --regex --regex-backrefs \
- -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \
- -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \
- --path="$APACHE_MAIN_PATH" \
- --path-regex='(.*\.conf|default.*|.*log)$'
-
-# Switch MPM to event
-if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -- /etc/httpd/conf.modules.d/00-mpm.conf
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \
- -- /etc/apache2/httpd.conf \
- /etc/apache2/conf.d/ssl.conf \
- /etc/apache2/conf.d/proxy.conf
-
- # Remove default vhost
- sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf
-fi
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/httpd/ssl
-find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-apache/7.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.1/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index c8669ca25..000000000
--- a/docker/php-apache/7.1/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
-
diff --git a/docker/php-apache/7.1/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.1/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.1/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.1/conf/provision/entrypoint.d/20-apache.sh
deleted file mode 100644
index 42ef48932..000000000
--- a/docker/php-apache/7.1/conf/provision/entrypoint.d/20-apache.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
-fi
diff --git a/docker/php-apache/7.2-alpine/Dockerfile b/docker/php-apache/7.2-alpine/Dockerfile
deleted file mode 100644
index 331543c16..000000000
--- a/docker/php-apache/7.2-alpine/Dockerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache:7.2-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.2-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install apache
- && apk-install \
- apache2 \
- apache2-ctl \
- apache2-utils \
- apache2-proxy \
- apache2-ssl \
- # Fix issue with module loading order of lbmethod_* (see https://serverfault.com/questions/922573/apache2-fails-to-start-after-recent-update-to-2-4-34-no-clue-why)
- && sed -i '2,5{H;d}; ${p;x;s/^\n//}' /etc/apache2/conf.d/proxy.conf \
- && sed -ri ' \
- s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
- s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
- ' /etc/apache2/httpd.conf \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-apache/7.2-alpine/Dockerfile.jinja2 b/docker/php-apache/7.2-alpine/Dockerfile.jinja2
deleted file mode 100644
index 9088053de..000000000
--- a/docker/php-apache/7.2-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ docker.from("php", "7.2-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ apache.alpine() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.d/10-init.sh
deleted file mode 100644
index 4ef318a1e..000000000
--- a/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.d/10-init.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
-
diff --git a/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.sh
deleted file mode 100644
index f88544c62..000000000
--- a/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
-
-# Apache gets grumpy about PID files pre-existing
-rm -f /var/run/httpd/httpd.pid
-
-exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS
diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-error-document.conf
deleted file mode 100644
index ebabf87e4..000000000
--- a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-error-document.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#######################################
-# Faster error documents
-#######################################
-
- ErrorDocument 400 "400 Bad Request"
- ErrorDocument 401 "401 Unauthorized"
- ErrorDocument 403 "403 Forbidden"
- ErrorDocument 404 "404 Not Found"
- ErrorDocument 405 "405 Method Not Allowed"
-
- ErrorDocument 500 "500 Internal Server Error"
- ErrorDocument 501 "501 Not Implemented"
- ErrorDocument 502 "502 Bad Gateway"
- ErrorDocument 503 "503 Service Unavailable"
-
diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-log.conf
deleted file mode 100644
index 950e45105..000000000
--- a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-log.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog
-LogLevel warn
-CustomLog /docker.stdout dockerlog
-ErrorLog /docker.stderr
diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-php.conf
deleted file mode 100644
index cd62792e2..000000000
--- a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-php.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################
-# mod_proxy_fcgi
-# official solution
-# apache 2.4 and later
-#############################
-
-
- >
- ProxySet connectiontimeout=5 timeout=
-
-
-
- SetHandler "proxy:fcgi://"
-
-
-
-#############################
-# mod_fastcgi
-# apaache 2.2 and 2.4
-#############################
-
-
- AddHandler php-fcgi .php
- Action php-fcgi /php-fcgi
- Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi
- FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout
-
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
-
-
diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-server.conf
deleted file mode 100644
index 80b971734..000000000
--- a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-server.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Settings
-TimeOut 1000
-ServerName ""
-
-DirectoryIndex
-DocumentRoot ""
-
-">
- Options FollowSymLinks
- AllowOverride All
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/global.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.2-alpine/conf/etc/httpd/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/main.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/main.conf
deleted file mode 100644
index fb04614ca..000000000
--- a/docker/php-apache/7.2-alpine/conf/etc/httpd/main.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-Include /opt/docker/etc/httpd/global.conf
-Include /opt/docker/etc/httpd/php.conf
-
-
- Include /opt/docker/etc/httpd/conf.d/*.conf
-
-= 2.4>
- IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf
-
-Include /opt/docker/etc/httpd/vhost.conf
diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/php.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.2-alpine/conf/etc/httpd/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.conf
deleted file mode 100644
index 384696b4e..000000000
--- a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.conf
deleted file mode 100644
index c04a94318..000000000
--- a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#######################################
-# Vhost
-#######################################
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
-
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
- Include /opt/docker/etc/httpd/vhost.ssl.conf
-
diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.ssl.conf
deleted file mode 100644
index cf5fbc604..000000000
--- a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.ssl.conf
+++ /dev/null
@@ -1,26 +0,0 @@
- ############
- # SSL
- ############
-
- SSLEngine on
- SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt
- SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key
-
-
- SSLOptions +StdEnvVars
-
-
- SSLOptions +StdEnvVars
-
-
- BrowserMatch "MSIE [2-6]" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
- # MSIE 7 and newer should be able to use keepalive
- # This regexp is ok with 17-9!
- BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
- ## SSL Hardening
- SSLProtocol All -SSLv2 -SSLv3
- SSLHonorCipherOrder on
- SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'
diff --git a/docker/php-apache/7.2-alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.2-alpine/conf/etc/supervisor.d/apache.conf
deleted file mode 100644
index 12a6f86f7..000000000
--- a/docker/php-apache/7.2-alpine/conf/etc/supervisor.d/apache.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:apache]
-programs=apached
-priority=20
-
-[program:apached]
-command = /opt/docker/bin/service.d/httpd.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/10-apache.sh
deleted file mode 100644
index e9feb08b4..000000000
--- a/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/10-apache.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-IMAGE_DISTRIBUTION=$(docker-image-info dist)
-IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version)
-IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g')
-
-# Collect environment variables
-case "$IMAGE_FAMILY" in
- Debian|Ubuntu)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf
- ;;
-
- RedHat)
- APACHE_MAIN_PATH=/etc/httpd/
- APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf
- ;;
-
- Alpine)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf
- ;;
-esac
-
-# Enable apache main config
-ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST"
-
-# Ensure /var/run/apache2 exists
-mkdir -p -- "/var/run/apache2"
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- mkdir -p -- "/run/apache2"
-fi
-
-# Maintain lock directory
-if [[ "$IMAGE_FAMILY" == "Debian" ]]; then
- mkdir -p -- "/var/lock/apache2"
- chmod 0750 -- "/var/lock/apache2"
- chown www-data:www-data -- "/var/lock/apache2"
-fi
-
-APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log')
-
-# Change log to Docker stdout
-go-replace --regex --regex-backrefs \
- -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \
- -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \
- --path="$APACHE_MAIN_PATH" \
- --path-regex='(.*\.conf|default.*|.*log)$'
-
-# Switch MPM to event
-if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -- /etc/httpd/conf.modules.d/00-mpm.conf
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \
- -- /etc/apache2/httpd.conf \
- /etc/apache2/conf.d/ssl.conf \
- /etc/apache2/conf.d/proxy.conf
-
- # Remove default vhost
- sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf
-fi
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/httpd/ssl
-find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index c8669ca25..000000000
--- a/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
-
diff --git a/docker/php-apache/7.2-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.2-alpine/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.2-alpine/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.2-alpine/conf/provision/entrypoint.d/20-apache.sh
deleted file mode 100644
index 42ef48932..000000000
--- a/docker/php-apache/7.2-alpine/conf/provision/entrypoint.d/20-apache.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
-fi
diff --git a/docker/php-apache/7.2/Dockerfile b/docker/php-apache/7.2/Dockerfile
deleted file mode 100644
index 97007693d..000000000
--- a/docker/php-apache/7.2/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache:7.2
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.2
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install apache
- && apt-install \
- apache2 \
- && sed -ri ' \
- s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
- s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
- ' /etc/apache2/apache2.conf \
- && rm -f /etc/apache2/sites-enabled/* \
- && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-apache/7.2/Dockerfile.jinja2 b/docker/php-apache/7.2/Dockerfile.jinja2
deleted file mode 100644
index acc3b1cb5..000000000
--- a/docker/php-apache/7.2/Dockerfile.jinja2
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ docker.from("php", "7.2") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ apache.debian9() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-apache/7.2/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.2/conf/bin/service.d/httpd.d/10-init.sh
deleted file mode 100644
index 4ef318a1e..000000000
--- a/docker/php-apache/7.2/conf/bin/service.d/httpd.d/10-init.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
-
diff --git a/docker/php-apache/7.2/conf/bin/service.d/httpd.sh b/docker/php-apache/7.2/conf/bin/service.d/httpd.sh
deleted file mode 100644
index 1d871e7ea..000000000
--- a/docker/php-apache/7.2/conf/bin/service.d/httpd.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
-
-# Apache gets grumpy about PID files pre-existing
-rm -f /var/run/apache2/apache2*.pid
-
-source /etc/apache2/envvars
-exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS
diff --git a/docker/php-apache/7.2/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.2/conf/etc/httpd/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-error-document.conf
deleted file mode 100644
index ebabf87e4..000000000
--- a/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-error-document.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#######################################
-# Faster error documents
-#######################################
-
- ErrorDocument 400 "400 Bad Request"
- ErrorDocument 401 "401 Unauthorized"
- ErrorDocument 403 "403 Forbidden"
- ErrorDocument 404 "404 Not Found"
- ErrorDocument 405 "405 Method Not Allowed"
-
- ErrorDocument 500 "500 Internal Server Error"
- ErrorDocument 501 "501 Not Implemented"
- ErrorDocument 502 "502 Bad Gateway"
- ErrorDocument 503 "503 Service Unavailable"
-
diff --git a/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-log.conf
deleted file mode 100644
index 950e45105..000000000
--- a/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-log.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog
-LogLevel warn
-CustomLog /docker.stdout dockerlog
-ErrorLog /docker.stderr
diff --git a/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-php.conf
deleted file mode 100644
index cd62792e2..000000000
--- a/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-php.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################
-# mod_proxy_fcgi
-# official solution
-# apache 2.4 and later
-#############################
-
-
- >
- ProxySet connectiontimeout=5 timeout=
-
-
-
- SetHandler "proxy:fcgi://"
-
-
-
-#############################
-# mod_fastcgi
-# apaache 2.2 and 2.4
-#############################
-
-
- AddHandler php-fcgi .php
- Action php-fcgi /php-fcgi
- Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi
- FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout
-
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
-
-
diff --git a/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-server.conf
deleted file mode 100644
index 80b971734..000000000
--- a/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-server.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Settings
-TimeOut 1000
-ServerName ""
-
-DirectoryIndex
-DocumentRoot ""
-
-">
- Options FollowSymLinks
- AllowOverride All
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
diff --git a/docker/php-apache/7.2/conf/etc/httpd/global.conf b/docker/php-apache/7.2/conf/etc/httpd/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.2/conf/etc/httpd/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.2/conf/etc/httpd/main.conf b/docker/php-apache/7.2/conf/etc/httpd/main.conf
deleted file mode 100644
index fb04614ca..000000000
--- a/docker/php-apache/7.2/conf/etc/httpd/main.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-Include /opt/docker/etc/httpd/global.conf
-Include /opt/docker/etc/httpd/php.conf
-
-
- Include /opt/docker/etc/httpd/conf.d/*.conf
-
-= 2.4>
- IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf
-
-Include /opt/docker/etc/httpd/vhost.conf
diff --git a/docker/php-apache/7.2/conf/etc/httpd/php.conf b/docker/php-apache/7.2/conf/etc/httpd/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.2/conf/etc/httpd/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.2/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.2/conf/etc/httpd/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-apache/7.2/conf/etc/httpd/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-apache/7.2/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.2/conf/etc/httpd/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-apache/7.2/conf/etc/httpd/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-apache/7.2/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.2/conf/etc/httpd/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-apache/7.2/conf/etc/httpd/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-apache/7.2/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.2/conf/etc/httpd/vhost.common.conf
deleted file mode 100644
index 384696b4e..000000000
--- a/docker/php-apache/7.2/conf/etc/httpd/vhost.common.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
diff --git a/docker/php-apache/7.2/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.2/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.2/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.2/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache/7.2/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache/7.2/conf/etc/httpd/vhost.conf b/docker/php-apache/7.2/conf/etc/httpd/vhost.conf
deleted file mode 100644
index c04a94318..000000000
--- a/docker/php-apache/7.2/conf/etc/httpd/vhost.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#######################################
-# Vhost
-#######################################
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
-
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
- Include /opt/docker/etc/httpd/vhost.ssl.conf
-
diff --git a/docker/php-apache/7.2/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.2/conf/etc/httpd/vhost.ssl.conf
deleted file mode 100644
index cf5fbc604..000000000
--- a/docker/php-apache/7.2/conf/etc/httpd/vhost.ssl.conf
+++ /dev/null
@@ -1,26 +0,0 @@
- ############
- # SSL
- ############
-
- SSLEngine on
- SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt
- SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key
-
-
- SSLOptions +StdEnvVars
-
-
- SSLOptions +StdEnvVars
-
-
- BrowserMatch "MSIE [2-6]" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
- # MSIE 7 and newer should be able to use keepalive
- # This regexp is ok with 17-9!
- BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
- ## SSL Hardening
- SSLProtocol All -SSLv2 -SSLv3
- SSLHonorCipherOrder on
- SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'
diff --git a/docker/php-apache/7.2/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.2/conf/etc/supervisor.d/apache.conf
deleted file mode 100644
index 12a6f86f7..000000000
--- a/docker/php-apache/7.2/conf/etc/supervisor.d/apache.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:apache]
-programs=apached
-priority=20
-
-[program:apached]
-command = /opt/docker/bin/service.d/httpd.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache/7.2/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.2/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.2/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.2/conf/provision/bootstrap.d/10-apache.sh
deleted file mode 100644
index e9feb08b4..000000000
--- a/docker/php-apache/7.2/conf/provision/bootstrap.d/10-apache.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-IMAGE_DISTRIBUTION=$(docker-image-info dist)
-IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version)
-IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g')
-
-# Collect environment variables
-case "$IMAGE_FAMILY" in
- Debian|Ubuntu)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf
- ;;
-
- RedHat)
- APACHE_MAIN_PATH=/etc/httpd/
- APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf
- ;;
-
- Alpine)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf
- ;;
-esac
-
-# Enable apache main config
-ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST"
-
-# Ensure /var/run/apache2 exists
-mkdir -p -- "/var/run/apache2"
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- mkdir -p -- "/run/apache2"
-fi
-
-# Maintain lock directory
-if [[ "$IMAGE_FAMILY" == "Debian" ]]; then
- mkdir -p -- "/var/lock/apache2"
- chmod 0750 -- "/var/lock/apache2"
- chown www-data:www-data -- "/var/lock/apache2"
-fi
-
-APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log')
-
-# Change log to Docker stdout
-go-replace --regex --regex-backrefs \
- -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \
- -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \
- --path="$APACHE_MAIN_PATH" \
- --path-regex='(.*\.conf|default.*|.*log)$'
-
-# Switch MPM to event
-if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -- /etc/httpd/conf.modules.d/00-mpm.conf
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \
- -- /etc/apache2/httpd.conf \
- /etc/apache2/conf.d/ssl.conf \
- /etc/apache2/conf.d/proxy.conf
-
- # Remove default vhost
- sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf
-fi
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/httpd/ssl
-find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-apache/7.2/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.2/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index c8669ca25..000000000
--- a/docker/php-apache/7.2/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
-
diff --git a/docker/php-apache/7.2/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.2/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.2/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.2/conf/provision/entrypoint.d/20-apache.sh
deleted file mode 100644
index 42ef48932..000000000
--- a/docker/php-apache/7.2/conf/provision/entrypoint.d/20-apache.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
-fi
diff --git a/docker/php-apache/7.3-alpine/Dockerfile b/docker/php-apache/7.3-alpine/Dockerfile
deleted file mode 100644
index 91f909b3a..000000000
--- a/docker/php-apache/7.3-alpine/Dockerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache:7.3-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.3-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install apache
- && apk-install \
- apache2 \
- apache2-ctl \
- apache2-utils \
- apache2-proxy \
- apache2-ssl \
- # Fix issue with module loading order of lbmethod_* (see https://serverfault.com/questions/922573/apache2-fails-to-start-after-recent-update-to-2-4-34-no-clue-why)
- && sed -i '2,5{H;d}; ${p;x;s/^\n//}' /etc/apache2/conf.d/proxy.conf \
- && sed -ri ' \
- s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
- s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
- ' /etc/apache2/httpd.conf \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-apache/7.3-alpine/Dockerfile.jinja2 b/docker/php-apache/7.3-alpine/Dockerfile.jinja2
deleted file mode 100644
index 0a5d39962..000000000
--- a/docker/php-apache/7.3-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ docker.from("php", "7.3-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ apache.alpine() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.d/10-init.sh
deleted file mode 100644
index 4ef318a1e..000000000
--- a/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.d/10-init.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
-
diff --git a/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.sh
deleted file mode 100644
index f88544c62..000000000
--- a/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
-
-# Apache gets grumpy about PID files pre-existing
-rm -f /var/run/httpd/httpd.pid
-
-exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS
diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-error-document.conf
deleted file mode 100644
index ebabf87e4..000000000
--- a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-error-document.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#######################################
-# Faster error documents
-#######################################
-
- ErrorDocument 400 "400 Bad Request"
- ErrorDocument 401 "401 Unauthorized"
- ErrorDocument 403 "403 Forbidden"
- ErrorDocument 404 "404 Not Found"
- ErrorDocument 405 "405 Method Not Allowed"
-
- ErrorDocument 500 "500 Internal Server Error"
- ErrorDocument 501 "501 Not Implemented"
- ErrorDocument 502 "502 Bad Gateway"
- ErrorDocument 503 "503 Service Unavailable"
-
diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-log.conf
deleted file mode 100644
index 950e45105..000000000
--- a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-log.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog
-LogLevel warn
-CustomLog /docker.stdout dockerlog
-ErrorLog /docker.stderr
diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-php.conf
deleted file mode 100644
index cd62792e2..000000000
--- a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-php.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################
-# mod_proxy_fcgi
-# official solution
-# apache 2.4 and later
-#############################
-
-
- >
- ProxySet connectiontimeout=5 timeout=
-
-
-
- SetHandler "proxy:fcgi://"
-
-
-
-#############################
-# mod_fastcgi
-# apaache 2.2 and 2.4
-#############################
-
-
- AddHandler php-fcgi .php
- Action php-fcgi /php-fcgi
- Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi
- FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout
-
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
-
-
diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-server.conf
deleted file mode 100644
index 80b971734..000000000
--- a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-server.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Settings
-TimeOut 1000
-ServerName ""
-
-DirectoryIndex
-DocumentRoot ""
-
-">
- Options FollowSymLinks
- AllowOverride All
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/global.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.3-alpine/conf/etc/httpd/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/main.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/main.conf
deleted file mode 100644
index fb04614ca..000000000
--- a/docker/php-apache/7.3-alpine/conf/etc/httpd/main.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-Include /opt/docker/etc/httpd/global.conf
-Include /opt/docker/etc/httpd/php.conf
-
-
- Include /opt/docker/etc/httpd/conf.d/*.conf
-
-= 2.4>
- IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf
-
-Include /opt/docker/etc/httpd/vhost.conf
diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/php.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.3-alpine/conf/etc/httpd/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.conf
deleted file mode 100644
index 384696b4e..000000000
--- a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.conf
deleted file mode 100644
index c04a94318..000000000
--- a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#######################################
-# Vhost
-#######################################
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
-
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
- Include /opt/docker/etc/httpd/vhost.ssl.conf
-
diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.ssl.conf
deleted file mode 100644
index cf5fbc604..000000000
--- a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.ssl.conf
+++ /dev/null
@@ -1,26 +0,0 @@
- ############
- # SSL
- ############
-
- SSLEngine on
- SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt
- SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key
-
-
- SSLOptions +StdEnvVars
-
-
- SSLOptions +StdEnvVars
-
-
- BrowserMatch "MSIE [2-6]" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
- # MSIE 7 and newer should be able to use keepalive
- # This regexp is ok with 17-9!
- BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
- ## SSL Hardening
- SSLProtocol All -SSLv2 -SSLv3
- SSLHonorCipherOrder on
- SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'
diff --git a/docker/php-apache/7.3-alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.3-alpine/conf/etc/supervisor.d/apache.conf
deleted file mode 100644
index 12a6f86f7..000000000
--- a/docker/php-apache/7.3-alpine/conf/etc/supervisor.d/apache.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:apache]
-programs=apached
-priority=20
-
-[program:apached]
-command = /opt/docker/bin/service.d/httpd.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/10-apache.sh
deleted file mode 100644
index e9feb08b4..000000000
--- a/docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/10-apache.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-IMAGE_DISTRIBUTION=$(docker-image-info dist)
-IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version)
-IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g')
-
-# Collect environment variables
-case "$IMAGE_FAMILY" in
- Debian|Ubuntu)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf
- ;;
-
- RedHat)
- APACHE_MAIN_PATH=/etc/httpd/
- APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf
- ;;
-
- Alpine)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf
- ;;
-esac
-
-# Enable apache main config
-ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST"
-
-# Ensure /var/run/apache2 exists
-mkdir -p -- "/var/run/apache2"
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- mkdir -p -- "/run/apache2"
-fi
-
-# Maintain lock directory
-if [[ "$IMAGE_FAMILY" == "Debian" ]]; then
- mkdir -p -- "/var/lock/apache2"
- chmod 0750 -- "/var/lock/apache2"
- chown www-data:www-data -- "/var/lock/apache2"
-fi
-
-APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log')
-
-# Change log to Docker stdout
-go-replace --regex --regex-backrefs \
- -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \
- -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \
- --path="$APACHE_MAIN_PATH" \
- --path-regex='(.*\.conf|default.*|.*log)$'
-
-# Switch MPM to event
-if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -- /etc/httpd/conf.modules.d/00-mpm.conf
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \
- -- /etc/apache2/httpd.conf \
- /etc/apache2/conf.d/ssl.conf \
- /etc/apache2/conf.d/proxy.conf
-
- # Remove default vhost
- sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf
-fi
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/httpd/ssl
-find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index c8669ca25..000000000
--- a/docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
-
diff --git a/docker/php-apache/7.3-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.3-alpine/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.3-alpine/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.3-alpine/conf/provision/entrypoint.d/20-apache.sh
deleted file mode 100644
index 42ef48932..000000000
--- a/docker/php-apache/7.3-alpine/conf/provision/entrypoint.d/20-apache.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
-fi
diff --git a/docker/php-apache/7.3/Dockerfile b/docker/php-apache/7.3/Dockerfile
deleted file mode 100644
index fd714a495..000000000
--- a/docker/php-apache/7.3/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache:7.3
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.3
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install apache
- && apt-install \
- apache2 \
- && sed -ri ' \
- s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
- s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
- ' /etc/apache2/apache2.conf \
- && rm -f /etc/apache2/sites-enabled/* \
- && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-apache/7.3/Dockerfile.jinja2 b/docker/php-apache/7.3/Dockerfile.jinja2
deleted file mode 100644
index d9056be53..000000000
--- a/docker/php-apache/7.3/Dockerfile.jinja2
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ docker.from("php", "7.3") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ apache.debian9() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-apache/7.3/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.3/conf/bin/service.d/httpd.d/10-init.sh
deleted file mode 100644
index 4ef318a1e..000000000
--- a/docker/php-apache/7.3/conf/bin/service.d/httpd.d/10-init.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
-
diff --git a/docker/php-apache/7.3/conf/bin/service.d/httpd.sh b/docker/php-apache/7.3/conf/bin/service.d/httpd.sh
deleted file mode 100644
index 1d871e7ea..000000000
--- a/docker/php-apache/7.3/conf/bin/service.d/httpd.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
-
-# Apache gets grumpy about PID files pre-existing
-rm -f /var/run/apache2/apache2*.pid
-
-source /etc/apache2/envvars
-exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS
diff --git a/docker/php-apache/7.3/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.3/conf/etc/httpd/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-error-document.conf
deleted file mode 100644
index ebabf87e4..000000000
--- a/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-error-document.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#######################################
-# Faster error documents
-#######################################
-
- ErrorDocument 400 "400 Bad Request"
- ErrorDocument 401 "401 Unauthorized"
- ErrorDocument 403 "403 Forbidden"
- ErrorDocument 404 "404 Not Found"
- ErrorDocument 405 "405 Method Not Allowed"
-
- ErrorDocument 500 "500 Internal Server Error"
- ErrorDocument 501 "501 Not Implemented"
- ErrorDocument 502 "502 Bad Gateway"
- ErrorDocument 503 "503 Service Unavailable"
-
diff --git a/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-log.conf
deleted file mode 100644
index 950e45105..000000000
--- a/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-log.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog
-LogLevel warn
-CustomLog /docker.stdout dockerlog
-ErrorLog /docker.stderr
diff --git a/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-php.conf
deleted file mode 100644
index cd62792e2..000000000
--- a/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-php.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################
-# mod_proxy_fcgi
-# official solution
-# apache 2.4 and later
-#############################
-
-
- >
- ProxySet connectiontimeout=5 timeout=
-
-
-
- SetHandler "proxy:fcgi://"
-
-
-
-#############################
-# mod_fastcgi
-# apaache 2.2 and 2.4
-#############################
-
-
- AddHandler php-fcgi .php
- Action php-fcgi /php-fcgi
- Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi
- FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout
-
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
-
-
diff --git a/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-server.conf
deleted file mode 100644
index 80b971734..000000000
--- a/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-server.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Settings
-TimeOut 1000
-ServerName ""
-
-DirectoryIndex
-DocumentRoot ""
-
-">
- Options FollowSymLinks
- AllowOverride All
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
diff --git a/docker/php-apache/7.3/conf/etc/httpd/global.conf b/docker/php-apache/7.3/conf/etc/httpd/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.3/conf/etc/httpd/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.3/conf/etc/httpd/main.conf b/docker/php-apache/7.3/conf/etc/httpd/main.conf
deleted file mode 100644
index fb04614ca..000000000
--- a/docker/php-apache/7.3/conf/etc/httpd/main.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-Include /opt/docker/etc/httpd/global.conf
-Include /opt/docker/etc/httpd/php.conf
-
-
- Include /opt/docker/etc/httpd/conf.d/*.conf
-
-= 2.4>
- IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf
-
-Include /opt/docker/etc/httpd/vhost.conf
diff --git a/docker/php-apache/7.3/conf/etc/httpd/php.conf b/docker/php-apache/7.3/conf/etc/httpd/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.3/conf/etc/httpd/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.3/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.3/conf/etc/httpd/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-apache/7.3/conf/etc/httpd/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-apache/7.3/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.3/conf/etc/httpd/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-apache/7.3/conf/etc/httpd/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-apache/7.3/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.3/conf/etc/httpd/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-apache/7.3/conf/etc/httpd/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-apache/7.3/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.3/conf/etc/httpd/vhost.common.conf
deleted file mode 100644
index 384696b4e..000000000
--- a/docker/php-apache/7.3/conf/etc/httpd/vhost.common.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
diff --git a/docker/php-apache/7.3/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.3/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache/7.3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache/7.3/conf/etc/httpd/vhost.conf b/docker/php-apache/7.3/conf/etc/httpd/vhost.conf
deleted file mode 100644
index c04a94318..000000000
--- a/docker/php-apache/7.3/conf/etc/httpd/vhost.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#######################################
-# Vhost
-#######################################
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
-
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
- Include /opt/docker/etc/httpd/vhost.ssl.conf
-
diff --git a/docker/php-apache/7.3/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.3/conf/etc/httpd/vhost.ssl.conf
deleted file mode 100644
index cf5fbc604..000000000
--- a/docker/php-apache/7.3/conf/etc/httpd/vhost.ssl.conf
+++ /dev/null
@@ -1,26 +0,0 @@
- ############
- # SSL
- ############
-
- SSLEngine on
- SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt
- SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key
-
-
- SSLOptions +StdEnvVars
-
-
- SSLOptions +StdEnvVars
-
-
- BrowserMatch "MSIE [2-6]" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
- # MSIE 7 and newer should be able to use keepalive
- # This regexp is ok with 17-9!
- BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
- ## SSL Hardening
- SSLProtocol All -SSLv2 -SSLv3
- SSLHonorCipherOrder on
- SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'
diff --git a/docker/php-apache/7.3/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.3/conf/etc/supervisor.d/apache.conf
deleted file mode 100644
index 12a6f86f7..000000000
--- a/docker/php-apache/7.3/conf/etc/supervisor.d/apache.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:apache]
-programs=apached
-priority=20
-
-[program:apached]
-command = /opt/docker/bin/service.d/httpd.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache/7.3/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.3/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.3/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.3/conf/provision/bootstrap.d/10-apache.sh
deleted file mode 100644
index e9feb08b4..000000000
--- a/docker/php-apache/7.3/conf/provision/bootstrap.d/10-apache.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-IMAGE_DISTRIBUTION=$(docker-image-info dist)
-IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version)
-IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g')
-
-# Collect environment variables
-case "$IMAGE_FAMILY" in
- Debian|Ubuntu)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf
- ;;
-
- RedHat)
- APACHE_MAIN_PATH=/etc/httpd/
- APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf
- ;;
-
- Alpine)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf
- ;;
-esac
-
-# Enable apache main config
-ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST"
-
-# Ensure /var/run/apache2 exists
-mkdir -p -- "/var/run/apache2"
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- mkdir -p -- "/run/apache2"
-fi
-
-# Maintain lock directory
-if [[ "$IMAGE_FAMILY" == "Debian" ]]; then
- mkdir -p -- "/var/lock/apache2"
- chmod 0750 -- "/var/lock/apache2"
- chown www-data:www-data -- "/var/lock/apache2"
-fi
-
-APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log')
-
-# Change log to Docker stdout
-go-replace --regex --regex-backrefs \
- -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \
- -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \
- --path="$APACHE_MAIN_PATH" \
- --path-regex='(.*\.conf|default.*|.*log)$'
-
-# Switch MPM to event
-if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -- /etc/httpd/conf.modules.d/00-mpm.conf
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \
- -- /etc/apache2/httpd.conf \
- /etc/apache2/conf.d/ssl.conf \
- /etc/apache2/conf.d/proxy.conf
-
- # Remove default vhost
- sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf
-fi
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/httpd/ssl
-find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-apache/7.3/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.3/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index c8669ca25..000000000
--- a/docker/php-apache/7.3/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
-
diff --git a/docker/php-apache/7.3/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.3/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.3/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.3/conf/provision/entrypoint.d/20-apache.sh
deleted file mode 100644
index 42ef48932..000000000
--- a/docker/php-apache/7.3/conf/provision/entrypoint.d/20-apache.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
-fi
diff --git a/docker/php-apache/7.4-alpine/Dockerfile b/docker/php-apache/7.4-alpine/Dockerfile
deleted file mode 100644
index 8f408c631..000000000
--- a/docker/php-apache/7.4-alpine/Dockerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache:7.4-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.4-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install apache
- && apk-install \
- apache2 \
- apache2-ctl \
- apache2-utils \
- apache2-proxy \
- apache2-ssl \
- # Fix issue with module loading order of lbmethod_* (see https://serverfault.com/questions/922573/apache2-fails-to-start-after-recent-update-to-2-4-34-no-clue-why)
- && sed -i '2,5{H;d}; ${p;x;s/^\n//}' /etc/apache2/conf.d/proxy.conf \
- && sed -ri ' \
- s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
- s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
- ' /etc/apache2/httpd.conf \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-apache/7.4-alpine/Dockerfile.jinja2 b/docker/php-apache/7.4-alpine/Dockerfile.jinja2
deleted file mode 100644
index aec341e3e..000000000
--- a/docker/php-apache/7.4-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ docker.from("php", "7.4-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ apache.alpine() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.d/10-init.sh
deleted file mode 100644
index 4ef318a1e..000000000
--- a/docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.d/10-init.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
-
diff --git a/docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.sh
deleted file mode 100644
index f88544c62..000000000
--- a/docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
-
-# Apache gets grumpy about PID files pre-existing
-rm -f /var/run/httpd/httpd.pid
-
-exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS
diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-error-document.conf
deleted file mode 100644
index ebabf87e4..000000000
--- a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-error-document.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#######################################
-# Faster error documents
-#######################################
-
- ErrorDocument 400 "400 Bad Request"
- ErrorDocument 401 "401 Unauthorized"
- ErrorDocument 403 "403 Forbidden"
- ErrorDocument 404 "404 Not Found"
- ErrorDocument 405 "405 Method Not Allowed"
-
- ErrorDocument 500 "500 Internal Server Error"
- ErrorDocument 501 "501 Not Implemented"
- ErrorDocument 502 "502 Bad Gateway"
- ErrorDocument 503 "503 Service Unavailable"
-
diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-log.conf
deleted file mode 100644
index 950e45105..000000000
--- a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-log.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog
-LogLevel warn
-CustomLog /docker.stdout dockerlog
-ErrorLog /docker.stderr
diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-php.conf
deleted file mode 100644
index cd62792e2..000000000
--- a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-php.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################
-# mod_proxy_fcgi
-# official solution
-# apache 2.4 and later
-#############################
-
-
- >
- ProxySet connectiontimeout=5 timeout=
-
-
-
- SetHandler "proxy:fcgi://"
-
-
-
-#############################
-# mod_fastcgi
-# apaache 2.2 and 2.4
-#############################
-
-
- AddHandler php-fcgi .php
- Action php-fcgi /php-fcgi
- Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi
- FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout
-
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
-
-
diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-server.conf
deleted file mode 100644
index 80b971734..000000000
--- a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-server.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Settings
-TimeOut 1000
-ServerName ""
-
-DirectoryIndex
-DocumentRoot ""
-
-">
- Options FollowSymLinks
- AllowOverride All
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/global.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.4-alpine/conf/etc/httpd/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/main.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/main.conf
deleted file mode 100644
index fb04614ca..000000000
--- a/docker/php-apache/7.4-alpine/conf/etc/httpd/main.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-Include /opt/docker/etc/httpd/global.conf
-Include /opt/docker/etc/httpd/php.conf
-
-
- Include /opt/docker/etc/httpd/conf.d/*.conf
-
-= 2.4>
- IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf
-
-Include /opt/docker/etc/httpd/vhost.conf
diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/php.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.4-alpine/conf/etc/httpd/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.conf
deleted file mode 100644
index 384696b4e..000000000
--- a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.conf
deleted file mode 100644
index c04a94318..000000000
--- a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#######################################
-# Vhost
-#######################################
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
-
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
- Include /opt/docker/etc/httpd/vhost.ssl.conf
-
diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.ssl.conf
deleted file mode 100644
index cf5fbc604..000000000
--- a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.ssl.conf
+++ /dev/null
@@ -1,26 +0,0 @@
- ############
- # SSL
- ############
-
- SSLEngine on
- SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt
- SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key
-
-
- SSLOptions +StdEnvVars
-
-
- SSLOptions +StdEnvVars
-
-
- BrowserMatch "MSIE [2-6]" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
- # MSIE 7 and newer should be able to use keepalive
- # This regexp is ok with 17-9!
- BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
- ## SSL Hardening
- SSLProtocol All -SSLv2 -SSLv3
- SSLHonorCipherOrder on
- SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'
diff --git a/docker/php-apache/7.4-alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.4-alpine/conf/etc/supervisor.d/apache.conf
deleted file mode 100644
index 12a6f86f7..000000000
--- a/docker/php-apache/7.4-alpine/conf/etc/supervisor.d/apache.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:apache]
-programs=apached
-priority=20
-
-[program:apached]
-command = /opt/docker/bin/service.d/httpd.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/10-apache.sh
deleted file mode 100644
index e9feb08b4..000000000
--- a/docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/10-apache.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-IMAGE_DISTRIBUTION=$(docker-image-info dist)
-IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version)
-IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g')
-
-# Collect environment variables
-case "$IMAGE_FAMILY" in
- Debian|Ubuntu)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf
- ;;
-
- RedHat)
- APACHE_MAIN_PATH=/etc/httpd/
- APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf
- ;;
-
- Alpine)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf
- ;;
-esac
-
-# Enable apache main config
-ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST"
-
-# Ensure /var/run/apache2 exists
-mkdir -p -- "/var/run/apache2"
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- mkdir -p -- "/run/apache2"
-fi
-
-# Maintain lock directory
-if [[ "$IMAGE_FAMILY" == "Debian" ]]; then
- mkdir -p -- "/var/lock/apache2"
- chmod 0750 -- "/var/lock/apache2"
- chown www-data:www-data -- "/var/lock/apache2"
-fi
-
-APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log')
-
-# Change log to Docker stdout
-go-replace --regex --regex-backrefs \
- -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \
- -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \
- --path="$APACHE_MAIN_PATH" \
- --path-regex='(.*\.conf|default.*|.*log)$'
-
-# Switch MPM to event
-if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -- /etc/httpd/conf.modules.d/00-mpm.conf
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \
- -- /etc/apache2/httpd.conf \
- /etc/apache2/conf.d/ssl.conf \
- /etc/apache2/conf.d/proxy.conf
-
- # Remove default vhost
- sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf
-fi
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/httpd/ssl
-find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index c8669ca25..000000000
--- a/docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
-
diff --git a/docker/php-apache/7.4-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.4-alpine/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.4-alpine/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.4-alpine/conf/provision/entrypoint.d/20-apache.sh
deleted file mode 100644
index 42ef48932..000000000
--- a/docker/php-apache/7.4-alpine/conf/provision/entrypoint.d/20-apache.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
-fi
diff --git a/docker/php-apache/7.4/Dockerfile b/docker/php-apache/7.4/Dockerfile
deleted file mode 100644
index 68581a393..000000000
--- a/docker/php-apache/7.4/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache:7.4
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.4
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install apache
- && apt-install \
- apache2 \
- && sed -ri ' \
- s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
- s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
- ' /etc/apache2/apache2.conf \
- && rm -f /etc/apache2/sites-enabled/* \
- && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-apache/7.4/Dockerfile.jinja2 b/docker/php-apache/7.4/Dockerfile.jinja2
deleted file mode 100644
index c909b094e..000000000
--- a/docker/php-apache/7.4/Dockerfile.jinja2
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ docker.from("php", "7.4") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ apache.debian9() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-apache/7.4/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.4/conf/bin/service.d/httpd.d/10-init.sh
deleted file mode 100644
index 4ef318a1e..000000000
--- a/docker/php-apache/7.4/conf/bin/service.d/httpd.d/10-init.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
-
diff --git a/docker/php-apache/7.4/conf/bin/service.d/httpd.sh b/docker/php-apache/7.4/conf/bin/service.d/httpd.sh
deleted file mode 100644
index 1d871e7ea..000000000
--- a/docker/php-apache/7.4/conf/bin/service.d/httpd.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
-
-# Apache gets grumpy about PID files pre-existing
-rm -f /var/run/apache2/apache2*.pid
-
-source /etc/apache2/envvars
-exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS
diff --git a/docker/php-apache/7.4/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.4/conf/etc/httpd/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-error-document.conf
deleted file mode 100644
index ebabf87e4..000000000
--- a/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-error-document.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#######################################
-# Faster error documents
-#######################################
-
- ErrorDocument 400 "400 Bad Request"
- ErrorDocument 401 "401 Unauthorized"
- ErrorDocument 403 "403 Forbidden"
- ErrorDocument 404 "404 Not Found"
- ErrorDocument 405 "405 Method Not Allowed"
-
- ErrorDocument 500 "500 Internal Server Error"
- ErrorDocument 501 "501 Not Implemented"
- ErrorDocument 502 "502 Bad Gateway"
- ErrorDocument 503 "503 Service Unavailable"
-
diff --git a/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-log.conf
deleted file mode 100644
index 950e45105..000000000
--- a/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-log.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog
-LogLevel warn
-CustomLog /docker.stdout dockerlog
-ErrorLog /docker.stderr
diff --git a/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-php.conf
deleted file mode 100644
index cd62792e2..000000000
--- a/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-php.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################
-# mod_proxy_fcgi
-# official solution
-# apache 2.4 and later
-#############################
-
-
- >
- ProxySet connectiontimeout=5 timeout=
-
-
-
- SetHandler "proxy:fcgi://"
-
-
-
-#############################
-# mod_fastcgi
-# apaache 2.2 and 2.4
-#############################
-
-
- AddHandler php-fcgi .php
- Action php-fcgi /php-fcgi
- Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi
- FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout
-
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
-
-
diff --git a/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-server.conf
deleted file mode 100644
index 80b971734..000000000
--- a/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-server.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Settings
-TimeOut 1000
-ServerName ""
-
-DirectoryIndex
-DocumentRoot ""
-
-">
- Options FollowSymLinks
- AllowOverride All
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
diff --git a/docker/php-apache/7.4/conf/etc/httpd/global.conf b/docker/php-apache/7.4/conf/etc/httpd/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.4/conf/etc/httpd/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.4/conf/etc/httpd/main.conf b/docker/php-apache/7.4/conf/etc/httpd/main.conf
deleted file mode 100644
index fb04614ca..000000000
--- a/docker/php-apache/7.4/conf/etc/httpd/main.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-Include /opt/docker/etc/httpd/global.conf
-Include /opt/docker/etc/httpd/php.conf
-
-
- Include /opt/docker/etc/httpd/conf.d/*.conf
-
-= 2.4>
- IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf
-
-Include /opt/docker/etc/httpd/vhost.conf
diff --git a/docker/php-apache/7.4/conf/etc/httpd/php.conf b/docker/php-apache/7.4/conf/etc/httpd/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/7.4/conf/etc/httpd/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/7.4/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.4/conf/etc/httpd/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-apache/7.4/conf/etc/httpd/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-apache/7.4/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.4/conf/etc/httpd/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-apache/7.4/conf/etc/httpd/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-apache/7.4/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.4/conf/etc/httpd/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-apache/7.4/conf/etc/httpd/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-apache/7.4/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.4/conf/etc/httpd/vhost.common.conf
deleted file mode 100644
index 384696b4e..000000000
--- a/docker/php-apache/7.4/conf/etc/httpd/vhost.common.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
diff --git a/docker/php-apache/7.4/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.4/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.4/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.4/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache/7.4/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache/7.4/conf/etc/httpd/vhost.conf b/docker/php-apache/7.4/conf/etc/httpd/vhost.conf
deleted file mode 100644
index c04a94318..000000000
--- a/docker/php-apache/7.4/conf/etc/httpd/vhost.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#######################################
-# Vhost
-#######################################
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
-
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
- Include /opt/docker/etc/httpd/vhost.ssl.conf
-
diff --git a/docker/php-apache/7.4/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.4/conf/etc/httpd/vhost.ssl.conf
deleted file mode 100644
index cf5fbc604..000000000
--- a/docker/php-apache/7.4/conf/etc/httpd/vhost.ssl.conf
+++ /dev/null
@@ -1,26 +0,0 @@
- ############
- # SSL
- ############
-
- SSLEngine on
- SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt
- SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key
-
-
- SSLOptions +StdEnvVars
-
-
- SSLOptions +StdEnvVars
-
-
- BrowserMatch "MSIE [2-6]" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
- # MSIE 7 and newer should be able to use keepalive
- # This regexp is ok with 17-9!
- BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
- ## SSL Hardening
- SSLProtocol All -SSLv2 -SSLv3
- SSLHonorCipherOrder on
- SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'
diff --git a/docker/php-apache/7.4/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.4/conf/etc/supervisor.d/apache.conf
deleted file mode 100644
index 12a6f86f7..000000000
--- a/docker/php-apache/7.4/conf/etc/supervisor.d/apache.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:apache]
-programs=apached
-priority=20
-
-[program:apached]
-command = /opt/docker/bin/service.d/httpd.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache/7.4/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.4/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.4/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.4/conf/provision/bootstrap.d/10-apache.sh
deleted file mode 100644
index e9feb08b4..000000000
--- a/docker/php-apache/7.4/conf/provision/bootstrap.d/10-apache.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-IMAGE_DISTRIBUTION=$(docker-image-info dist)
-IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version)
-IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g')
-
-# Collect environment variables
-case "$IMAGE_FAMILY" in
- Debian|Ubuntu)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf
- ;;
-
- RedHat)
- APACHE_MAIN_PATH=/etc/httpd/
- APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf
- ;;
-
- Alpine)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf
- ;;
-esac
-
-# Enable apache main config
-ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST"
-
-# Ensure /var/run/apache2 exists
-mkdir -p -- "/var/run/apache2"
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- mkdir -p -- "/run/apache2"
-fi
-
-# Maintain lock directory
-if [[ "$IMAGE_FAMILY" == "Debian" ]]; then
- mkdir -p -- "/var/lock/apache2"
- chmod 0750 -- "/var/lock/apache2"
- chown www-data:www-data -- "/var/lock/apache2"
-fi
-
-APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log')
-
-# Change log to Docker stdout
-go-replace --regex --regex-backrefs \
- -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \
- -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \
- --path="$APACHE_MAIN_PATH" \
- --path-regex='(.*\.conf|default.*|.*log)$'
-
-# Switch MPM to event
-if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -- /etc/httpd/conf.modules.d/00-mpm.conf
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \
- -- /etc/apache2/httpd.conf \
- /etc/apache2/conf.d/ssl.conf \
- /etc/apache2/conf.d/proxy.conf
-
- # Remove default vhost
- sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf
-fi
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/httpd/ssl
-find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-apache/7.4/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.4/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index c8669ca25..000000000
--- a/docker/php-apache/7.4/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
-
diff --git a/docker/php-apache/7.4/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.4/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/7.4/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.4/conf/provision/entrypoint.d/20-apache.sh
deleted file mode 100644
index 42ef48932..000000000
--- a/docker/php-apache/7.4/conf/provision/entrypoint.d/20-apache.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
-fi
diff --git a/docker/php-apache/8.0-alpine/Dockerfile b/docker/php-apache/8.0-alpine/Dockerfile
deleted file mode 100644
index 02f34eae9..000000000
--- a/docker/php-apache/8.0-alpine/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache:8.0-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:8.0-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install apache
- && apk-install \
- apache2 \
- apache2-ctl \
- apache2-utils \
- apache2-proxy \
- apache2-ssl \
- # Fix issue with module loading order of lbmethod_* (see https://serverfault.com/questions/922573/apache2-fails-to-start-after-recent-update-to-2-4-34-no-clue-why)
- && sed -i '2,5{H;d}; ${p;x;s/^\n//}' /etc/apache2/conf.d/proxy.conf \
- && sed -ri ' \
- s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
- s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
- ' /etc/apache2/httpd.conf \
- && docker-run-bootstrap
-
-EXPOSE 80 443
diff --git a/docker/php-apache/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache/8.0-alpine/Dockerfile.jinja2
deleted file mode 100644
index 5c7635476..000000000
--- a/docker/php-apache/8.0-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php", "8.0-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ apache.alpine() }} \
- {{ provision.runBootstrap() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.d/10-init.sh
deleted file mode 100644
index 4ef318a1e..000000000
--- a/docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.d/10-init.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
-
diff --git a/docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.sh
deleted file mode 100644
index f88544c62..000000000
--- a/docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
-
-# Apache gets grumpy about PID files pre-existing
-rm -f /var/run/httpd/httpd.pid
-
-exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS
diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-error-document.conf
deleted file mode 100644
index ebabf87e4..000000000
--- a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-error-document.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#######################################
-# Faster error documents
-#######################################
-
- ErrorDocument 400 "400 Bad Request"
- ErrorDocument 401 "401 Unauthorized"
- ErrorDocument 403 "403 Forbidden"
- ErrorDocument 404 "404 Not Found"
- ErrorDocument 405 "405 Method Not Allowed"
-
- ErrorDocument 500 "500 Internal Server Error"
- ErrorDocument 501 "501 Not Implemented"
- ErrorDocument 502 "502 Bad Gateway"
- ErrorDocument 503 "503 Service Unavailable"
-
diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-log.conf
deleted file mode 100644
index 950e45105..000000000
--- a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-log.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog
-LogLevel warn
-CustomLog /docker.stdout dockerlog
-ErrorLog /docker.stderr
diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-php.conf
deleted file mode 100644
index cd62792e2..000000000
--- a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-php.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################
-# mod_proxy_fcgi
-# official solution
-# apache 2.4 and later
-#############################
-
-
- >
- ProxySet connectiontimeout=5 timeout=
-
-
-
- SetHandler "proxy:fcgi://"
-
-
-
-#############################
-# mod_fastcgi
-# apaache 2.2 and 2.4
-#############################
-
-
- AddHandler php-fcgi .php
- Action php-fcgi /php-fcgi
- Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi
- FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout
-
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
-
-
diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-server.conf
deleted file mode 100644
index 80b971734..000000000
--- a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-server.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Settings
-TimeOut 1000
-ServerName ""
-
-DirectoryIndex
-DocumentRoot ""
-
-">
- Options FollowSymLinks
- AllowOverride All
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/global.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/8.0-alpine/conf/etc/httpd/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/main.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/main.conf
deleted file mode 100644
index fb04614ca..000000000
--- a/docker/php-apache/8.0-alpine/conf/etc/httpd/main.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-Include /opt/docker/etc/httpd/global.conf
-Include /opt/docker/etc/httpd/php.conf
-
-
- Include /opt/docker/etc/httpd/conf.d/*.conf
-
-= 2.4>
- IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf
-
-Include /opt/docker/etc/httpd/vhost.conf
diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/php.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/8.0-alpine/conf/etc/httpd/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.conf
deleted file mode 100644
index 384696b4e..000000000
--- a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.conf
deleted file mode 100644
index c04a94318..000000000
--- a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#######################################
-# Vhost
-#######################################
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
-
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
- Include /opt/docker/etc/httpd/vhost.ssl.conf
-
diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.ssl.conf
deleted file mode 100644
index cf5fbc604..000000000
--- a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.ssl.conf
+++ /dev/null
@@ -1,26 +0,0 @@
- ############
- # SSL
- ############
-
- SSLEngine on
- SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt
- SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key
-
-
- SSLOptions +StdEnvVars
-
-
- SSLOptions +StdEnvVars
-
-
- BrowserMatch "MSIE [2-6]" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
- # MSIE 7 and newer should be able to use keepalive
- # This regexp is ok with 17-9!
- BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
- ## SSL Hardening
- SSLProtocol All -SSLv2 -SSLv3
- SSLHonorCipherOrder on
- SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'
diff --git a/docker/php-apache/8.0-alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.0-alpine/conf/etc/supervisor.d/apache.conf
deleted file mode 100644
index 12a6f86f7..000000000
--- a/docker/php-apache/8.0-alpine/conf/etc/supervisor.d/apache.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:apache]
-programs=apached
-priority=20
-
-[program:apached]
-command = /opt/docker/bin/service.d/httpd.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/10-apache.sh
deleted file mode 100644
index e9feb08b4..000000000
--- a/docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/10-apache.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-IMAGE_DISTRIBUTION=$(docker-image-info dist)
-IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version)
-IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g')
-
-# Collect environment variables
-case "$IMAGE_FAMILY" in
- Debian|Ubuntu)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf
- ;;
-
- RedHat)
- APACHE_MAIN_PATH=/etc/httpd/
- APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf
- ;;
-
- Alpine)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf
- ;;
-esac
-
-# Enable apache main config
-ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST"
-
-# Ensure /var/run/apache2 exists
-mkdir -p -- "/var/run/apache2"
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- mkdir -p -- "/run/apache2"
-fi
-
-# Maintain lock directory
-if [[ "$IMAGE_FAMILY" == "Debian" ]]; then
- mkdir -p -- "/var/lock/apache2"
- chmod 0750 -- "/var/lock/apache2"
- chown www-data:www-data -- "/var/lock/apache2"
-fi
-
-APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log')
-
-# Change log to Docker stdout
-go-replace --regex --regex-backrefs \
- -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \
- -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \
- --path="$APACHE_MAIN_PATH" \
- --path-regex='(.*\.conf|default.*|.*log)$'
-
-# Switch MPM to event
-if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -- /etc/httpd/conf.modules.d/00-mpm.conf
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \
- -- /etc/apache2/httpd.conf \
- /etc/apache2/conf.d/ssl.conf \
- /etc/apache2/conf.d/proxy.conf
-
- # Remove default vhost
- sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf
-fi
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/httpd/ssl
-find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index c8669ca25..000000000
--- a/docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
-
diff --git a/docker/php-apache/8.0-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.0-alpine/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/8.0-alpine/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.0-alpine/conf/provision/entrypoint.d/20-apache.sh
deleted file mode 100644
index 42ef48932..000000000
--- a/docker/php-apache/8.0-alpine/conf/provision/entrypoint.d/20-apache.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
-fi
diff --git a/docker/php-apache/8.0/Dockerfile b/docker/php-apache/8.0/Dockerfile
deleted file mode 100644
index 490718e17..000000000
--- a/docker/php-apache/8.0/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-apache:8.0
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:8.0
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install apache
- && apt-install \
- apache2 \
- && sed -ri ' \
- s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
- s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
- ' /etc/apache2/apache2.conf \
- && rm -f /etc/apache2/sites-enabled/* \
- && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-apache/8.0/Dockerfile.jinja2 b/docker/php-apache/8.0/Dockerfile.jinja2
deleted file mode 100644
index 8b5669e52..000000000
--- a/docker/php-apache/8.0/Dockerfile.jinja2
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ docker.from("php", "8.0") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ apache.debian9() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-apache/8.0/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.0/conf/bin/service.d/httpd.d/10-init.sh
deleted file mode 100644
index 4ef318a1e..000000000
--- a/docker/php-apache/8.0/conf/bin/service.d/httpd.d/10-init.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
-
diff --git a/docker/php-apache/8.0/conf/bin/service.d/httpd.sh b/docker/php-apache/8.0/conf/bin/service.d/httpd.sh
deleted file mode 100644
index 1d871e7ea..000000000
--- a/docker/php-apache/8.0/conf/bin/service.d/httpd.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/httpd.d/"
-
-# Apache gets grumpy about PID files pre-existing
-rm -f /var/run/apache2/apache2*.pid
-
-source /etc/apache2/envvars
-exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS
diff --git a/docker/php-apache/8.0/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.0/conf/etc/httpd/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-error-document.conf
deleted file mode 100644
index ebabf87e4..000000000
--- a/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-error-document.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#######################################
-# Faster error documents
-#######################################
-
- ErrorDocument 400 "400 Bad Request"
- ErrorDocument 401 "401 Unauthorized"
- ErrorDocument 403 "403 Forbidden"
- ErrorDocument 404 "404 Not Found"
- ErrorDocument 405 "405 Method Not Allowed"
-
- ErrorDocument 500 "500 Internal Server Error"
- ErrorDocument 501 "501 Not Implemented"
- ErrorDocument 502 "502 Bad Gateway"
- ErrorDocument 503 "503 Service Unavailable"
-
diff --git a/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-log.conf
deleted file mode 100644
index 950e45105..000000000
--- a/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-log.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog
-LogLevel warn
-CustomLog /docker.stdout dockerlog
-ErrorLog /docker.stderr
diff --git a/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-php.conf
deleted file mode 100644
index cd62792e2..000000000
--- a/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-php.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################
-# mod_proxy_fcgi
-# official solution
-# apache 2.4 and later
-#############################
-
-
- >
- ProxySet connectiontimeout=5 timeout=
-
-
-
- SetHandler "proxy:fcgi://"
-
-
-
-#############################
-# mod_fastcgi
-# apaache 2.2 and 2.4
-#############################
-
-
- AddHandler php-fcgi .php
- Action php-fcgi /php-fcgi
- Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi
- FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout
-
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
-
-
diff --git a/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-server.conf
deleted file mode 100644
index 80b971734..000000000
--- a/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-server.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Settings
-TimeOut 1000
-ServerName ""
-
-DirectoryIndex
-DocumentRoot ""
-
-">
- Options FollowSymLinks
- AllowOverride All
-
-
- Allow from all
-
- = 2.4>
- Require all granted
-
-
diff --git a/docker/php-apache/8.0/conf/etc/httpd/global.conf b/docker/php-apache/8.0/conf/etc/httpd/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/8.0/conf/etc/httpd/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/8.0/conf/etc/httpd/main.conf b/docker/php-apache/8.0/conf/etc/httpd/main.conf
deleted file mode 100644
index fb04614ca..000000000
--- a/docker/php-apache/8.0/conf/etc/httpd/main.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-Include /opt/docker/etc/httpd/global.conf
-Include /opt/docker/etc/httpd/php.conf
-
-
- Include /opt/docker/etc/httpd/conf.d/*.conf
-
-= 2.4>
- IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf
-
-Include /opt/docker/etc/httpd/vhost.conf
diff --git a/docker/php-apache/8.0/conf/etc/httpd/php.conf b/docker/php-apache/8.0/conf/etc/httpd/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-apache/8.0/conf/etc/httpd/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-apache/8.0/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.0/conf/etc/httpd/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-apache/8.0/conf/etc/httpd/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-apache/8.0/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.0/conf/etc/httpd/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-apache/8.0/conf/etc/httpd/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-apache/8.0/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.0/conf/etc/httpd/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-apache/8.0/conf/etc/httpd/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-apache/8.0/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.0/conf/etc/httpd/vhost.common.conf
deleted file mode 100644
index 384696b4e..000000000
--- a/docker/php-apache/8.0/conf/etc/httpd/vhost.common.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
diff --git a/docker/php-apache/8.0/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.0/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/8.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache/8.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache/8.0/conf/etc/httpd/vhost.conf b/docker/php-apache/8.0/conf/etc/httpd/vhost.conf
deleted file mode 100644
index c04a94318..000000000
--- a/docker/php-apache/8.0/conf/etc/httpd/vhost.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#######################################
-# Vhost
-#######################################
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
-
-
-
- ServerName docker.vm
- ServerAlias
- DocumentRoot ""
-
- UseCanonicalName Off
-
-
- Include /opt/docker/etc/httpd/vhost.common.d/*.conf
-
- = 2.4>
- IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf
-
-
- Include /opt/docker/etc/httpd/vhost.ssl.conf
-
diff --git a/docker/php-apache/8.0/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.0/conf/etc/httpd/vhost.ssl.conf
deleted file mode 100644
index cf5fbc604..000000000
--- a/docker/php-apache/8.0/conf/etc/httpd/vhost.ssl.conf
+++ /dev/null
@@ -1,26 +0,0 @@
- ############
- # SSL
- ############
-
- SSLEngine on
- SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt
- SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key
-
-
- SSLOptions +StdEnvVars
-
-
- SSLOptions +StdEnvVars
-
-
- BrowserMatch "MSIE [2-6]" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
- # MSIE 7 and newer should be able to use keepalive
- # This regexp is ok with 17-9!
- BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
- ## SSL Hardening
- SSLProtocol All -SSLv2 -SSLv3
- SSLHonorCipherOrder on
- SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'
diff --git a/docker/php-apache/8.0/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.0/conf/etc/supervisor.d/apache.conf
deleted file mode 100644
index 12a6f86f7..000000000
--- a/docker/php-apache/8.0/conf/etc/supervisor.d/apache.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:apache]
-programs=apached
-priority=20
-
-[program:apached]
-command = /opt/docker/bin/service.d/httpd.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-apache/8.0/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.0/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/8.0/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.0/conf/provision/bootstrap.d/10-apache.sh
deleted file mode 100644
index e9feb08b4..000000000
--- a/docker/php-apache/8.0/conf/provision/bootstrap.d/10-apache.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-IMAGE_DISTRIBUTION=$(docker-image-info dist)
-IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version)
-IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g')
-
-# Collect environment variables
-case "$IMAGE_FAMILY" in
- Debian|Ubuntu)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf
- ;;
-
- RedHat)
- APACHE_MAIN_PATH=/etc/httpd/
- APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf
- ;;
-
- Alpine)
- APACHE_MAIN_PATH=/etc/apache2/
- APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf
- ;;
-esac
-
-# Enable apache main config
-ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST"
-
-# Ensure /var/run/apache2 exists
-mkdir -p -- "/var/run/apache2"
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- mkdir -p -- "/run/apache2"
-fi
-
-# Maintain lock directory
-if [[ "$IMAGE_FAMILY" == "Debian" ]]; then
- mkdir -p -- "/var/lock/apache2"
- chmod 0750 -- "/var/lock/apache2"
- chown www-data:www-data -- "/var/lock/apache2"
-fi
-
-APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log')
-
-# Change log to Docker stdout
-go-replace --regex --regex-backrefs \
- -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \
- -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \
- --path="$APACHE_MAIN_PATH" \
- --path-regex='(.*\.conf|default.*|.*log)$'
-
-# Switch MPM to event
-if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -- /etc/httpd/conf.modules.d/00-mpm.conf
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then
- a2enmod mpm_event
-fi
-
-if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- go-replace --mode=line --regex --regex-backrefs \
- -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \
- -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \
- -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \
- -- /etc/apache2/httpd.conf \
- /etc/apache2/conf.d/ssl.conf \
- /etc/apache2/conf.d/proxy.conf
-
- # Remove default vhost
- sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf
-fi
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/httpd/ssl
-find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-apache/8.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.0/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index c8669ca25..000000000
--- a/docker/php-apache/8.0/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
-
diff --git a/docker/php-apache/8.0/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.0/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-apache/8.0/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.0/conf/provision/entrypoint.d/20-apache.sh
deleted file mode 100644
index 42ef48932..000000000
--- a/docker/php-apache/8.0/conf/provision/entrypoint.d/20-apache.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- --path=/opt/docker/etc/httpd/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf
-fi
diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile
deleted file mode 100644
index d50fc9119..000000000
--- a/docker/php-dev/5.6/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-dev:5.6
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:5.6
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug-2.5.5 \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-dev/5.6/Dockerfile.jinja2 b/docker/php-dev/5.6/Dockerfile.jinja2
deleted file mode 100644
index 2784a4e3c..000000000
--- a/docker/php-dev/5.6/Dockerfile.jinja2
+++ /dev/null
@@ -1,8 +0,0 @@
-{{ docker.from("php", "5.6") }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="5.6") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-dev/5.6/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/5.6/conf/bin/service.d/ssh.d/99-development.sh
deleted file mode 100644
index 2502ab3e3..000000000
--- a/docker/php-dev/5.6/conf/bin/service.d/ssh.d/99-development.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Allow root access via ssh
-go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config
diff --git a/docker/php-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-dev/5.6/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/5.6/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-dev/5.6/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/5.6/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/5.6/conf/provision/bootstrap.d/99-development.sh
deleted file mode 100644
index 7fc8cca55..000000000
--- a/docker/php-dev/5.6/conf/provision/bootstrap.d/99-development.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Set passwords to "dev"
-echo "$APPLICATION_USER":"dev" | chpasswd
-echo "root":"dev" | chpasswd
diff --git a/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile
deleted file mode 100644
index 50493be84..000000000
--- a/docker/php-dev/7.0/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-dev:7.0
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.0
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug-2.8.1 \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-dev/7.0/Dockerfile.jinja2 b/docker/php-dev/7.0/Dockerfile.jinja2
deleted file mode 100644
index d7a9901b7..000000000
--- a/docker/php-dev/7.0/Dockerfile.jinja2
+++ /dev/null
@@ -1,8 +0,0 @@
-{{ docker.from("php", "7.0") }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="7.0") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-dev/7.0/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.0/conf/bin/service.d/ssh.d/99-development.sh
deleted file mode 100644
index 2502ab3e3..000000000
--- a/docker/php-dev/7.0/conf/bin/service.d/ssh.d/99-development.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Allow root access via ssh
-go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config
diff --git a/docker/php-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-dev/7.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.0/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-dev/7.0/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.0/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.0/conf/provision/bootstrap.d/99-development.sh
deleted file mode 100644
index 7fc8cca55..000000000
--- a/docker/php-dev/7.0/conf/provision/bootstrap.d/99-development.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Set passwords to "dev"
-echo "$APPLICATION_USER":"dev" | chpasswd
-echo "root":"dev" | chpasswd
diff --git a/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/7.1-alpine/Dockerfile b/docker/php-dev/7.1-alpine/Dockerfile
deleted file mode 100644
index b4f890907..000000000
--- a/docker/php-dev/7.1-alpine/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-dev:7.1-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.1-alpine
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && apk-install \
- linux-headers \
- make \
- autoconf \
- g++ \
- && pecl install xdebug-2.8.1 \
- && apk del -f --purge \
- autoconf \
- linux-headers \
- g++ \
- make \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-dev/7.1-alpine/Dockerfile.jinja2 b/docker/php-dev/7.1-alpine/Dockerfile.jinja2
deleted file mode 100644
index 2e48ff0f9..000000000
--- a/docker/php-dev/7.1-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,8 +0,0 @@
-{{ docker.from("php", "7.1-alpine") }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopmentAlpine(version="7.1") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-dev/7.1-alpine/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.1-alpine/conf/bin/service.d/ssh.d/99-development.sh
deleted file mode 100644
index 2502ab3e3..000000000
--- a/docker/php-dev/7.1-alpine/conf/bin/service.d/ssh.d/99-development.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Allow root access via ssh
-go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config
diff --git a/docker/php-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/99-development.sh
deleted file mode 100644
index 7fc8cca55..000000000
--- a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/99-development.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Set passwords to "dev"
-echo "$APPLICATION_USER":"dev" | chpasswd
-echo "root":"dev" | chpasswd
diff --git a/docker/php-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile
deleted file mode 100644
index a61271bba..000000000
--- a/docker/php-dev/7.1/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-dev:7.1
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.1
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug-2.8.1 \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-dev/7.1/Dockerfile.jinja2 b/docker/php-dev/7.1/Dockerfile.jinja2
deleted file mode 100644
index 86f846804..000000000
--- a/docker/php-dev/7.1/Dockerfile.jinja2
+++ /dev/null
@@ -1,8 +0,0 @@
-{{ docker.from("php", "7.1") }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="7.1") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-dev/7.1/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.1/conf/bin/service.d/ssh.d/99-development.sh
deleted file mode 100644
index 2502ab3e3..000000000
--- a/docker/php-dev/7.1/conf/bin/service.d/ssh.d/99-development.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Allow root access via ssh
-go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config
diff --git a/docker/php-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-dev/7.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.1/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-dev/7.1/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.1/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.1/conf/provision/bootstrap.d/99-development.sh
deleted file mode 100644
index 7fc8cca55..000000000
--- a/docker/php-dev/7.1/conf/provision/bootstrap.d/99-development.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Set passwords to "dev"
-echo "$APPLICATION_USER":"dev" | chpasswd
-echo "root":"dev" | chpasswd
diff --git a/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/7.2-alpine/Dockerfile b/docker/php-dev/7.2-alpine/Dockerfile
deleted file mode 100644
index bf657a0ec..000000000
--- a/docker/php-dev/7.2-alpine/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-dev:7.2-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.2-alpine
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && apk-install \
- linux-headers \
- make \
- autoconf \
- g++ \
- && pecl install xdebug \
- && apk del -f --purge \
- autoconf \
- linux-headers \
- g++ \
- make \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-dev/7.2-alpine/Dockerfile.jinja2 b/docker/php-dev/7.2-alpine/Dockerfile.jinja2
deleted file mode 100644
index 7fd85c2c1..000000000
--- a/docker/php-dev/7.2-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,8 +0,0 @@
-{{ docker.from("php", "7.2-alpine") }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopmentAlpine(version="7.2") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-dev/7.2-alpine/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.2-alpine/conf/bin/service.d/ssh.d/99-development.sh
deleted file mode 100644
index 2502ab3e3..000000000
--- a/docker/php-dev/7.2-alpine/conf/bin/service.d/ssh.d/99-development.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Allow root access via ssh
-go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config
diff --git a/docker/php-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/99-development.sh
deleted file mode 100644
index 7fc8cca55..000000000
--- a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/99-development.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Set passwords to "dev"
-echo "$APPLICATION_USER":"dev" | chpasswd
-echo "root":"dev" | chpasswd
diff --git a/docker/php-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/7.2/Dockerfile b/docker/php-dev/7.2/Dockerfile
deleted file mode 100644
index 3f314262b..000000000
--- a/docker/php-dev/7.2/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-dev:7.2
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.2
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-dev/7.2/Dockerfile.jinja2 b/docker/php-dev/7.2/Dockerfile.jinja2
deleted file mode 100644
index 7a89a2e2a..000000000
--- a/docker/php-dev/7.2/Dockerfile.jinja2
+++ /dev/null
@@ -1,8 +0,0 @@
-{{ docker.from("php", "7.2") }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="7.2") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/7.2/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.2/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-dev/7.2/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-dev/7.2/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.2/conf/bin/service.d/ssh.d/99-development.sh
deleted file mode 100644
index 2502ab3e3..000000000
--- a/docker/php-dev/7.2/conf/bin/service.d/ssh.d/99-development.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Allow root access via ssh
-go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config
diff --git a/docker/php-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-dev/7.2/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.2/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-dev/7.2/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.2/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.2/conf/provision/bootstrap.d/99-development.sh
deleted file mode 100644
index 7fc8cca55..000000000
--- a/docker/php-dev/7.2/conf/provision/bootstrap.d/99-development.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Set passwords to "dev"
-echo "$APPLICATION_USER":"dev" | chpasswd
-echo "root":"dev" | chpasswd
diff --git a/docker/php-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/7.3-alpine/Dockerfile b/docker/php-dev/7.3-alpine/Dockerfile
deleted file mode 100644
index 18c274d7f..000000000
--- a/docker/php-dev/7.3-alpine/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-dev:7.3-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.3-alpine
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && apk-install \
- linux-headers \
- make \
- autoconf \
- g++ \
- && pecl install xdebug \
- && apk del -f --purge \
- autoconf \
- linux-headers \
- g++ \
- make \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-dev/7.3-alpine/Dockerfile.jinja2 b/docker/php-dev/7.3-alpine/Dockerfile.jinja2
deleted file mode 100644
index c67e711c0..000000000
--- a/docker/php-dev/7.3-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,8 +0,0 @@
-{{ docker.from("php", "7.3-alpine") }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopmentAlpine(version="7.3") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-dev/7.3-alpine/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.3-alpine/conf/bin/service.d/ssh.d/99-development.sh
deleted file mode 100644
index 2502ab3e3..000000000
--- a/docker/php-dev/7.3-alpine/conf/bin/service.d/ssh.d/99-development.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Allow root access via ssh
-go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config
diff --git a/docker/php-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/99-development.sh
deleted file mode 100644
index 7fc8cca55..000000000
--- a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/99-development.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Set passwords to "dev"
-echo "$APPLICATION_USER":"dev" | chpasswd
-echo "root":"dev" | chpasswd
diff --git a/docker/php-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/7.3/Dockerfile b/docker/php-dev/7.3/Dockerfile
deleted file mode 100644
index f979076ae..000000000
--- a/docker/php-dev/7.3/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-dev:7.3
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.3
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-dev/7.3/Dockerfile.jinja2 b/docker/php-dev/7.3/Dockerfile.jinja2
deleted file mode 100644
index 54a1dcc8c..000000000
--- a/docker/php-dev/7.3/Dockerfile.jinja2
+++ /dev/null
@@ -1,8 +0,0 @@
-{{ docker.from("php", "7.3") }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="7.3") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/7.3/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.3/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-dev/7.3/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-dev/7.3/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.3/conf/bin/service.d/ssh.d/99-development.sh
deleted file mode 100644
index 2502ab3e3..000000000
--- a/docker/php-dev/7.3/conf/bin/service.d/ssh.d/99-development.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Allow root access via ssh
-go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config
diff --git a/docker/php-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-dev/7.3/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.3/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-dev/7.3/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.3/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.3/conf/provision/bootstrap.d/99-development.sh
deleted file mode 100644
index 7fc8cca55..000000000
--- a/docker/php-dev/7.3/conf/provision/bootstrap.d/99-development.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Set passwords to "dev"
-echo "$APPLICATION_USER":"dev" | chpasswd
-echo "root":"dev" | chpasswd
diff --git a/docker/php-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/7.4-alpine/Dockerfile b/docker/php-dev/7.4-alpine/Dockerfile
deleted file mode 100644
index 5ace59447..000000000
--- a/docker/php-dev/7.4-alpine/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-dev:7.4-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.4-alpine
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && apk-install \
- linux-headers \
- make \
- autoconf \
- g++ \
- && pecl install xdebug-3.1.6 \
- && apk del -f --purge \
- autoconf \
- linux-headers \
- g++ \
- make \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-dev/7.4-alpine/Dockerfile.jinja2 b/docker/php-dev/7.4-alpine/Dockerfile.jinja2
deleted file mode 100644
index 9724ff1e6..000000000
--- a/docker/php-dev/7.4-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,8 +0,0 @@
-{{ docker.from("php", "7.4-alpine") }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopmentAlpine(version="7.4") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-dev/7.4-alpine/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.4-alpine/conf/bin/service.d/ssh.d/99-development.sh
deleted file mode 100644
index 2502ab3e3..000000000
--- a/docker/php-dev/7.4-alpine/conf/bin/service.d/ssh.d/99-development.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Allow root access via ssh
-go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config
diff --git a/docker/php-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/99-development.sh
deleted file mode 100644
index 7fc8cca55..000000000
--- a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/99-development.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Set passwords to "dev"
-echo "$APPLICATION_USER":"dev" | chpasswd
-echo "root":"dev" | chpasswd
diff --git a/docker/php-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/7.4/Dockerfile b/docker/php-dev/7.4/Dockerfile
deleted file mode 100644
index de0af30b1..000000000
--- a/docker/php-dev/7.4/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-dev:7.4
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.4
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug-3.1.6 \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-dev/7.4/Dockerfile.jinja2 b/docker/php-dev/7.4/Dockerfile.jinja2
deleted file mode 100644
index c7a70850b..000000000
--- a/docker/php-dev/7.4/Dockerfile.jinja2
+++ /dev/null
@@ -1,8 +0,0 @@
-{{ docker.from("php", "7.4") }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="7.4") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/7.4/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.4/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-dev/7.4/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-dev/7.4/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.4/conf/bin/service.d/ssh.d/99-development.sh
deleted file mode 100644
index 2502ab3e3..000000000
--- a/docker/php-dev/7.4/conf/bin/service.d/ssh.d/99-development.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Allow root access via ssh
-go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config
diff --git a/docker/php-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-dev/7.4/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.4/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-dev/7.4/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/7.4/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.4/conf/provision/bootstrap.d/99-development.sh
deleted file mode 100644
index 7fc8cca55..000000000
--- a/docker/php-dev/7.4/conf/provision/bootstrap.d/99-development.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Set passwords to "dev"
-echo "$APPLICATION_USER":"dev" | chpasswd
-echo "root":"dev" | chpasswd
diff --git a/docker/php-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile
deleted file mode 100644
index efdabcf39..000000000
--- a/docker/php-dev/8.0-alpine/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-dev:8.0-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:8.0-alpine
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && apk-install \
- linux-headers \
- make \
- autoconf \
- g++ \
- && pecl install xdebug \
- && apk del -f --purge \
- autoconf \
- linux-headers \
- g++ \
- make \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap
diff --git a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-dev/8.0-alpine/Dockerfile.jinja2
deleted file mode 100644
index b46bc25ec..000000000
--- a/docker/php-dev/8.0-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,7 +0,0 @@
-{{ docker.from("php", "8.0-alpine") }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopmentAlpine(version="8.0") }} \
- {{ provision.runBootstrap() }}
diff --git a/docker/php-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-dev/8.0-alpine/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.0-alpine/conf/bin/service.d/ssh.d/99-development.sh
deleted file mode 100644
index 2502ab3e3..000000000
--- a/docker/php-dev/8.0-alpine/conf/bin/service.d/ssh.d/99-development.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Allow root access via ssh
-go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config
diff --git a/docker/php-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/99-development.sh
deleted file mode 100644
index 7fc8cca55..000000000
--- a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/99-development.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Set passwords to "dev"
-echo "$APPLICATION_USER":"dev" | chpasswd
-echo "root":"dev" | chpasswd
diff --git a/docker/php-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/8.0/Dockerfile b/docker/php-dev/8.0/Dockerfile
deleted file mode 100644
index 8b5b7b7b1..000000000
--- a/docker/php-dev/8.0/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-dev:8.0
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:8.0
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-dev/8.0/Dockerfile.jinja2 b/docker/php-dev/8.0/Dockerfile.jinja2
deleted file mode 100644
index f4c82a53c..000000000
--- a/docker/php-dev/8.0/Dockerfile.jinja2
+++ /dev/null
@@ -1,8 +0,0 @@
-{{ docker.from("php", "8.0") }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="8.0") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/8.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.0/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-dev/8.0/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-dev/8.0/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.0/conf/bin/service.d/ssh.d/99-development.sh
deleted file mode 100644
index 2502ab3e3..000000000
--- a/docker/php-dev/8.0/conf/bin/service.d/ssh.d/99-development.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Allow root access via ssh
-go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config
diff --git a/docker/php-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-dev/8.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.0/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-dev/8.0/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-dev/8.0/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.0/conf/provision/bootstrap.d/99-development.sh
deleted file mode 100644
index 7fc8cca55..000000000
--- a/docker/php-dev/8.0/conf/provision/bootstrap.d/99-development.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Set passwords to "dev"
-echo "$APPLICATION_USER":"dev" | chpasswd
-echo "root":"dev" | chpasswd
diff --git a/docker/php-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/8.5-alpine/Dockerfile b/docker/php-dev/8.5-alpine/Dockerfile
index dd401c67c..b6c94d659 100644
--- a/docker/php-dev/8.5-alpine/Dockerfile
+++ b/docker/php-dev/8.5-alpine/Dockerfile
@@ -16,10 +16,7 @@ RUN set -x \
make \
autoconf \
g++ \
- && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
- && chmod +x /usr/local/bin/pie \
- && pie install xdebug/xdebug:^3.5.0@alpha \
- && rm -f /usr/local/bin/pie \
+ && pecl install xdebug \
&& apk del -f --purge \
autoconf \
linux-headers \
diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile
deleted file mode 100644
index f3ebc15a0..000000000
--- a/docker/php-nginx-dev/5.6/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx-dev:5.6
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-nginx:5.6
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug-2.5.5 \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-nginx-dev/5.6/Dockerfile.jinja2 b/docker/php-nginx-dev/5.6/Dockerfile.jinja2
deleted file mode 100644
index ab94282f7..000000000
--- a/docker/php-nginx-dev/5.6/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-nginx", "5.6") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="5.6") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index 4f80ec9d3..000000000
--- a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-location ~* {
- expires off;
- add_header Cache-Control private;
-
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index a2cd929e7..000000000
--- a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr info;
diff --git a/docker/php-nginx-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-nginx-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index b6100c8f1..000000000
--- a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable sendfile for nginx (eg. nfs usage)
-go-replace --mode=lineinfile --regex \
- -s '^[\s#]*(sendfile)' -r 'sendfile off;' \
- -- /etc/nginx/nginx.conf
diff --git a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/20-nginx-dev.sh
deleted file mode 100644
index f4695f059..000000000
--- a/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/20-nginx-dev.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-go-replace \
- -s "" \
- -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
diff --git a/docker/php-nginx-dev/7.0/Dockerfile b/docker/php-nginx-dev/7.0/Dockerfile
deleted file mode 100644
index b8b261614..000000000
--- a/docker/php-nginx-dev/7.0/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx-dev:7.0
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-nginx:7.0
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug-2.8.1 \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-nginx-dev/7.0/Dockerfile.jinja2 b/docker/php-nginx-dev/7.0/Dockerfile.jinja2
deleted file mode 100644
index 0594efaf9..000000000
--- a/docker/php-nginx-dev/7.0/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-nginx", "7.0") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="7.0") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index 4f80ec9d3..000000000
--- a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-location ~* {
- expires off;
- add_header Cache-Control private;
-
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index a2cd929e7..000000000
--- a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr info;
diff --git a/docker/php-nginx-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-nginx-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index b6100c8f1..000000000
--- a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable sendfile for nginx (eg. nfs usage)
-go-replace --mode=lineinfile --regex \
- -s '^[\s#]*(sendfile)' -r 'sendfile off;' \
- -- /etc/nginx/nginx.conf
diff --git a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/20-nginx-dev.sh
deleted file mode 100644
index f4695f059..000000000
--- a/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/20-nginx-dev.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-go-replace \
- -s "" \
- -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
diff --git a/docker/php-nginx-dev/7.1-alpine/Dockerfile b/docker/php-nginx-dev/7.1-alpine/Dockerfile
deleted file mode 100644
index 7bd194c90..000000000
--- a/docker/php-nginx-dev/7.1-alpine/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx-dev:7.1-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-nginx:7.1-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && apk-install \
- linux-headers \
- make \
- autoconf \
- g++ \
- && pecl install xdebug-2.8.1 \
- && apk del -f --purge \
- autoconf \
- linux-headers \
- g++ \
- make \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-nginx-dev/7.1-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/7.1-alpine/Dockerfile.jinja2
deleted file mode 100644
index 150eb99f9..000000000
--- a/docker/php-nginx-dev/7.1-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-nginx", "7.1-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopmentAlpine(version="7.1") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-nginx-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-nginx-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index 4f80ec9d3..000000000
--- a/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-location ~* {
- expires off;
- add_header Cache-Control private;
-
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index a2cd929e7..000000000
--- a/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr info;
diff --git a/docker/php-nginx-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-nginx-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index b6100c8f1..000000000
--- a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable sendfile for nginx (eg. nfs usage)
-go-replace --mode=lineinfile --regex \
- -s '^[\s#]*(sendfile)' -r 'sendfile off;' \
- -- /etc/nginx/nginx.conf
diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh
deleted file mode 100644
index f4695f059..000000000
--- a/docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-go-replace \
- -s "" \
- -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
diff --git a/docker/php-nginx-dev/7.1/Dockerfile b/docker/php-nginx-dev/7.1/Dockerfile
deleted file mode 100644
index 2d2fa13aa..000000000
--- a/docker/php-nginx-dev/7.1/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx-dev:7.1
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-nginx:7.1
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug-2.8.1 \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-nginx-dev/7.1/Dockerfile.jinja2 b/docker/php-nginx-dev/7.1/Dockerfile.jinja2
deleted file mode 100644
index ad48cc80c..000000000
--- a/docker/php-nginx-dev/7.1/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-nginx", "7.1") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="7.1") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index 4f80ec9d3..000000000
--- a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-location ~* {
- expires off;
- add_header Cache-Control private;
-
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index a2cd929e7..000000000
--- a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr info;
diff --git a/docker/php-nginx-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-nginx-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index b6100c8f1..000000000
--- a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable sendfile for nginx (eg. nfs usage)
-go-replace --mode=lineinfile --regex \
- -s '^[\s#]*(sendfile)' -r 'sendfile off;' \
- -- /etc/nginx/nginx.conf
diff --git a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/20-nginx-dev.sh
deleted file mode 100644
index f4695f059..000000000
--- a/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/20-nginx-dev.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-go-replace \
- -s "" \
- -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
diff --git a/docker/php-nginx-dev/7.2-alpine/Dockerfile b/docker/php-nginx-dev/7.2-alpine/Dockerfile
deleted file mode 100644
index 8c95f8456..000000000
--- a/docker/php-nginx-dev/7.2-alpine/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx-dev:7.2-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-nginx:7.2-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && apk-install \
- linux-headers \
- make \
- autoconf \
- g++ \
- && pecl install xdebug \
- && apk del -f --purge \
- autoconf \
- linux-headers \
- g++ \
- make \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-nginx-dev/7.2-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/7.2-alpine/Dockerfile.jinja2
deleted file mode 100644
index 1d7722c61..000000000
--- a/docker/php-nginx-dev/7.2-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-nginx", "7.2-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopmentAlpine(version="7.2") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-nginx-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-nginx-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index 4f80ec9d3..000000000
--- a/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-location ~* {
- expires off;
- add_header Cache-Control private;
-
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index a2cd929e7..000000000
--- a/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr info;
diff --git a/docker/php-nginx-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-nginx-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index b6100c8f1..000000000
--- a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable sendfile for nginx (eg. nfs usage)
-go-replace --mode=lineinfile --regex \
- -s '^[\s#]*(sendfile)' -r 'sendfile off;' \
- -- /etc/nginx/nginx.conf
diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh
deleted file mode 100644
index f4695f059..000000000
--- a/docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-go-replace \
- -s "" \
- -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
diff --git a/docker/php-nginx-dev/7.2/Dockerfile b/docker/php-nginx-dev/7.2/Dockerfile
deleted file mode 100644
index 243e76c8d..000000000
--- a/docker/php-nginx-dev/7.2/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx-dev:7.2
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-nginx:7.2
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-nginx-dev/7.2/Dockerfile.jinja2 b/docker/php-nginx-dev/7.2/Dockerfile.jinja2
deleted file mode 100644
index 70534778c..000000000
--- a/docker/php-nginx-dev/7.2/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-nginx", "7.2") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="7.2") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-nginx-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.2/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.2/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-nginx-dev/7.2/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-nginx-dev/7.2/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.2/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.2/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index 4f80ec9d3..000000000
--- a/docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-location ~* {
- expires off;
- add_header Cache-Control private;
-
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index a2cd929e7..000000000
--- a/docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr info;
diff --git a/docker/php-nginx-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-nginx-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index b6100c8f1..000000000
--- a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable sendfile for nginx (eg. nfs usage)
-go-replace --mode=lineinfile --regex \
- -s '^[\s#]*(sendfile)' -r 'sendfile off;' \
- -- /etc/nginx/nginx.conf
diff --git a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/20-nginx-dev.sh
deleted file mode 100644
index f4695f059..000000000
--- a/docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/20-nginx-dev.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-go-replace \
- -s "" \
- -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
diff --git a/docker/php-nginx-dev/7.3-alpine/Dockerfile b/docker/php-nginx-dev/7.3-alpine/Dockerfile
deleted file mode 100644
index 8cc518281..000000000
--- a/docker/php-nginx-dev/7.3-alpine/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx-dev:7.3-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-nginx:7.3-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && apk-install \
- linux-headers \
- make \
- autoconf \
- g++ \
- && pecl install xdebug \
- && apk del -f --purge \
- autoconf \
- linux-headers \
- g++ \
- make \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-nginx-dev/7.3-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/7.3-alpine/Dockerfile.jinja2
deleted file mode 100644
index 3192db11a..000000000
--- a/docker/php-nginx-dev/7.3-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-nginx", "7.3-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopmentAlpine(version="7.3") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-nginx-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-nginx-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index 4f80ec9d3..000000000
--- a/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-location ~* {
- expires off;
- add_header Cache-Control private;
-
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index a2cd929e7..000000000
--- a/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr info;
diff --git a/docker/php-nginx-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-nginx-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index b6100c8f1..000000000
--- a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable sendfile for nginx (eg. nfs usage)
-go-replace --mode=lineinfile --regex \
- -s '^[\s#]*(sendfile)' -r 'sendfile off;' \
- -- /etc/nginx/nginx.conf
diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh
deleted file mode 100644
index f4695f059..000000000
--- a/docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-go-replace \
- -s "" \
- -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
diff --git a/docker/php-nginx-dev/7.3/Dockerfile b/docker/php-nginx-dev/7.3/Dockerfile
deleted file mode 100644
index ea30f1500..000000000
--- a/docker/php-nginx-dev/7.3/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx-dev:7.3
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-nginx:7.3
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-nginx-dev/7.3/Dockerfile.jinja2 b/docker/php-nginx-dev/7.3/Dockerfile.jinja2
deleted file mode 100644
index 014aa1162..000000000
--- a/docker/php-nginx-dev/7.3/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-nginx", "7.3") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="7.3") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-nginx-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.3/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.3/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-nginx-dev/7.3/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-nginx-dev/7.3/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.3/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.3/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index 4f80ec9d3..000000000
--- a/docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-location ~* {
- expires off;
- add_header Cache-Control private;
-
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index a2cd929e7..000000000
--- a/docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr info;
diff --git a/docker/php-nginx-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-nginx-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index b6100c8f1..000000000
--- a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable sendfile for nginx (eg. nfs usage)
-go-replace --mode=lineinfile --regex \
- -s '^[\s#]*(sendfile)' -r 'sendfile off;' \
- -- /etc/nginx/nginx.conf
diff --git a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/20-nginx-dev.sh
deleted file mode 100644
index f4695f059..000000000
--- a/docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/20-nginx-dev.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-go-replace \
- -s "" \
- -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
diff --git a/docker/php-nginx-dev/7.4-alpine/Dockerfile b/docker/php-nginx-dev/7.4-alpine/Dockerfile
deleted file mode 100644
index 34dcb6570..000000000
--- a/docker/php-nginx-dev/7.4-alpine/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx-dev:7.4-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-nginx:7.4-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && apk-install \
- linux-headers \
- make \
- autoconf \
- g++ \
- && pecl install xdebug-3.1.6 \
- && apk del -f --purge \
- autoconf \
- linux-headers \
- g++ \
- make \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-nginx-dev/7.4-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/7.4-alpine/Dockerfile.jinja2
deleted file mode 100644
index 18cd03bed..000000000
--- a/docker/php-nginx-dev/7.4-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-nginx", "7.4-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopmentAlpine(version="7.4") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-nginx-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-nginx-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index 4f80ec9d3..000000000
--- a/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-location ~* {
- expires off;
- add_header Cache-Control private;
-
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index a2cd929e7..000000000
--- a/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr info;
diff --git a/docker/php-nginx-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-nginx-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index b6100c8f1..000000000
--- a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable sendfile for nginx (eg. nfs usage)
-go-replace --mode=lineinfile --regex \
- -s '^[\s#]*(sendfile)' -r 'sendfile off;' \
- -- /etc/nginx/nginx.conf
diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh
deleted file mode 100644
index f4695f059..000000000
--- a/docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-go-replace \
- -s "" \
- -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
diff --git a/docker/php-nginx-dev/7.4/Dockerfile b/docker/php-nginx-dev/7.4/Dockerfile
deleted file mode 100644
index f4f2395e5..000000000
--- a/docker/php-nginx-dev/7.4/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx-dev:7.4
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-nginx:7.4
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug-3.1.6 \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-nginx-dev/7.4/Dockerfile.jinja2 b/docker/php-nginx-dev/7.4/Dockerfile.jinja2
deleted file mode 100644
index ef32fba4e..000000000
--- a/docker/php-nginx-dev/7.4/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-nginx", "7.4") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="7.4") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-nginx-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.4/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.4/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-nginx-dev/7.4/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-nginx-dev/7.4/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.4/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/7.4/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index 4f80ec9d3..000000000
--- a/docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-location ~* {
- expires off;
- add_header Cache-Control private;
-
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index a2cd929e7..000000000
--- a/docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr info;
diff --git a/docker/php-nginx-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-nginx-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index b6100c8f1..000000000
--- a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable sendfile for nginx (eg. nfs usage)
-go-replace --mode=lineinfile --regex \
- -s '^[\s#]*(sendfile)' -r 'sendfile off;' \
- -- /etc/nginx/nginx.conf
diff --git a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/20-nginx-dev.sh
deleted file mode 100644
index f4695f059..000000000
--- a/docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/20-nginx-dev.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-go-replace \
- -s "" \
- -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile
deleted file mode 100644
index baa6de93a..000000000
--- a/docker/php-nginx-dev/8.0-alpine/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx-dev:8.0-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-nginx:8.0-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && apk-install \
- linux-headers \
- make \
- autoconf \
- g++ \
- && pecl install xdebug \
- && apk del -f --purge \
- autoconf \
- linux-headers \
- g++ \
- make \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap
diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2
deleted file mode 100644
index 42ca8087f..000000000
--- a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,11 +0,0 @@
-{{ docker.from("php-nginx", "8.0-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopmentAlpine(version="8.0") }} \
- {{ provision.runBootstrap() }}
diff --git a/docker/php-nginx-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-nginx-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index 4f80ec9d3..000000000
--- a/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-location ~* {
- expires off;
- add_header Cache-Control private;
-
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index a2cd929e7..000000000
--- a/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr info;
diff --git a/docker/php-nginx-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-nginx-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index b6100c8f1..000000000
--- a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable sendfile for nginx (eg. nfs usage)
-go-replace --mode=lineinfile --regex \
- -s '^[\s#]*(sendfile)' -r 'sendfile off;' \
- -- /etc/nginx/nginx.conf
diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh
deleted file mode 100644
index f4695f059..000000000
--- a/docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-go-replace \
- -s "" \
- -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
diff --git a/docker/php-nginx-dev/8.0/Dockerfile b/docker/php-nginx-dev/8.0/Dockerfile
deleted file mode 100644
index fb86aaae0..000000000
--- a/docker/php-nginx-dev/8.0/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx-dev:8.0
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php-nginx:8.0
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install development environment
- && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \
- && blackfire php:install \
- && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \
- && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \
- && apt-install tideways-php tideways-daemon \
- && pecl install xdebug \
- && docker-php-ext-enable xdebug \
- # Enable php development services
- && docker-service enable syslog \
- && docker-service enable postfix \
- && docker-service enable ssh \
- && docker-run-bootstrap \
- && docker-image-cleanup
diff --git a/docker/php-nginx-dev/8.0/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0/Dockerfile.jinja2
deleted file mode 100644
index 3ca36395d..000000000
--- a/docker/php-nginx-dev/8.0/Dockerfile.jinja2
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ docker.from("php-nginx", "8.0") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.webDevelopment() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ php.officialDevelopment(version="8.0") }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
diff --git a/docker/php-nginx-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/8.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.0/conf/bin/service.d/blackfire-agent.sh
deleted file mode 100644
index 95daa01ae..000000000
--- a/docker/php-nginx-dev/8.0/conf/bin/service.d/blackfire-agent.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-BLACKFIRE_ARGS=""
-
-includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/"
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\""
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
- BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
-fi
-
-# create directory for unix socket
-mkdir -p /var/run/blackfire
-
-eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS
diff --git a/docker/php-nginx-dev/8.0/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.0/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-nginx-dev/8.0/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index 4f80ec9d3..000000000
--- a/docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-location ~* {
- expires off;
- add_header Cache-Control private;
-
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index a2cd929e7..000000000
--- a/docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr info;
diff --git a/docker/php-nginx-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf
deleted file mode 100644
index 897831ddb..000000000
--- a/docker/php-nginx-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:blackfire-agent]
-programs=blackfire-agentd
-priority=25
-
-[program:blackfire-agentd]
-command = /opt/docker/bin/service.d/blackfire-agent.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = false
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index b6100c8f1..000000000
--- a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable sendfile for nginx (eg. nfs usage)
-go-replace --mode=lineinfile --regex \
- -s '^[\s#]*(sendfile)' -r 'sendfile off;' \
- -- /etc/nginx/nginx.conf
diff --git a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 852567f85..000000000
--- a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1)
-
-# Configure php-fpm
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf
-
-if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then
- # listen on public IPv4 port
- # no ipv6 sockets available for old php version
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-else
- # listen on public IPv6 port
- go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
- -- /opt/docker/etc/php/fpm/pool.d/application.conf \
- /opt/docker/etc/php/fpm/php-fpm.conf
-
-fi
diff --git a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh
deleted file mode 100644
index f4ea7f72e..000000000
--- a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Disable blackfire by default
-rm -f \
- /etc/php5/cli/conf.d/zz-blackfire.ini \
- /etc/php5/fpm/conf.d/zz-blackfire.ini
diff --git a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh
deleted file mode 100644
index 079e59fdf..000000000
--- a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Configure opcache for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \
- -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \
- -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \
- -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \
- -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \
- -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh
deleted file mode 100644
index e76310003..000000000
--- a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-case "$IMAGE_FAMILY" in
- Alpine)
- # Fix php xdebug module [Alpine family]
-
- if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php5/conf.d/xdebug.ini
- fi
-
- if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
- go-replace --mode=lineinfile \
- -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
- /etc/php7/conf.d/xdebug.ini
- fi
-
- ;;
-esac
-
-# Configure xdebug for development
-go-replace --mode=lineinfile --regex \
- -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
- -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \
- -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \
- -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \
- -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \
- -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \
- -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \
- -- /opt/docker/etc/php/php.webdevops.ini
diff --git a/docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh
deleted file mode 100644
index 7b392587c..000000000
--- a/docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-
-#################################################
-# Debugger switch
-#################################################
-
-PHP_CONF_PATHS="
-/etc/php5/conf.d
-/etc/php7/conf.d
-/etc/php.d
-/etc/php5/mods-available
-/etc/php5/cli/conf.d
-/etc/php5/cli/conf.d
-/etc/php5/fpm/conf.d
-/etc/php5/fpm/conf.d
-/etc/php/7.0/mods-available
-/etc/php/7.1/mods-available
-/etc/php/7.2/mods-available
-/etc/php/7.3/mods-available
-/etc/php/7.4/mods-available
-/etc/php/7.0/cli/conf.d
-/etc/php/7.1/cli/conf.d
-/etc/php/7.2/cli/conf.d
-/etc/php/7.3/cli/conf.d
-/etc/php/7.4/cli/conf.d
-/etc/php/7.0/fpm/conf.d
-/etc/php/7.1/fpm/conf.d
-/etc/php/7.2/fpm/conf.d
-/etc/php/7.3/fpm/conf.d
-/etc/php/7.4/fpm/conf.d
-/usr/local/etc/php/conf.d/"
-
-function phpModuleRemove() {
- if [ "$#" -ne 1 ]; then
- echo "You must specify the name of the PHP module which you want to disable"
- exit 1
- fi
-
- echo " - Removing PHP module ${1}"
- for CONF_PATH in $PHP_CONF_PATHS; do
- rm -f "${CONF_PATH}"/*"${1}".ini
- done
-}
-
-
-if [[ -n "${PHP_DEBUGGER+x}" ]]; then
- case "$PHP_DEBUGGER" in
- xdebug)
- echo "PHP-Debugger: Xdebug enabled"
- phpModuleRemove "blackfire"
- ;;
-
- blackfire)
- echo "PHP-Debugger: Blackfire enabled"
- phpModuleRemove "xdebug"
- docker-service-enable blackfire-agent
- ;;
-
- none)
- echo "PHP-Debugger: none"
- phpModuleRemove "blackfire"
- phpModuleRemove "xdebug"
- ;;
- esac
-
-else
-
- echo "PHP-Debugger: not specified - default is xdebug"
- phpModuleRemove "blackfire"
-
-fi
-
-#################################################
-# PHP debugger environment variables
-#################################################
-
-function phpEnvironmentVariable() {
- PHP_INI_KEY="$1"
- PHP_ENV_NAME="$2"
-
- if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
- PHP_ENV_VALUE="${!PHP_ENV_NAME}"
- echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
- fi
-}
-
-###################
-# XDEBUG
-###################
-
-# xdebug3 remote debugger
-phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE"
-phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST"
-phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST"
-phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT"
-
-# xdebug3 profiler
-phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE"
-phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR"
-
-###################
-# BLACKFIRE
-###################
-phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID"
-phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/20-nginx-dev.sh
deleted file mode 100644
index f4695f059..000000000
--- a/docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/20-nginx-dev.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-go-replace \
- -s "" \
- -r "$WEB_NO_CACHE_PATTERN" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
diff --git a/docker/php-nginx-dev/8.5-alpine/Dockerfile b/docker/php-nginx-dev/8.5-alpine/Dockerfile
index ba94eeecf..c10f3d35b 100644
--- a/docker/php-nginx-dev/8.5-alpine/Dockerfile
+++ b/docker/php-nginx-dev/8.5-alpine/Dockerfile
@@ -24,10 +24,7 @@ RUN set -x \
make \
autoconf \
g++ \
- && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \
- && chmod +x /usr/local/bin/pie \
- && pie install xdebug/xdebug:^3.5.0@alpha \
- && rm -f /usr/local/bin/pie \
+ && pecl install xdebug \
&& apk del -f --purge \
autoconf \
linux-headers \
diff --git a/docker/php-nginx/5.6/Dockerfile b/docker/php-nginx/5.6/Dockerfile
deleted file mode 100644
index ef79e5347..000000000
--- a/docker/php-nginx/5.6/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx:5.6
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:5.6
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install nginx
- && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
- >> /etc/apt/sources.list \
- && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
- && apt-install \
- nginx \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-nginx/5.6/Dockerfile.jinja2 b/docker/php-nginx/5.6/Dockerfile.jinja2
deleted file mode 100644
index 0093f5432..000000000
--- a/docker/php-nginx/5.6/Dockerfile.jinja2
+++ /dev/null
@@ -1,14 +0,0 @@
-{{ docker.from("php", "5.6") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.nginx() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ nginx.debian() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-nginx/5.6/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/5.6/conf/bin/service.d/nginx.d/10-init.sh
deleted file mode 100644
index 8acb5111d..000000000
--- a/docker/php-nginx/5.6/conf/bin/service.d/nginx.d/10-init.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
diff --git a/docker/php-nginx/5.6/conf/bin/service.d/nginx.sh b/docker/php-nginx/5.6/conf/bin/service.d/nginx.sh
deleted file mode 100644
index 3517c72a5..000000000
--- a/docker/php-nginx/5.6/conf/bin/service.d/nginx.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/nginx.d/"
-
-exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS
diff --git a/docker/php-nginx/5.6/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/5.6/conf/etc/nginx/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/5.6/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/5.6/conf/etc/nginx/conf.d/10-php.conf
deleted file mode 100644
index 9abe45f0a..000000000
--- a/docker/php-nginx/5.6/conf/etc/nginx/conf.d/10-php.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-upstream php {
- server ;
-}
diff --git a/docker/php-nginx/5.6/conf/etc/nginx/global.conf b/docker/php-nginx/5.6/conf/etc/nginx/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-nginx/5.6/conf/etc/nginx/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-nginx/5.6/conf/etc/nginx/main.conf b/docker/php-nginx/5.6/conf/etc/nginx/main.conf
deleted file mode 100644
index 06de0651b..000000000
--- a/docker/php-nginx/5.6/conf/etc/nginx/main.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-include /opt/docker/etc/nginx/global.conf;
-include /opt/docker/etc/nginx/php.conf;
-include /opt/docker/etc/nginx/conf.d/*.conf;
-include /opt/docker/etc/nginx/vhost.conf;
diff --git a/docker/php-nginx/5.6/conf/etc/nginx/php.conf b/docker/php-nginx/5.6/conf/etc/nginx/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-nginx/5.6/conf/etc/nginx/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.key b/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.conf
deleted file mode 100644
index a5df62ef8..000000000
--- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-include /opt/docker/etc/nginx/vhost.common.d/*.conf;
diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-general.conf
deleted file mode 100644
index 31c9bf05a..000000000
--- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-general.conf
+++ /dev/null
@@ -1 +0,0 @@
-client_max_body_size ;
diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-location-root.conf
deleted file mode 100644
index 28fd811bc..000000000
--- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-location-root.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-location / {
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index 9646c6826..000000000
--- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr warn;
diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-php.conf
deleted file mode 100644
index 22b08a50d..000000000
--- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-php.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-location ~ \.php$ {
- fastcgi_split_path_info ^(.+\.php)(/.+)$;
- fastcgi_pass php;
- include fastcgi_params;
- fastcgi_param SCRIPT_FILENAME $request_filename;
- fastcgi_read_timeout ;
-}
diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf
deleted file mode 100644
index b4df6d710..000000000
--- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-server {
- listen 80 default_server;
- listen [::]:80 default_server;
-
- server_name _ docker;
-
- root "";
- index ;
-
- include /opt/docker/etc/nginx/vhost.common.d/*.conf;
-}
-
-##############
-# SSL
-##############
-
-server {
- listen 443 ssl default_server;
- listen [::]:443 ssl default_server;
-
- server_name _ docker;
-
- root "";
- index ;
-
- include /opt/docker/etc/nginx/vhost.common.d/*.conf;
- include /opt/docker/etc/nginx/vhost.ssl.conf;
-}
diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf
deleted file mode 100644
index 28e8aab17..000000000
--- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
-ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
-ssl_prefer_server_ciphers on;
-
-ssl_certificate /opt/docker/etc/nginx/ssl/server.crt;
-ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key;
diff --git a/docker/php-nginx/5.6/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/5.6/conf/etc/supervisor.d/nginx.conf
deleted file mode 100644
index 657bf499b..000000000
--- a/docker/php-nginx/5.6/conf/etc/supervisor.d/nginx.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:nginx]
-programs=nginxd
-priority=20
-
-[program:nginxd]
-command = /opt/docker/bin/service.d/nginx.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx/5.6/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/5.6/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index 1ba70f963..000000000
--- a/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-# Remove daemon statement (will be added as command line argument)
-go-replace --mode=lineinfile --regex --regex-backrefs \
- -s '^[\s#]*daemon ' -r '' \
- -- /etc/nginx/nginx.conf
-
-go-replace --mode=line --regex --regex-backrefs \
- -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \
- -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \
- -- /etc/nginx/nginx.conf
-
-# Enable nginx main config
-mkdir -p /etc/nginx/conf.d/
-ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf
-
-rm -f \
- /etc/nginx/sites-enabled/default \
- /etc/nginx/conf.d/default.conf
-
-if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf
-fi
-
-# Clear log dir
-rm -rf /var/lib/nginx/logs
-mkdir -p /var/lib/nginx/logs
-
-# Set log to stdout/stderr
-ln -sf /var/lib/nginx/logs/access.log /docker.stdout
-ln -sf /var/lib/nginx/logs/error.log /docker.stderr
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/nginx/ssl
-find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 4a7d82647..000000000
--- a/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
diff --git a/docker/php-nginx/5.6/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/5.6/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/5.6/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/5.6/conf/provision/entrypoint.d/20-nginx.sh
deleted file mode 100644
index 0264b6c2e..000000000
--- a/docker/php-nginx/5.6/conf/provision/entrypoint.d/20-nginx.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-# Create tmp dir for nginx
-mkdir -p /var/tmp/nginx/
-
-# Prevent startup of nginx (ubuntu 16.04 needs it)
-ln -f -s /var/lib/nginx/logs /var/log/nginx
-
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf
- rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf
-fi
diff --git a/docker/php-nginx/7.0/Dockerfile b/docker/php-nginx/7.0/Dockerfile
deleted file mode 100644
index f75346d8e..000000000
--- a/docker/php-nginx/7.0/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx:7.0
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.0
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install nginx
- && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
- >> /etc/apt/sources.list \
- && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
- && apt-install \
- nginx \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-nginx/7.0/Dockerfile.jinja2 b/docker/php-nginx/7.0/Dockerfile.jinja2
deleted file mode 100644
index 39af76493..000000000
--- a/docker/php-nginx/7.0/Dockerfile.jinja2
+++ /dev/null
@@ -1,14 +0,0 @@
-{{ docker.from("php", "7.0") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.nginx() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ nginx.debian() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-nginx/7.0/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/7.0/conf/bin/service.d/nginx.d/10-init.sh
deleted file mode 100644
index 8acb5111d..000000000
--- a/docker/php-nginx/7.0/conf/bin/service.d/nginx.d/10-init.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
diff --git a/docker/php-nginx/7.0/conf/bin/service.d/nginx.sh b/docker/php-nginx/7.0/conf/bin/service.d/nginx.sh
deleted file mode 100644
index 3517c72a5..000000000
--- a/docker/php-nginx/7.0/conf/bin/service.d/nginx.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/nginx.d/"
-
-exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS
diff --git a/docker/php-nginx/7.0/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/7.0/conf/etc/nginx/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.0/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/7.0/conf/etc/nginx/conf.d/10-php.conf
deleted file mode 100644
index 9abe45f0a..000000000
--- a/docker/php-nginx/7.0/conf/etc/nginx/conf.d/10-php.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-upstream php {
- server ;
-}
diff --git a/docker/php-nginx/7.0/conf/etc/nginx/global.conf b/docker/php-nginx/7.0/conf/etc/nginx/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-nginx/7.0/conf/etc/nginx/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-nginx/7.0/conf/etc/nginx/main.conf b/docker/php-nginx/7.0/conf/etc/nginx/main.conf
deleted file mode 100644
index 06de0651b..000000000
--- a/docker/php-nginx/7.0/conf/etc/nginx/main.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-include /opt/docker/etc/nginx/global.conf;
-include /opt/docker/etc/nginx/php.conf;
-include /opt/docker/etc/nginx/conf.d/*.conf;
-include /opt/docker/etc/nginx/vhost.conf;
diff --git a/docker/php-nginx/7.0/conf/etc/nginx/php.conf b/docker/php-nginx/7.0/conf/etc/nginx/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-nginx/7.0/conf/etc/nginx/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.key b/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.conf
deleted file mode 100644
index a5df62ef8..000000000
--- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-include /opt/docker/etc/nginx/vhost.common.d/*.conf;
diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-general.conf
deleted file mode 100644
index 31c9bf05a..000000000
--- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-general.conf
+++ /dev/null
@@ -1 +0,0 @@
-client_max_body_size ;
diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-location-root.conf
deleted file mode 100644
index 28fd811bc..000000000
--- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-location-root.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-location / {
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index 9646c6826..000000000
--- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr warn;
diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-php.conf
deleted file mode 100644
index 22b08a50d..000000000
--- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-php.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-location ~ \.php$ {
- fastcgi_split_path_info ^(.+\.php)(/.+)$;
- fastcgi_pass php;
- include fastcgi_params;
- fastcgi_param SCRIPT_FILENAME $request_filename;
- fastcgi_read_timeout ;
-}
diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf
deleted file mode 100644
index b4df6d710..000000000
--- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-server {
- listen 80 default_server;
- listen [::]:80 default_server;
-
- server_name _ docker;
-
- root "";
- index ;
-
- include /opt/docker/etc/nginx/vhost.common.d/*.conf;
-}
-
-##############
-# SSL
-##############
-
-server {
- listen 443 ssl default_server;
- listen [::]:443 ssl default_server;
-
- server_name _ docker;
-
- root "";
- index ;
-
- include /opt/docker/etc/nginx/vhost.common.d/*.conf;
- include /opt/docker/etc/nginx/vhost.ssl.conf;
-}
diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf
deleted file mode 100644
index 28e8aab17..000000000
--- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
-ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
-ssl_prefer_server_ciphers on;
-
-ssl_certificate /opt/docker/etc/nginx/ssl/server.crt;
-ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key;
diff --git a/docker/php-nginx/7.0/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/7.0/conf/etc/supervisor.d/nginx.conf
deleted file mode 100644
index 657bf499b..000000000
--- a/docker/php-nginx/7.0/conf/etc/supervisor.d/nginx.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:nginx]
-programs=nginxd
-priority=20
-
-[program:nginxd]
-command = /opt/docker/bin/service.d/nginx.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx/7.0/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/7.0/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index 1ba70f963..000000000
--- a/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-# Remove daemon statement (will be added as command line argument)
-go-replace --mode=lineinfile --regex --regex-backrefs \
- -s '^[\s#]*daemon ' -r '' \
- -- /etc/nginx/nginx.conf
-
-go-replace --mode=line --regex --regex-backrefs \
- -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \
- -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \
- -- /etc/nginx/nginx.conf
-
-# Enable nginx main config
-mkdir -p /etc/nginx/conf.d/
-ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf
-
-rm -f \
- /etc/nginx/sites-enabled/default \
- /etc/nginx/conf.d/default.conf
-
-if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf
-fi
-
-# Clear log dir
-rm -rf /var/lib/nginx/logs
-mkdir -p /var/lib/nginx/logs
-
-# Set log to stdout/stderr
-ln -sf /var/lib/nginx/logs/access.log /docker.stdout
-ln -sf /var/lib/nginx/logs/error.log /docker.stderr
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/nginx/ssl
-find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 4a7d82647..000000000
--- a/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
diff --git a/docker/php-nginx/7.0/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/7.0/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.0/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/7.0/conf/provision/entrypoint.d/20-nginx.sh
deleted file mode 100644
index 0264b6c2e..000000000
--- a/docker/php-nginx/7.0/conf/provision/entrypoint.d/20-nginx.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-# Create tmp dir for nginx
-mkdir -p /var/tmp/nginx/
-
-# Prevent startup of nginx (ubuntu 16.04 needs it)
-ln -f -s /var/lib/nginx/logs /var/log/nginx
-
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf
- rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf
-fi
diff --git a/docker/php-nginx/7.1-alpine/Dockerfile b/docker/php-nginx/7.1-alpine/Dockerfile
deleted file mode 100644
index 541e7747a..000000000
--- a/docker/php-nginx/7.1-alpine/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx:7.1-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.1-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install nginx
- && apk-install \
- nginx \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-nginx/7.1-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.1-alpine/Dockerfile.jinja2
deleted file mode 100644
index fd23f8f8a..000000000
--- a/docker/php-nginx/7.1-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,14 +0,0 @@
-{{ docker.from("php", "7.1-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.nginx() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ nginx.alpine() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-nginx/7.1-alpine/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/7.1-alpine/conf/bin/service.d/nginx.d/10-init.sh
deleted file mode 100644
index 8acb5111d..000000000
--- a/docker/php-nginx/7.1-alpine/conf/bin/service.d/nginx.d/10-init.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
diff --git a/docker/php-nginx/7.1-alpine/conf/bin/service.d/nginx.sh b/docker/php-nginx/7.1-alpine/conf/bin/service.d/nginx.sh
deleted file mode 100644
index 3517c72a5..000000000
--- a/docker/php-nginx/7.1-alpine/conf/bin/service.d/nginx.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/nginx.d/"
-
-exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/7.1-alpine/conf/etc/nginx/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/conf.d/10-php.conf
deleted file mode 100644
index 9abe45f0a..000000000
--- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/conf.d/10-php.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-upstream php {
- server ;
-}
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/global.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/main.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/main.conf
deleted file mode 100644
index 06de0651b..000000000
--- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/main.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-include /opt/docker/etc/nginx/global.conf;
-include /opt/docker/etc/nginx/php.conf;
-include /opt/docker/etc/nginx/conf.d/*.conf;
-include /opt/docker/etc/nginx/vhost.conf;
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/nginx.conf
deleted file mode 100644
index b9cb4ebc4..000000000
--- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/nginx.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# For more information on configuration, see:
-# * Official English Documentation: http://nginx.org/en/docs/
-# * Official Russian Documentation: http://nginx.org/ru/docs/
-
-user nginx;
-worker_processes auto;
-error_log /docker.stdout;
-pid /run/nginx.pid;
-
-events {
- worker_connections 1024;
-}
-
-http {
- log_format main '$remote_addr - $remote_user [$time_local] "$request" '
- '$status $body_bytes_sent "$http_referer" '
- '"$http_user_agent" "$http_x_forwarded_for"';
-
- access_log /docker.stdout main;
-
- sendfile on;
- tcp_nopush on;
- tcp_nodelay on;
- keepalive_timeout 65;
- types_hash_max_size 2048;
-
- include /etc/nginx/mime.types;
- default_type application/octet-stream;
-
- # Load modular configuration files from the /etc/nginx/conf.d directory.
- # See http://nginx.org/en/docs/ngx_core_module.html#include
- # for more information.
- include /etc/nginx/conf.d/*.conf;
-}
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/php.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.key b/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.conf
deleted file mode 100644
index a5df62ef8..000000000
--- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-include /opt/docker/etc/nginx/vhost.common.d/*.conf;
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-general.conf
deleted file mode 100644
index 31c9bf05a..000000000
--- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-general.conf
+++ /dev/null
@@ -1 +0,0 @@
-client_max_body_size ;
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf
deleted file mode 100644
index 28fd811bc..000000000
--- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-location / {
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index 9646c6826..000000000
--- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr warn;
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-php.conf
deleted file mode 100644
index 22b08a50d..000000000
--- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-php.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-location ~ \.php$ {
- fastcgi_split_path_info ^(.+\.php)(/.+)$;
- fastcgi_pass php;
- include fastcgi_params;
- fastcgi_param SCRIPT_FILENAME $request_filename;
- fastcgi_read_timeout ;
-}
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf
deleted file mode 100644
index b4df6d710..000000000
--- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-server {
- listen 80 default_server;
- listen [::]:80 default_server;
-
- server_name _ docker;
-
- root "";
- index ;
-
- include /opt/docker/etc/nginx/vhost.common.d/*.conf;
-}
-
-##############
-# SSL
-##############
-
-server {
- listen 443 ssl default_server;
- listen [::]:443 ssl default_server;
-
- server_name _ docker;
-
- root "";
- index ;
-
- include /opt/docker/etc/nginx/vhost.common.d/*.conf;
- include /opt/docker/etc/nginx/vhost.ssl.conf;
-}
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf
deleted file mode 100644
index 28e8aab17..000000000
--- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
-ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
-ssl_prefer_server_ciphers on;
-
-ssl_certificate /opt/docker/etc/nginx/ssl/server.crt;
-ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key;
diff --git a/docker/php-nginx/7.1-alpine/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/7.1-alpine/conf/etc/supervisor.d/nginx.conf
deleted file mode 100644
index 657bf499b..000000000
--- a/docker/php-nginx/7.1-alpine/conf/etc/supervisor.d/nginx.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:nginx]
-programs=nginxd
-priority=20
-
-[program:nginxd]
-command = /opt/docker/bin/service.d/nginx.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index 1ba70f963..000000000
--- a/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-# Remove daemon statement (will be added as command line argument)
-go-replace --mode=lineinfile --regex --regex-backrefs \
- -s '^[\s#]*daemon ' -r '' \
- -- /etc/nginx/nginx.conf
-
-go-replace --mode=line --regex --regex-backrefs \
- -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \
- -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \
- -- /etc/nginx/nginx.conf
-
-# Enable nginx main config
-mkdir -p /etc/nginx/conf.d/
-ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf
-
-rm -f \
- /etc/nginx/sites-enabled/default \
- /etc/nginx/conf.d/default.conf
-
-if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf
-fi
-
-# Clear log dir
-rm -rf /var/lib/nginx/logs
-mkdir -p /var/lib/nginx/logs
-
-# Set log to stdout/stderr
-ln -sf /var/lib/nginx/logs/access.log /docker.stdout
-ln -sf /var/lib/nginx/logs/error.log /docker.stderr
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/nginx/ssl
-find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 4a7d82647..000000000
--- a/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
diff --git a/docker/php-nginx/7.1-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/7.1-alpine/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.1-alpine/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/7.1-alpine/conf/provision/entrypoint.d/20-nginx.sh
deleted file mode 100644
index 0264b6c2e..000000000
--- a/docker/php-nginx/7.1-alpine/conf/provision/entrypoint.d/20-nginx.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-# Create tmp dir for nginx
-mkdir -p /var/tmp/nginx/
-
-# Prevent startup of nginx (ubuntu 16.04 needs it)
-ln -f -s /var/lib/nginx/logs /var/log/nginx
-
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf
- rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf
-fi
diff --git a/docker/php-nginx/7.1/Dockerfile b/docker/php-nginx/7.1/Dockerfile
deleted file mode 100644
index eb2376a9f..000000000
--- a/docker/php-nginx/7.1/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx:7.1
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.1
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install nginx
- && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
- >> /etc/apt/sources.list \
- && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
- && apt-install \
- nginx \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-nginx/7.1/Dockerfile.jinja2 b/docker/php-nginx/7.1/Dockerfile.jinja2
deleted file mode 100644
index 0d89f2e50..000000000
--- a/docker/php-nginx/7.1/Dockerfile.jinja2
+++ /dev/null
@@ -1,14 +0,0 @@
-{{ docker.from("php", "7.1") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.nginx() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ nginx.debian() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-nginx/7.1/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/7.1/conf/bin/service.d/nginx.d/10-init.sh
deleted file mode 100644
index 8acb5111d..000000000
--- a/docker/php-nginx/7.1/conf/bin/service.d/nginx.d/10-init.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
diff --git a/docker/php-nginx/7.1/conf/bin/service.d/nginx.sh b/docker/php-nginx/7.1/conf/bin/service.d/nginx.sh
deleted file mode 100644
index 3517c72a5..000000000
--- a/docker/php-nginx/7.1/conf/bin/service.d/nginx.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/nginx.d/"
-
-exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS
diff --git a/docker/php-nginx/7.1/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/7.1/conf/etc/nginx/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.1/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/7.1/conf/etc/nginx/conf.d/10-php.conf
deleted file mode 100644
index 9abe45f0a..000000000
--- a/docker/php-nginx/7.1/conf/etc/nginx/conf.d/10-php.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-upstream php {
- server ;
-}
diff --git a/docker/php-nginx/7.1/conf/etc/nginx/global.conf b/docker/php-nginx/7.1/conf/etc/nginx/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-nginx/7.1/conf/etc/nginx/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-nginx/7.1/conf/etc/nginx/main.conf b/docker/php-nginx/7.1/conf/etc/nginx/main.conf
deleted file mode 100644
index 06de0651b..000000000
--- a/docker/php-nginx/7.1/conf/etc/nginx/main.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-include /opt/docker/etc/nginx/global.conf;
-include /opt/docker/etc/nginx/php.conf;
-include /opt/docker/etc/nginx/conf.d/*.conf;
-include /opt/docker/etc/nginx/vhost.conf;
diff --git a/docker/php-nginx/7.1/conf/etc/nginx/php.conf b/docker/php-nginx/7.1/conf/etc/nginx/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-nginx/7.1/conf/etc/nginx/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.key b/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik
-9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE
-LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K
-Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw
-uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy
-COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9
-hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA
-lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo
-S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq
-lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp
-MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA
-AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc
-OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp
-m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP
-OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg
-tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ
-F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH
-NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf
-mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV
-/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l
-26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ
-+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z
-20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl
-lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR
-sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2
-OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20
-OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L
-QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X
-6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi
-HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z
-/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e
-7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR
-d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9
-KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ
-x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD
-Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ
-jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL
-6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O
-gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO
-MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB
-q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY
-S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4
-UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3
-Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd
-DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3
-W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn
-ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5
-K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS
-mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8=
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.conf
deleted file mode 100644
index a5df62ef8..000000000
--- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-include /opt/docker/etc/nginx/vhost.common.d/*.conf;
diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-general.conf
deleted file mode 100644
index 31c9bf05a..000000000
--- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-general.conf
+++ /dev/null
@@ -1 +0,0 @@
-client_max_body_size ;
diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-location-root.conf
deleted file mode 100644
index 28fd811bc..000000000
--- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-location-root.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-location / {
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index 9646c6826..000000000
--- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr warn;
diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-php.conf
deleted file mode 100644
index 22b08a50d..000000000
--- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-php.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-location ~ \.php$ {
- fastcgi_split_path_info ^(.+\.php)(/.+)$;
- fastcgi_pass php;
- include fastcgi_params;
- fastcgi_param SCRIPT_FILENAME $request_filename;
- fastcgi_read_timeout ;
-}
diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf
deleted file mode 100644
index b4df6d710..000000000
--- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-server {
- listen 80 default_server;
- listen [::]:80 default_server;
-
- server_name _ docker;
-
- root "";
- index ;
-
- include /opt/docker/etc/nginx/vhost.common.d/*.conf;
-}
-
-##############
-# SSL
-##############
-
-server {
- listen 443 ssl default_server;
- listen [::]:443 ssl default_server;
-
- server_name _ docker;
-
- root "";
- index ;
-
- include /opt/docker/etc/nginx/vhost.common.d/*.conf;
- include /opt/docker/etc/nginx/vhost.ssl.conf;
-}
diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf
deleted file mode 100644
index 28e8aab17..000000000
--- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
-ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
-ssl_prefer_server_ciphers on;
-
-ssl_certificate /opt/docker/etc/nginx/ssl/server.crt;
-ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key;
diff --git a/docker/php-nginx/7.1/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/7.1/conf/etc/supervisor.d/nginx.conf
deleted file mode 100644
index 657bf499b..000000000
--- a/docker/php-nginx/7.1/conf/etc/supervisor.d/nginx.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:nginx]
-programs=nginxd
-priority=20
-
-[program:nginxd]
-command = /opt/docker/bin/service.d/nginx.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx/7.1/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/7.1/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index 1ba70f963..000000000
--- a/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-# Remove daemon statement (will be added as command line argument)
-go-replace --mode=lineinfile --regex --regex-backrefs \
- -s '^[\s#]*daemon ' -r '' \
- -- /etc/nginx/nginx.conf
-
-go-replace --mode=line --regex --regex-backrefs \
- -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \
- -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \
- -- /etc/nginx/nginx.conf
-
-# Enable nginx main config
-mkdir -p /etc/nginx/conf.d/
-ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf
-
-rm -f \
- /etc/nginx/sites-enabled/default \
- /etc/nginx/conf.d/default.conf
-
-if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf
-fi
-
-# Clear log dir
-rm -rf /var/lib/nginx/logs
-mkdir -p /var/lib/nginx/logs
-
-# Set log to stdout/stderr
-ln -sf /var/lib/nginx/logs/access.log /docker.stdout
-ln -sf /var/lib/nginx/logs/error.log /docker.stderr
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/nginx/ssl
-find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 4a7d82647..000000000
--- a/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
diff --git a/docker/php-nginx/7.1/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/7.1/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.1/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/7.1/conf/provision/entrypoint.d/20-nginx.sh
deleted file mode 100644
index 0264b6c2e..000000000
--- a/docker/php-nginx/7.1/conf/provision/entrypoint.d/20-nginx.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-# Create tmp dir for nginx
-mkdir -p /var/tmp/nginx/
-
-# Prevent startup of nginx (ubuntu 16.04 needs it)
-ln -f -s /var/lib/nginx/logs /var/log/nginx
-
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf
- rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf
-fi
diff --git a/docker/php-nginx/7.2-alpine/Dockerfile b/docker/php-nginx/7.2-alpine/Dockerfile
deleted file mode 100644
index 56cb3cf59..000000000
--- a/docker/php-nginx/7.2-alpine/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx:7.2-alpine
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.2-alpine
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install nginx
- && apk-install \
- nginx \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-nginx/7.2-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.2-alpine/Dockerfile.jinja2
deleted file mode 100644
index 6801b1d54..000000000
--- a/docker/php-nginx/7.2-alpine/Dockerfile.jinja2
+++ /dev/null
@@ -1,14 +0,0 @@
-{{ docker.from("php", "7.2-alpine") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.nginx() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ nginx.alpine() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-nginx/7.2-alpine/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/7.2-alpine/conf/bin/service.d/nginx.d/10-init.sh
deleted file mode 100644
index 8acb5111d..000000000
--- a/docker/php-nginx/7.2-alpine/conf/bin/service.d/nginx.d/10-init.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
diff --git a/docker/php-nginx/7.2-alpine/conf/bin/service.d/nginx.sh b/docker/php-nginx/7.2-alpine/conf/bin/service.d/nginx.sh
deleted file mode 100644
index 3517c72a5..000000000
--- a/docker/php-nginx/7.2-alpine/conf/bin/service.d/nginx.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/nginx.d/"
-
-exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/7.2-alpine/conf/etc/nginx/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/conf.d/10-php.conf
deleted file mode 100644
index 9abe45f0a..000000000
--- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/conf.d/10-php.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-upstream php {
- server ;
-}
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/global.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/global.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/global.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/main.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/main.conf
deleted file mode 100644
index 06de0651b..000000000
--- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/main.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-include /opt/docker/etc/nginx/global.conf;
-include /opt/docker/etc/nginx/php.conf;
-include /opt/docker/etc/nginx/conf.d/*.conf;
-include /opt/docker/etc/nginx/vhost.conf;
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/nginx.conf
deleted file mode 100644
index b9cb4ebc4..000000000
--- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/nginx.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# For more information on configuration, see:
-# * Official English Documentation: http://nginx.org/en/docs/
-# * Official Russian Documentation: http://nginx.org/ru/docs/
-
-user nginx;
-worker_processes auto;
-error_log /docker.stdout;
-pid /run/nginx.pid;
-
-events {
- worker_connections 1024;
-}
-
-http {
- log_format main '$remote_addr - $remote_user [$time_local] "$request" '
- '$status $body_bytes_sent "$http_referer" '
- '"$http_user_agent" "$http_x_forwarded_for"';
-
- access_log /docker.stdout main;
-
- sendfile on;
- tcp_nopush on;
- tcp_nodelay on;
- keepalive_timeout 65;
- types_hash_max_size 2048;
-
- include /etc/nginx/mime.types;
- default_type application/octet-stream;
-
- # Load modular configuration files from the /etc/nginx/conf.d directory.
- # See http://nginx.org/en/docs/ngx_core_module.html#include
- # for more information.
- include /etc/nginx/conf.d/*.conf;
-}
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/php.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/php.conf
deleted file mode 100644
index b6141db09..000000000
--- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/php.conf
+++ /dev/null
@@ -1 +0,0 @@
-# deprecated
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.crt
deleted file mode 100644
index 6b0694907..000000000
--- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
-b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
-WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
-DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
-3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
-Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
-9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
-0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
-NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
-FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
-7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
-clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
-GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
-6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
-Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
-SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
-t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
-NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
-I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
-aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
-vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
-nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
-4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
-VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
-ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.csr
deleted file mode 100644
index 8a9909f77..000000000
--- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.csr
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
-VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
-713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
-Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
-BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
-ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
-Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
-ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
-SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
-/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
-K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
-kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
-hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
-A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
-Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
-/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
-JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
-uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
-UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
-TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
-6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
-C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
-7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
-2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
------END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.key b/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.key
deleted file mode 100644
index c9eec145f..000000000
--- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.conf
deleted file mode 100644
index a5df62ef8..000000000
--- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# compatibility for PHP and TYPO3 Docker Boilerplate
-include /opt/docker/etc/nginx/vhost.common.d/*.conf;
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-general.conf
deleted file mode 100644
index 31c9bf05a..000000000
--- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-general.conf
+++ /dev/null
@@ -1 +0,0 @@
-client_max_body_size ;
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf
deleted file mode 100644
index 28fd811bc..000000000
--- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-location / {
- try_files $uri $uri/ /?$query_string;
-}
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-log.conf
deleted file mode 100644
index 9646c6826..000000000
--- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-log.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-access_log /docker.stdout;
-error_log /docker.stderr warn;
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-php.conf
deleted file mode 100644
index 22b08a50d..000000000
--- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-php.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-location ~ \.php$ {
- fastcgi_split_path_info ^(.+\.php)(/.+)$;
- fastcgi_pass php;
- include fastcgi_params;
- fastcgi_param SCRIPT_FILENAME $request_filename;
- fastcgi_read_timeout ;
-}
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf
deleted file mode 100644
index b4df6d710..000000000
--- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-server {
- listen 80 default_server;
- listen [::]:80 default_server;
-
- server_name _ docker;
-
- root "";
- index ;
-
- include /opt/docker/etc/nginx/vhost.common.d/*.conf;
-}
-
-##############
-# SSL
-##############
-
-server {
- listen 443 ssl default_server;
- listen [::]:443 ssl default_server;
-
- server_name _ docker;
-
- root "";
- index ;
-
- include /opt/docker/etc/nginx/vhost.common.d/*.conf;
- include /opt/docker/etc/nginx/vhost.ssl.conf;
-}
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf
deleted file mode 100644
index 28e8aab17..000000000
--- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
-ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
-ssl_prefer_server_ciphers on;
-
-ssl_certificate /opt/docker/etc/nginx/ssl/server.crt;
-ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key;
diff --git a/docker/php-nginx/7.2-alpine/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/7.2-alpine/conf/etc/supervisor.d/nginx.conf
deleted file mode 100644
index 657bf499b..000000000
--- a/docker/php-nginx/7.2-alpine/conf/etc/supervisor.d/nginx.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[group:nginx]
-programs=nginxd
-priority=20
-
-[program:nginxd]
-command = /opt/docker/bin/service.d/nginx.sh
-process_name=%(program_name)s
-startsecs = 0
-autostart = true
-autorestart = true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh
deleted file mode 100644
index 1ba70f963..000000000
--- a/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-IMAGE_FAMILY=$(docker-image-info family)
-
-# Remove daemon statement (will be added as command line argument)
-go-replace --mode=lineinfile --regex --regex-backrefs \
- -s '^[\s#]*daemon ' -r '' \
- -- /etc/nginx/nginx.conf
-
-go-replace --mode=line --regex --regex-backrefs \
- -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \
- -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \
- -- /etc/nginx/nginx.conf
-
-# Enable nginx main config
-mkdir -p /etc/nginx/conf.d/
-ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf
-
-rm -f \
- /etc/nginx/sites-enabled/default \
- /etc/nginx/conf.d/default.conf
-
-if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then
- ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf
-fi
-
-# Clear log dir
-rm -rf /var/lib/nginx/logs
-mkdir -p /var/lib/nginx/logs
-
-# Set log to stdout/stderr
-ln -sf /var/lib/nginx/logs/access.log /docker.stdout
-ln -sf /var/lib/nginx/logs/error.log /docker.stderr
-
-# Fix rights of ssl files
-chown -R root:root /opt/docker/etc/nginx/ssl
-find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \;
-find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \;
diff --git a/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-php.sh
deleted file mode 100644
index 4a7d82647..000000000
--- a/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-php.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-# Restrict php-fpm to local connection
-go-replace --mode=line --regex \
- -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \
- --path=/opt/docker/etc/php/fpm/ \
- --path-pattern='*.conf'
diff --git a/docker/php-nginx/7.2-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/7.2-alpine/conf/provision/entrypoint.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.2-alpine/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/7.2-alpine/conf/provision/entrypoint.d/20-nginx.sh
deleted file mode 100644
index 0264b6c2e..000000000
--- a/docker/php-nginx/7.2-alpine/conf/provision/entrypoint.d/20-nginx.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-# Create tmp dir for nginx
-mkdir -p /var/tmp/nginx/
-
-# Prevent startup of nginx (ubuntu 16.04 needs it)
-ln -f -s /var/lib/nginx/logs /var/log/nginx
-
-# Replace markers
-go-replace \
- -s "" -r "$WEB_DOCUMENT_INDEX" \
- -s "" -r "$WEB_DOCUMENT_ROOT" \
- -s "" -r "$WEB_ALIAS_DOMAIN" \
- -s "" -r "$HOSTNAME" \
- -s "" -r "$WEB_PHP_SOCKET" \
- -s "" -r "$WEB_PHP_TIMEOUT" \
- -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \
- --path=/opt/docker/etc/nginx/ \
- --path-pattern='*.conf' \
- --ignore-empty
-
-if [[ -z "$WEB_PHP_SOCKET" ]]; then
- ## WEB_PHP_SOCKET is not set, remove PHP files
- rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf
- rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf
-fi
diff --git a/docker/php-nginx/7.2/Dockerfile b/docker/php-nginx/7.2/Dockerfile
deleted file mode 100644
index 2e77b6cfb..000000000
--- a/docker/php-nginx/7.2/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-#+++++++++++++++++++++++++++++++++++++++
-# Dockerfile for webdevops/php-nginx:7.2
-# -- automatically generated --
-#+++++++++++++++++++++++++++++++++++++++
-
-FROM webdevops/php:7.2
-
-ENV WEB_DOCUMENT_ROOT=/app \
- WEB_DOCUMENT_INDEX=index.php \
- WEB_ALIAS_DOMAIN=*.vm \
- WEB_PHP_TIMEOUT=600 \
- WEB_PHP_SOCKET=""
-ENV WEB_PHP_SOCKET=127.0.0.1:9000
-ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m"
-
-COPY conf/ /opt/docker/
-
-RUN set -x \
- # Install nginx
- && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
- >> /etc/apt/sources.list \
- && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
- && apt-install \
- nginx \
- && docker-run-bootstrap \
- && docker-image-cleanup
-
-EXPOSE 80 443
diff --git a/docker/php-nginx/7.2/Dockerfile.jinja2 b/docker/php-nginx/7.2/Dockerfile.jinja2
deleted file mode 100644
index d977be809..000000000
--- a/docker/php-nginx/7.2/Dockerfile.jinja2
+++ /dev/null
@@ -1,14 +0,0 @@
-{{ docker.from("php", "7.2") }}
-
-{{ environment.web() }}
-{{ environment.webPhp() }}
-{{ environment.nginx() }}
-
-{{ docker.copy('conf/', '/opt/docker/') }}
-
-RUN set -x \
- {{ nginx.debian() }} \
- {{ provision.runBootstrap() }} \
- {{ docker.cleanup() }}
-
-{{ docker.expose('80 443') }}
diff --git a/docker/php-nginx/7.2/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/7.2/conf/bin/service.d/nginx.d/10-init.sh
deleted file mode 100644
index 8acb5111d..000000000
--- a/docker/php-nginx/7.2/conf/bin/service.d/nginx.d/10-init.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
- echo ""
- echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
- echo ""
-fi
diff --git a/docker/php-nginx/7.2/conf/bin/service.d/nginx.sh b/docker/php-nginx/7.2/conf/bin/service.d/nginx.sh
deleted file mode 100644
index 3517c72a5..000000000
--- a/docker/php-nginx/7.2/conf/bin/service.d/nginx.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Init vars
-if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi
-
-source /opt/docker/bin/config.sh
-
-includeScriptDir "/opt/docker/bin/service.d/nginx.d/"
-
-exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS
diff --git a/docker/php-nginx/7.2/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/7.2/conf/etc/nginx/conf.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx/7.2/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/7.2/conf/etc/nginx/conf.d/10-php.conf
deleted file mode 100644
index 9abe45f0a..000000000
--- a/docker/php-nginx/7.2/conf/etc/nginx/conf.d/10-php.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-upstream php {
- server