Skip to content

[TASK] Remove unused legacy distribution templates #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kanti merged 7 commits into from
Nov 8, 2026
Merged

[TASK] Remove unused legacy distribution templates #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4209946
[TASK] Remove unused legacy distribution templates
Kanti Nov 6, 2026
3612b75
[BUGFIX] Always use deb822 sources in bootstrap.debian()
Kanti Nov 8, 2026
388bc1a
[TASK] AGENTS.md: docker/php only holds symlinks to php-official
Kanti Nov 8, 2026
08912b7
[TASK] Drop the distribution argument of php.official()
Kanti Nov 8, 2026
8fd48f0
[TASK] Remove unused imports from apache.jinja2
Kanti Nov 8, 2026
6b1ae86
[TASK] Remove legacy provisioning, test suites and PHP 5/7 paths
Kanti Nov 8, 2026
0756c8f
[TASK] Document three image problems found in the review
Kanti Nov 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
| `tests/` | serverspec (Ruby) and container-structure-test definitions run by the CI |
| `docs/` | User documentation |

Not everything under `docker/` is built: `docker/php/7.0` to `docker/php/8.0` (and their `-alpine` variants) are dangling symlinks. The tags that are built are the `-t "webdevops/..."` lines in `.github/workflows/build.yaml`.
`docker/php/<version>` are symlinks to `docker/php-official/<version>`; both images are built from the same Dockerfiles. The tags that are built are the `-t "webdevops/..."` lines in `.github/workflows/build.yaml`.

## Build and test

Expand Down
8 changes: 0 additions & 8 deletions ci/BLACKLIST
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions conf/console.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,6 @@ dockerTest:
OS_FAMILY: 'alpine'
OS_VERSION: '3'
PHP_OFFICIAL: '1'
'php[^:]*:5.6$':
OS_FAMILY: 'debian'
OS_VERSION: '9'
PHP_OFFICIAL: '1'
'php[^:]*:7.0$':
OS_FAMILY: 'debian'
OS_VERSION: '9'
PHP_OFFICIAL: '1'
'php[^:]*:8.(0|1|2|3|4|5)':
OS_FAMILY: 'debian'
OS_VERSION: '12'
Expand Down
11 changes: 0 additions & 11 deletions conf/provision.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,26 @@ provision:
base:
configuration:
base/general: '*'
base/centos: centos-*
base/alpine: alpine
base-app:
configuration:
base-app/general: '*'
apache:
configuration:
apache/general : '*'
apache/centos : centos-*
apache/alpine : alpine
nginx:
configuration:
nginx/general : '*'
nginx/centos : centos-*
nginx/alpine : alpine
php:
configuration:
php/general : '(debian|ubuntu|centos|alpine)'
php/ubuntu-12.04 : ubuntu-12.04
php/alpine : alpine
php-apache:
configuration:
apache/general : '*'
apache/centos : centos-*
apache/alpine : alpine
php-apache/general: '*'
php-apache/alpine : '*-alpine'
php-nginx:
configuration:
nginx/general : '*'
nginx/centos : centos-*
nginx/alpine : '*-alpine'
php-nginx/general : '*'
php-dev:
Expand Down
21 changes: 0 additions & 21 deletions docker/php-apache-dev/8.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,5 @@
#!/usr/bin/env bash

IMAGE_FAMILY=$(docker-image-info family)

case "$IMAGE_FAMILY" in
Alpine)
# Fix php xdebug module [Alpine family]

if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
go-replace --mode=lineinfile \
-s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
/etc/php5/conf.d/xdebug.ini
fi

if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
go-replace --mode=lineinfile \
-s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
/etc/php7/conf.d/xdebug.ini
fi

;;
esac

# Configure xdebug for development
go-replace --mode=lineinfile --regex \
-s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
Expand Down
26 changes: 1 addition & 25 deletions docker/php-apache-dev/8.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,7 @@
# Debugger switch
#################################################

PHP_CONF_PATHS="
/etc/php5/conf.d
/etc/php7/conf.d
/etc/php.d
/etc/php5/mods-available
/etc/php5/cli/conf.d
/etc/php5/cli/conf.d
/etc/php5/fpm/conf.d
/etc/php5/fpm/conf.d
/etc/php/7.0/mods-available
/etc/php/7.1/mods-available
/etc/php/7.2/mods-available
/etc/php/7.3/mods-available
/etc/php/7.4/mods-available
/etc/php/7.0/cli/conf.d
/etc/php/7.1/cli/conf.d
/etc/php/7.2/cli/conf.d
/etc/php/7.3/cli/conf.d
/etc/php/7.4/cli/conf.d
/etc/php/7.0/fpm/conf.d
/etc/php/7.1/fpm/conf.d
/etc/php/7.2/fpm/conf.d
/etc/php/7.3/fpm/conf.d
/etc/php/7.4/fpm/conf.d
/usr/local/etc/php/conf.d/"
PHP_CONF_PATHS="/usr/local/etc/php/conf.d/"

function phpModuleRemove() {
if [ "$#" -ne 1 ]; then
Expand Down
21 changes: 0 additions & 21 deletions docker/php-apache-dev/8.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,5 @@
#!/usr/bin/env bash

IMAGE_FAMILY=$(docker-image-info family)

case "$IMAGE_FAMILY" in
Alpine)
# Fix php xdebug module [Alpine family]

if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
go-replace --mode=lineinfile \
-s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
/etc/php5/conf.d/xdebug.ini
fi

if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
go-replace --mode=lineinfile \
-s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
/etc/php7/conf.d/xdebug.ini
fi

;;
esac

# Configure xdebug for development
go-replace --mode=lineinfile --regex \
-s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
Expand Down
26 changes: 1 addition & 25 deletions docker/php-apache-dev/8.2/conf/provision/entrypoint.d/10-php-debugger.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,7 @@
# Debugger switch
#################################################

PHP_CONF_PATHS="
/etc/php5/conf.d
/etc/php7/conf.d
/etc/php.d
/etc/php5/mods-available
/etc/php5/cli/conf.d
/etc/php5/cli/conf.d
/etc/php5/fpm/conf.d
/etc/php5/fpm/conf.d
/etc/php/7.0/mods-available
/etc/php/7.1/mods-available
/etc/php/7.2/mods-available
/etc/php/7.3/mods-available
/etc/php/7.4/mods-available
/etc/php/7.0/cli/conf.d
/etc/php/7.1/cli/conf.d
/etc/php/7.2/cli/conf.d
/etc/php/7.3/cli/conf.d
/etc/php/7.4/cli/conf.d
/etc/php/7.0/fpm/conf.d
/etc/php/7.1/fpm/conf.d
/etc/php/7.2/fpm/conf.d
/etc/php/7.3/fpm/conf.d
/etc/php/7.4/fpm/conf.d
/usr/local/etc/php/conf.d/"
PHP_CONF_PATHS="/usr/local/etc/php/conf.d/"

function phpModuleRemove() {
if [ "$#" -ne 1 ]; then
Expand Down
21 changes: 0 additions & 21 deletions docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,5 @@
#!/usr/bin/env bash

IMAGE_FAMILY=$(docker-image-info family)

case "$IMAGE_FAMILY" in
Alpine)
# Fix php xdebug module [Alpine family]

if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
go-replace --mode=lineinfile \
-s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
/etc/php5/conf.d/xdebug.ini
fi

if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
go-replace --mode=lineinfile \
-s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
/etc/php7/conf.d/xdebug.ini
fi

;;
esac

# Configure xdebug for development
go-replace --mode=lineinfile --regex \
-s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
Expand Down
26 changes: 1 addition & 25 deletions docker/php-apache-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,7 @@
# Debugger switch
#################################################

PHP_CONF_PATHS="
/etc/php5/conf.d
/etc/php7/conf.d
/etc/php.d
/etc/php5/mods-available
/etc/php5/cli/conf.d
/etc/php5/cli/conf.d
/etc/php5/fpm/conf.d
/etc/php5/fpm/conf.d
/etc/php/7.0/mods-available
/etc/php/7.1/mods-available
/etc/php/7.2/mods-available
/etc/php/7.3/mods-available
/etc/php/7.4/mods-available
/etc/php/7.0/cli/conf.d
/etc/php/7.1/cli/conf.d
/etc/php/7.2/cli/conf.d
/etc/php/7.3/cli/conf.d
/etc/php/7.4/cli/conf.d
/etc/php/7.0/fpm/conf.d
/etc/php/7.1/fpm/conf.d
/etc/php/7.2/fpm/conf.d
/etc/php/7.3/fpm/conf.d
/etc/php/7.4/fpm/conf.d
/usr/local/etc/php/conf.d/"
PHP_CONF_PATHS="/usr/local/etc/php/conf.d/"

function phpModuleRemove() {
if [ "$#" -ne 1 ]; then
Expand Down
21 changes: 0 additions & 21 deletions docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,5 @@
#!/usr/bin/env bash

IMAGE_FAMILY=$(docker-image-info family)

case "$IMAGE_FAMILY" in
Alpine)
# Fix php xdebug module [Alpine family]

if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
go-replace --mode=lineinfile \
-s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
/etc/php5/conf.d/xdebug.ini
fi

if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
go-replace --mode=lineinfile \
-s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
/etc/php7/conf.d/xdebug.ini
fi

;;
esac

# Configure xdebug for development
go-replace --mode=lineinfile --regex \
-s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
Expand Down
26 changes: 1 addition & 25 deletions docker/php-apache-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,7 @@
# Debugger switch
#################################################

PHP_CONF_PATHS="
/etc/php5/conf.d
/etc/php7/conf.d
/etc/php.d
/etc/php5/mods-available
/etc/php5/cli/conf.d
/etc/php5/cli/conf.d
/etc/php5/fpm/conf.d
/etc/php5/fpm/conf.d
/etc/php/7.0/mods-available
/etc/php/7.1/mods-available
/etc/php/7.2/mods-available
/etc/php/7.3/mods-available
/etc/php/7.4/mods-available
/etc/php/7.0/cli/conf.d
/etc/php/7.1/cli/conf.d
/etc/php/7.2/cli/conf.d
/etc/php/7.3/cli/conf.d
/etc/php/7.4/cli/conf.d
/etc/php/7.0/fpm/conf.d
/etc/php/7.1/fpm/conf.d
/etc/php/7.2/fpm/conf.d
/etc/php/7.3/fpm/conf.d
/etc/php/7.4/fpm/conf.d
/usr/local/etc/php/conf.d/"
PHP_CONF_PATHS="/usr/local/etc/php/conf.d/"

function phpModuleRemove() {
if [ "$#" -ne 1 ]; then
Expand Down
21 changes: 0 additions & 21 deletions docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,5 @@
#!/usr/bin/env bash

IMAGE_FAMILY=$(docker-image-info family)

case "$IMAGE_FAMILY" in
Alpine)
# Fix php xdebug module [Alpine family]

if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
go-replace --mode=lineinfile \
-s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
/etc/php5/conf.d/xdebug.ini
fi

if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
go-replace --mode=lineinfile \
-s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
/etc/php7/conf.d/xdebug.ini
fi

;;
esac

# Configure xdebug for development
go-replace --mode=lineinfile --regex \
-s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
Expand Down
26 changes: 1 addition & 25 deletions docker/php-apache-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,7 @@
# Debugger switch
#################################################

PHP_CONF_PATHS="
/etc/php5/conf.d
/etc/php7/conf.d
/etc/php.d
/etc/php5/mods-available
/etc/php5/cli/conf.d
/etc/php5/cli/conf.d
/etc/php5/fpm/conf.d
/etc/php5/fpm/conf.d
/etc/php/7.0/mods-available
/etc/php/7.1/mods-available
/etc/php/7.2/mods-available
/etc/php/7.3/mods-available
/etc/php/7.4/mods-available
/etc/php/7.0/cli/conf.d
/etc/php/7.1/cli/conf.d
/etc/php/7.2/cli/conf.d
/etc/php/7.3/cli/conf.d
/etc/php/7.4/cli/conf.d
/etc/php/7.0/fpm/conf.d
/etc/php/7.1/fpm/conf.d
/etc/php/7.2/fpm/conf.d
/etc/php/7.3/fpm/conf.d
/etc/php/7.4/fpm/conf.d
/usr/local/etc/php/conf.d/"
PHP_CONF_PATHS="/usr/local/etc/php/conf.d/"

function phpModuleRemove() {
if [ "$#" -ne 1 ]; then
Expand Down
21 changes: 0 additions & 21 deletions docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,5 @@
#!/usr/bin/env bash

IMAGE_FAMILY=$(docker-image-info family)

case "$IMAGE_FAMILY" in
Alpine)
# Fix php xdebug module [Alpine family]

if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then
go-replace --mode=lineinfile \
-s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
/etc/php5/conf.d/xdebug.ini
fi

if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then
go-replace --mode=lineinfile \
-s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \
/etc/php7/conf.d/xdebug.ini
fi

;;
esac

# Configure xdebug for development
go-replace --mode=lineinfile --regex \
-s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \
Expand Down
Loading