From 4d974e5d5a04bde2ad5beb157a971037d60bea23 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Tue, 17 Nov 2026 06:45:27 +0000 Subject: [PATCH 1/4] [TASK] Deprecate webdevops/php-official and build php from docker/php docker/php/ now holds the Dockerfiles of webdevops/php; docker/php-official and the links between the two directories are gone. The CI publishes the image as webdevops/php-official only for the tags listed under "docker: aliases" in conf/console.yml (8.2 to 8.5 and their -alpine tags), so new PHP versions get no php-official tag. - FileReader reads the deprecated names from conf/console.yml instead of renaming *-official images; generate:github-ci stops if the list names a tag that is not built. - ImageLinks is removed. - The published tags and the build jobs stay the same; only the build context of the php jobs changes from docker/php-official/ to docker/php/. - docs/discontinued-images.md describes the deprecation and the migration. --- .github/workflows/build.yaml | 48 +++++----- AGENTS.md | 6 +- CONTRIBUTING.md | 8 +- ci/src/Commands/GenerateGithubCiCommand.php | 24 +++++ ci/src/Dockerfile/DockerfileGenerator.php | 7 +- ci/src/Dockerfile/ImageLinks.php | 89 ------------------- ci/src/FileReader.php | 44 +++++++-- ci/src/ImageTests.php | 4 +- ci/src/TagDirectories.php | 4 +- .../Commands/GenerateGithubCiCommandTest.php | 27 +++++- .../Commands/GenerateProvisionCommandTest.php | 2 +- .../Dockerfile/DockerfileGeneratorTest.php | 24 ++--- ci/tests/Dockerfile/ImageLinksTest.php | 89 ------------------- ci/tests/FileReaderTest.php | 50 +++++++++-- ci/tests/Fixtures/repository/conf/console.yml | 4 + .../Fixtures/repository/conf/provision.yml | 2 +- ci/tests/Fixtures/repository/docker/php/8.4 | 1 - .../{php-official => php}/8.4/Dockerfile | 2 +- .../{php-official => php}/8.4/Dockerfile.twig | 0 ci/tests/Fixtures/repository/docker/php/8.5 | 1 - .../Fixtures/repository/docker/php/8.5-alpine | 1 - .../8.5-alpine/Dockerfile | 2 +- .../8.5-alpine/Dockerfile.twig | 0 .../{php-official => php}/8.5/Dockerfile | 2 +- .../{php-official => php}/8.5/Dockerfile.twig | 0 ci/tests/Provision/ProvisionerTest.php | 32 +++---- ci/tests/TagDirectoriesTest.php | 19 ++-- ci/tests/TemporaryRepository.php | 7 +- conf/console.yml | 6 ++ conf/provision.yml | 2 +- docker/php/8.2 | 1 - docker/php/8.2-alpine | 1 - .../8.2-alpine/Dockerfile | 2 +- .../8.2-alpine/Dockerfile.twig | 0 .../8.2-alpine/conf/VERSION | 0 .../8.2-alpine/conf/bin/bootstrap.sh | 0 .../8.2-alpine/conf/bin/config.sh | 0 .../8.2-alpine/conf/bin/control.sh | 0 .../8.2-alpine/conf/bin/entrypoint.d/cli.sh | 0 .../conf/bin/entrypoint.d/default.sh | 0 .../8.2-alpine/conf/bin/entrypoint.d/noop.sh | 0 .../8.2-alpine/conf/bin/entrypoint.d/root.sh | 0 .../conf/bin/entrypoint.d/supervisord.sh | 0 .../8.2-alpine/conf/bin/entrypoint.sh | 0 .../conf/bin/service.d/cron.d/10-init.sh | 0 .../8.2-alpine/conf/bin/service.d/cron.sh | 0 .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../8.2-alpine/conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/php-fpm.d/10-init.sh | 0 .../8.2-alpine/conf/bin/service.d/php-fpm.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../8.2-alpine/conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 0 .../8.2-alpine/conf/bin/service.d/ssh.sh | 0 .../bin/service.d/supervisor.d/10-init.sh | 0 .../conf/bin/service.d/supervisor.sh | 0 .../conf/bin/service.d/syslog-ng.d/10-init.sh | 0 .../conf/bin/service.d/syslog-ng.sh | 0 .../bin/usr-bin/container-file-auto-restore | 0 .../conf/bin/usr-bin/docker-cronjob | 0 .../conf/bin/usr-bin/docker-php-setting | 0 .../conf/bin/usr-bin/docker-service | 0 .../conf/bin/usr-bin/docker-service-disable | 0 .../conf/bin/usr-bin/docker-service-enable | 0 .../8.2-alpine/conf/bin/usr-bin/service | 0 .../conf/bin/usr-bin/version-compare | 0 .../8.2-alpine/conf/etc/cron/.gitkeep | 0 .../8.2-alpine/conf/etc/logrotate.d/syslog-ng | 0 .../8.2-alpine/conf/etc/php/conf.d/.gitkeep | 0 .../8.2-alpine/conf/etc/php/fpm/.gitkeep | 0 .../8.2-alpine/conf/etc/php/php.ini | 0 .../8.2-alpine/conf/etc/php/php.webdevops.ini | 0 .../8.2-alpine/conf/etc/supervisor.conf | 0 .../8.2-alpine/conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 0 .../conf/etc/supervisor.d/php-fpm.conf | 0 .../conf/etc/supervisor.d/postfix.conf | 0 .../8.2-alpine/conf/etc/supervisor.d/ssh.conf | 0 .../conf/etc/supervisor.d/syslog.conf | 0 .../conf/etc/syslog-ng/syslog-ng.conf | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 0 .../provision/bootstrap.d/10-permissions.sh | 0 .../conf/provision/bootstrap.d/10-php-init.sh | 0 .../provision/bootstrap.d/10-supervisor.sh | 0 .../bootstrap.d/10-user-application.sh | 0 .../conf/provision/bootstrap.d/11-php-conf.sh | 0 .../conf/provision/bootstrap.d/20-app.sh | 0 .../bootstrap.d/20-setup-php-fpm-pool.sh | 0 .../provision/bootstrap.d/20-setup-php-fpm.sh | 0 .../provision/bootstrap.d/20-setup-php.sh | 0 .../provision/bootstrap.d/30-setup-ioncube.sh | 0 .../conf/provision/bootstrap.d/90-cleanup.sh | 0 .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 0 .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 0 .../conf/provision/entrypoint.d/20-php.sh | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 0 .../conf/provision/service.d/dnsmasq.sh | 0 .../conf/provision/service.d/postfix.sh | 0 .../conf/provision/service.d/ssh.sh | 0 .../conf/provision/service.d/syslog.sh | 0 docker/{php-official => php}/8.2/Dockerfile | 2 +- .../{php-official => php}/8.2/Dockerfile.twig | 0 docker/{php-official => php}/8.2/conf/VERSION | 0 .../8.2/conf/bin/bootstrap.sh | 0 .../8.2/conf/bin/config.sh | 0 .../8.2/conf/bin/control.sh | 0 .../8.2/conf/bin/entrypoint.d/cli.sh | 0 .../8.2/conf/bin/entrypoint.d/default.sh | 0 .../8.2/conf/bin/entrypoint.d/noop.sh | 0 .../8.2/conf/bin/entrypoint.d/root.sh | 0 .../8.2/conf/bin/entrypoint.d/supervisord.sh | 0 .../8.2/conf/bin/entrypoint.sh | 0 .../8.2/conf/bin/service.d/cron.d/10-init.sh | 0 .../8.2/conf/bin/service.d/cron.sh | 0 .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../8.2/conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/php-fpm.d/10-init.sh | 0 .../8.2/conf/bin/service.d/php-fpm.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../8.2/conf/bin/service.d/postfix.sh | 0 .../8.2/conf/bin/service.d/ssh.d/10-init.sh | 0 .../8.2/conf/bin/service.d/ssh.sh | 0 .../bin/service.d/supervisor.d/10-init.sh | 0 .../8.2/conf/bin/service.d/supervisor.sh | 0 .../conf/bin/service.d/syslog-ng.d/10-init.sh | 0 .../8.2/conf/bin/service.d/syslog-ng.sh | 0 .../bin/usr-bin/container-file-auto-restore | 0 .../8.2/conf/bin/usr-bin/docker-cronjob | 0 .../8.2/conf/bin/usr-bin/docker-php-setting | 0 .../8.2/conf/bin/usr-bin/docker-service | 0 .../conf/bin/usr-bin/docker-service-disable | 0 .../conf/bin/usr-bin/docker-service-enable | 0 .../8.2/conf/bin/usr-bin/service | 0 .../8.2/conf/bin/usr-bin/version-compare | 0 .../8.2/conf/etc/cron/.gitkeep | 0 .../8.2/conf/etc/logrotate.d/syslog-ng | 0 .../8.2/conf/etc/php/conf.d/.gitkeep | 0 .../8.2/conf/etc/php/fpm/.gitkeep | 0 .../8.2/conf/etc/php/php.ini | 0 .../8.2/conf/etc/php/php.webdevops.ini | 0 .../8.2/conf/etc/supervisor.conf | 0 .../8.2/conf/etc/supervisor.d/.gitkeep | 0 .../8.2/conf/etc/supervisor.d/cron.conf | 0 .../8.2/conf/etc/supervisor.d/dnsmasq.conf | 0 .../8.2/conf/etc/supervisor.d/php-fpm.conf | 0 .../8.2/conf/etc/supervisor.d/postfix.conf | 0 .../8.2/conf/etc/supervisor.d/ssh.conf | 0 .../8.2/conf/etc/supervisor.d/syslog.conf | 0 .../8.2/conf/etc/syslog-ng/syslog-ng.conf | 0 .../8.2/conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 0 .../provision/bootstrap.d/10-permissions.sh | 0 .../conf/provision/bootstrap.d/10-php-init.sh | 0 .../provision/bootstrap.d/10-supervisor.sh | 0 .../bootstrap.d/10-user-application.sh | 0 .../conf/provision/bootstrap.d/11-php-conf.sh | 0 .../8.2/conf/provision/bootstrap.d/20-app.sh | 0 .../bootstrap.d/20-setup-php-fpm-pool.sh | 0 .../provision/bootstrap.d/20-setup-php-fpm.sh | 0 .../provision/bootstrap.d/20-setup-php.sh | 0 .../provision/bootstrap.d/30-setup-ioncube.sh | 0 .../conf/provision/bootstrap.d/90-cleanup.sh | 0 .../8.2/conf/provision/build.d/.gitkeep | 0 .../8.2/conf/provision/build.d/10-cleanup.sh | 0 .../8.2/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 0 .../8.2/conf/provision/entrypoint.d/20-php.sh | 0 .../8.2/conf/provision/service.d/.gitkeep | 0 .../8.2/conf/provision/service.d/cron.sh | 0 .../8.2/conf/provision/service.d/dnsmasq.sh | 0 .../8.2/conf/provision/service.d/postfix.sh | 0 .../8.2/conf/provision/service.d/ssh.sh | 0 .../8.2/conf/provision/service.d/syslog.sh | 0 docker/php/8.3 | 1 - docker/php/8.3-alpine | 1 - .../8.3-alpine/Dockerfile | 2 +- .../8.3-alpine/Dockerfile.twig | 0 .../8.3-alpine/conf/VERSION | 0 .../8.3-alpine/conf/bin/bootstrap.sh | 0 .../8.3-alpine/conf/bin/config.sh | 0 .../8.3-alpine/conf/bin/control.sh | 0 .../8.3-alpine/conf/bin/entrypoint.d/cli.sh | 0 .../conf/bin/entrypoint.d/default.sh | 0 .../8.3-alpine/conf/bin/entrypoint.d/noop.sh | 0 .../8.3-alpine/conf/bin/entrypoint.d/root.sh | 0 .../conf/bin/entrypoint.d/supervisord.sh | 0 .../8.3-alpine/conf/bin/entrypoint.sh | 0 .../conf/bin/service.d/cron.d/10-init.sh | 0 .../8.3-alpine/conf/bin/service.d/cron.sh | 0 .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../8.3-alpine/conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/php-fpm.d/10-init.sh | 0 .../8.3-alpine/conf/bin/service.d/php-fpm.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../8.3-alpine/conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 0 .../8.3-alpine/conf/bin/service.d/ssh.sh | 0 .../bin/service.d/supervisor.d/10-init.sh | 0 .../conf/bin/service.d/supervisor.sh | 0 .../conf/bin/service.d/syslog-ng.d/10-init.sh | 0 .../conf/bin/service.d/syslog-ng.sh | 0 .../bin/usr-bin/container-file-auto-restore | 0 .../conf/bin/usr-bin/docker-cronjob | 0 .../conf/bin/usr-bin/docker-php-setting | 0 .../conf/bin/usr-bin/docker-service | 0 .../conf/bin/usr-bin/docker-service-disable | 0 .../conf/bin/usr-bin/docker-service-enable | 0 .../8.3-alpine/conf/bin/usr-bin/service | 0 .../conf/bin/usr-bin/version-compare | 0 .../8.3-alpine/conf/etc/cron/.gitkeep | 0 .../8.3-alpine/conf/etc/logrotate.d/syslog-ng | 0 .../8.3-alpine/conf/etc/php/conf.d/.gitkeep | 0 .../8.3-alpine/conf/etc/php/fpm/.gitkeep | 0 .../8.3-alpine/conf/etc/php/php.ini | 0 .../8.3-alpine/conf/etc/php/php.webdevops.ini | 0 .../8.3-alpine/conf/etc/supervisor.conf | 0 .../8.3-alpine/conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 0 .../conf/etc/supervisor.d/php-fpm.conf | 0 .../conf/etc/supervisor.d/postfix.conf | 0 .../8.3-alpine/conf/etc/supervisor.d/ssh.conf | 0 .../conf/etc/supervisor.d/syslog.conf | 0 .../conf/etc/syslog-ng/syslog-ng.conf | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 0 .../provision/bootstrap.d/10-permissions.sh | 0 .../conf/provision/bootstrap.d/10-php-init.sh | 0 .../provision/bootstrap.d/10-supervisor.sh | 0 .../bootstrap.d/10-user-application.sh | 0 .../conf/provision/bootstrap.d/11-php-conf.sh | 0 .../conf/provision/bootstrap.d/20-app.sh | 0 .../bootstrap.d/20-setup-php-fpm-pool.sh | 0 .../provision/bootstrap.d/20-setup-php-fpm.sh | 0 .../provision/bootstrap.d/20-setup-php.sh | 0 .../provision/bootstrap.d/30-setup-ioncube.sh | 0 .../conf/provision/bootstrap.d/90-cleanup.sh | 0 .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 0 .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 0 .../conf/provision/entrypoint.d/20-php.sh | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 0 .../conf/provision/service.d/dnsmasq.sh | 0 .../conf/provision/service.d/postfix.sh | 0 .../conf/provision/service.d/ssh.sh | 0 .../conf/provision/service.d/syslog.sh | 0 docker/{php-official => php}/8.3/Dockerfile | 2 +- .../{php-official => php}/8.3/Dockerfile.twig | 0 docker/{php-official => php}/8.3/conf/VERSION | 0 .../8.3/conf/bin/bootstrap.sh | 0 .../8.3/conf/bin/config.sh | 0 .../8.3/conf/bin/control.sh | 0 .../8.3/conf/bin/entrypoint.d/cli.sh | 0 .../8.3/conf/bin/entrypoint.d/default.sh | 0 .../8.3/conf/bin/entrypoint.d/noop.sh | 0 .../8.3/conf/bin/entrypoint.d/root.sh | 0 .../8.3/conf/bin/entrypoint.d/supervisord.sh | 0 .../8.3/conf/bin/entrypoint.sh | 0 .../8.3/conf/bin/service.d/cron.d/10-init.sh | 0 .../8.3/conf/bin/service.d/cron.sh | 0 .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../8.3/conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/php-fpm.d/10-init.sh | 0 .../8.3/conf/bin/service.d/php-fpm.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../8.3/conf/bin/service.d/postfix.sh | 0 .../8.3/conf/bin/service.d/ssh.d/10-init.sh | 0 .../8.3/conf/bin/service.d/ssh.sh | 0 .../bin/service.d/supervisor.d/10-init.sh | 0 .../8.3/conf/bin/service.d/supervisor.sh | 0 .../conf/bin/service.d/syslog-ng.d/10-init.sh | 0 .../8.3/conf/bin/service.d/syslog-ng.sh | 0 .../bin/usr-bin/container-file-auto-restore | 0 .../8.3/conf/bin/usr-bin/docker-cronjob | 0 .../8.3/conf/bin/usr-bin/docker-php-setting | 0 .../8.3/conf/bin/usr-bin/docker-service | 0 .../conf/bin/usr-bin/docker-service-disable | 0 .../conf/bin/usr-bin/docker-service-enable | 0 .../8.3/conf/bin/usr-bin/service | 0 .../8.3/conf/bin/usr-bin/version-compare | 0 .../8.3/conf/etc/cron/.gitkeep | 0 .../8.3/conf/etc/logrotate.d/syslog-ng | 0 .../8.3/conf/etc/php/conf.d/.gitkeep | 0 .../8.3/conf/etc/php/fpm/.gitkeep | 0 .../8.3/conf/etc/php/php.ini | 0 .../8.3/conf/etc/php/php.webdevops.ini | 0 .../8.3/conf/etc/supervisor.conf | 0 .../8.3/conf/etc/supervisor.d/.gitkeep | 0 .../8.3/conf/etc/supervisor.d/cron.conf | 0 .../8.3/conf/etc/supervisor.d/dnsmasq.conf | 0 .../8.3/conf/etc/supervisor.d/php-fpm.conf | 0 .../8.3/conf/etc/supervisor.d/postfix.conf | 0 .../8.3/conf/etc/supervisor.d/ssh.conf | 0 .../8.3/conf/etc/supervisor.d/syslog.conf | 0 .../8.3/conf/etc/syslog-ng/syslog-ng.conf | 0 .../8.3/conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 0 .../provision/bootstrap.d/10-permissions.sh | 0 .../conf/provision/bootstrap.d/10-php-init.sh | 0 .../provision/bootstrap.d/10-supervisor.sh | 0 .../bootstrap.d/10-user-application.sh | 0 .../conf/provision/bootstrap.d/11-php-conf.sh | 0 .../8.3/conf/provision/bootstrap.d/20-app.sh | 0 .../bootstrap.d/20-setup-php-fpm-pool.sh | 0 .../provision/bootstrap.d/20-setup-php-fpm.sh | 0 .../provision/bootstrap.d/20-setup-php.sh | 0 .../provision/bootstrap.d/30-setup-ioncube.sh | 0 .../conf/provision/bootstrap.d/90-cleanup.sh | 0 .../8.3/conf/provision/build.d/.gitkeep | 0 .../8.3/conf/provision/build.d/10-cleanup.sh | 0 .../8.3/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 0 .../8.3/conf/provision/entrypoint.d/20-php.sh | 0 .../8.3/conf/provision/service.d/.gitkeep | 0 .../8.3/conf/provision/service.d/cron.sh | 0 .../8.3/conf/provision/service.d/dnsmasq.sh | 0 .../8.3/conf/provision/service.d/postfix.sh | 0 .../8.3/conf/provision/service.d/ssh.sh | 0 .../8.3/conf/provision/service.d/syslog.sh | 0 docker/php/8.4 | 1 - docker/php/8.4-alpine | 1 - .../8.4-alpine/Dockerfile | 2 +- .../8.4-alpine/Dockerfile.twig | 0 .../8.4-alpine/conf/VERSION | 0 .../8.4-alpine/conf/bin/bootstrap.sh | 0 .../8.4-alpine/conf/bin/config.sh | 0 .../8.4-alpine/conf/bin/control.sh | 0 .../8.4-alpine/conf/bin/entrypoint.d/cli.sh | 0 .../conf/bin/entrypoint.d/default.sh | 0 .../8.4-alpine/conf/bin/entrypoint.d/noop.sh | 0 .../8.4-alpine/conf/bin/entrypoint.d/root.sh | 0 .../conf/bin/entrypoint.d/supervisord.sh | 0 .../8.4-alpine/conf/bin/entrypoint.sh | 0 .../conf/bin/service.d/cron.d/10-init.sh | 0 .../8.4-alpine/conf/bin/service.d/cron.sh | 0 .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../8.4-alpine/conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/php-fpm.d/10-init.sh | 0 .../8.4-alpine/conf/bin/service.d/php-fpm.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../8.4-alpine/conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 0 .../8.4-alpine/conf/bin/service.d/ssh.sh | 0 .../bin/service.d/supervisor.d/10-init.sh | 0 .../conf/bin/service.d/supervisor.sh | 0 .../conf/bin/service.d/syslog-ng.d/10-init.sh | 0 .../conf/bin/service.d/syslog-ng.sh | 0 .../bin/usr-bin/container-file-auto-restore | 0 .../conf/bin/usr-bin/docker-cronjob | 0 .../conf/bin/usr-bin/docker-php-setting | 0 .../conf/bin/usr-bin/docker-service | 0 .../conf/bin/usr-bin/docker-service-disable | 0 .../conf/bin/usr-bin/docker-service-enable | 0 .../8.4-alpine/conf/bin/usr-bin/service | 0 .../conf/bin/usr-bin/version-compare | 0 .../8.4-alpine/conf/etc/cron/.gitkeep | 0 .../8.4-alpine/conf/etc/logrotate.d/syslog-ng | 0 .../8.4-alpine/conf/etc/php/conf.d/.gitkeep | 0 .../8.4-alpine/conf/etc/php/fpm/.gitkeep | 0 .../8.4-alpine/conf/etc/php/php.ini | 0 .../8.4-alpine/conf/etc/php/php.webdevops.ini | 0 .../8.4-alpine/conf/etc/supervisor.conf | 0 .../8.4-alpine/conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 0 .../conf/etc/supervisor.d/php-fpm.conf | 0 .../conf/etc/supervisor.d/postfix.conf | 0 .../8.4-alpine/conf/etc/supervisor.d/ssh.conf | 0 .../conf/etc/supervisor.d/syslog.conf | 0 .../conf/etc/syslog-ng/syslog-ng.conf | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 0 .../provision/bootstrap.d/10-permissions.sh | 0 .../conf/provision/bootstrap.d/10-php-init.sh | 0 .../provision/bootstrap.d/10-supervisor.sh | 0 .../bootstrap.d/10-user-application.sh | 0 .../conf/provision/bootstrap.d/11-php-conf.sh | 0 .../conf/provision/bootstrap.d/20-app.sh | 0 .../bootstrap.d/20-setup-php-fpm-pool.sh | 0 .../provision/bootstrap.d/20-setup-php-fpm.sh | 0 .../provision/bootstrap.d/20-setup-php.sh | 0 .../provision/bootstrap.d/30-setup-ioncube.sh | 0 .../conf/provision/bootstrap.d/90-cleanup.sh | 0 .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 0 .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 0 .../conf/provision/entrypoint.d/20-php.sh | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 0 .../conf/provision/service.d/dnsmasq.sh | 0 .../conf/provision/service.d/postfix.sh | 0 .../conf/provision/service.d/ssh.sh | 0 .../conf/provision/service.d/syslog.sh | 0 docker/{php-official => php}/8.4/Dockerfile | 2 +- .../{php-official => php}/8.4/Dockerfile.twig | 0 docker/{php-official => php}/8.4/conf/VERSION | 0 .../8.4/conf/bin/bootstrap.sh | 0 .../8.4/conf/bin/config.sh | 0 .../8.4/conf/bin/control.sh | 0 .../8.4/conf/bin/entrypoint.d/cli.sh | 0 .../8.4/conf/bin/entrypoint.d/default.sh | 0 .../8.4/conf/bin/entrypoint.d/noop.sh | 0 .../8.4/conf/bin/entrypoint.d/root.sh | 0 .../8.4/conf/bin/entrypoint.d/supervisord.sh | 0 .../8.4/conf/bin/entrypoint.sh | 0 .../8.4/conf/bin/service.d/cron.d/10-init.sh | 0 .../8.4/conf/bin/service.d/cron.sh | 0 .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../8.4/conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/php-fpm.d/10-init.sh | 0 .../8.4/conf/bin/service.d/php-fpm.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../8.4/conf/bin/service.d/postfix.sh | 0 .../8.4/conf/bin/service.d/ssh.d/10-init.sh | 0 .../8.4/conf/bin/service.d/ssh.sh | 0 .../bin/service.d/supervisor.d/10-init.sh | 0 .../8.4/conf/bin/service.d/supervisor.sh | 0 .../conf/bin/service.d/syslog-ng.d/10-init.sh | 0 .../8.4/conf/bin/service.d/syslog-ng.sh | 0 .../bin/usr-bin/container-file-auto-restore | 0 .../8.4/conf/bin/usr-bin/docker-cronjob | 0 .../8.4/conf/bin/usr-bin/docker-php-setting | 0 .../8.4/conf/bin/usr-bin/docker-service | 0 .../conf/bin/usr-bin/docker-service-disable | 0 .../conf/bin/usr-bin/docker-service-enable | 0 .../8.4/conf/bin/usr-bin/service | 0 .../8.4/conf/bin/usr-bin/version-compare | 0 .../8.4/conf/etc/cron/.gitkeep | 0 .../8.4/conf/etc/logrotate.d/syslog-ng | 0 .../8.4/conf/etc/php/conf.d/.gitkeep | 0 .../8.4/conf/etc/php/fpm/.gitkeep | 0 .../8.4/conf/etc/php/php.ini | 0 .../8.4/conf/etc/php/php.webdevops.ini | 0 .../8.4/conf/etc/supervisor.conf | 0 .../8.4/conf/etc/supervisor.d/.gitkeep | 0 .../8.4/conf/etc/supervisor.d/cron.conf | 0 .../8.4/conf/etc/supervisor.d/dnsmasq.conf | 0 .../8.4/conf/etc/supervisor.d/php-fpm.conf | 0 .../8.4/conf/etc/supervisor.d/postfix.conf | 0 .../8.4/conf/etc/supervisor.d/ssh.conf | 0 .../8.4/conf/etc/supervisor.d/syslog.conf | 0 .../8.4/conf/etc/syslog-ng/syslog-ng.conf | 0 .../8.4/conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 0 .../provision/bootstrap.d/10-permissions.sh | 0 .../conf/provision/bootstrap.d/10-php-init.sh | 0 .../provision/bootstrap.d/10-supervisor.sh | 0 .../bootstrap.d/10-user-application.sh | 0 .../conf/provision/bootstrap.d/11-php-conf.sh | 0 .../8.4/conf/provision/bootstrap.d/20-app.sh | 0 .../bootstrap.d/20-setup-php-fpm-pool.sh | 0 .../provision/bootstrap.d/20-setup-php-fpm.sh | 0 .../provision/bootstrap.d/20-setup-php.sh | 0 .../provision/bootstrap.d/30-setup-ioncube.sh | 0 .../conf/provision/bootstrap.d/90-cleanup.sh | 0 .../8.4/conf/provision/build.d/.gitkeep | 0 .../8.4/conf/provision/build.d/10-cleanup.sh | 0 .../8.4/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 0 .../8.4/conf/provision/entrypoint.d/20-php.sh | 0 .../8.4/conf/provision/service.d/.gitkeep | 0 .../8.4/conf/provision/service.d/cron.sh | 0 .../8.4/conf/provision/service.d/dnsmasq.sh | 0 .../8.4/conf/provision/service.d/postfix.sh | 0 .../8.4/conf/provision/service.d/ssh.sh | 0 .../8.4/conf/provision/service.d/syslog.sh | 0 docker/php/8.5 | 1 - docker/php/8.5-alpine | 1 - .../8.5-alpine/Dockerfile | 2 +- .../8.5-alpine/Dockerfile.twig | 0 .../8.5-alpine/conf/VERSION | 0 .../8.5-alpine/conf/bin/bootstrap.sh | 0 .../8.5-alpine/conf/bin/config.sh | 0 .../8.5-alpine/conf/bin/control.sh | 0 .../8.5-alpine/conf/bin/entrypoint.d/cli.sh | 0 .../conf/bin/entrypoint.d/default.sh | 0 .../8.5-alpine/conf/bin/entrypoint.d/noop.sh | 0 .../8.5-alpine/conf/bin/entrypoint.d/root.sh | 0 .../conf/bin/entrypoint.d/supervisord.sh | 0 .../8.5-alpine/conf/bin/entrypoint.sh | 0 .../conf/bin/service.d/cron.d/10-init.sh | 0 .../8.5-alpine/conf/bin/service.d/cron.sh | 0 .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../8.5-alpine/conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/php-fpm.d/10-init.sh | 0 .../8.5-alpine/conf/bin/service.d/php-fpm.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../8.5-alpine/conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 0 .../8.5-alpine/conf/bin/service.d/ssh.sh | 0 .../bin/service.d/supervisor.d/10-init.sh | 0 .../conf/bin/service.d/supervisor.sh | 0 .../conf/bin/service.d/syslog-ng.d/10-init.sh | 0 .../conf/bin/service.d/syslog-ng.sh | 0 .../bin/usr-bin/container-file-auto-restore | 0 .../conf/bin/usr-bin/docker-cronjob | 0 .../conf/bin/usr-bin/docker-php-setting | 0 .../conf/bin/usr-bin/docker-service | 0 .../conf/bin/usr-bin/docker-service-disable | 0 .../conf/bin/usr-bin/docker-service-enable | 0 .../8.5-alpine/conf/bin/usr-bin/service | 0 .../conf/bin/usr-bin/version-compare | 0 .../8.5-alpine/conf/etc/cron/.gitkeep | 0 .../8.5-alpine/conf/etc/logrotate.d/syslog-ng | 0 .../8.5-alpine/conf/etc/php/conf.d/.gitkeep | 0 .../8.5-alpine/conf/etc/php/fpm/.gitkeep | 0 .../8.5-alpine/conf/etc/php/php.ini | 0 .../8.5-alpine/conf/etc/php/php.webdevops.ini | 0 .../8.5-alpine/conf/etc/supervisor.conf | 0 .../8.5-alpine/conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 0 .../conf/etc/supervisor.d/php-fpm.conf | 0 .../conf/etc/supervisor.d/postfix.conf | 0 .../8.5-alpine/conf/etc/supervisor.d/ssh.conf | 0 .../conf/etc/supervisor.d/syslog.conf | 0 .../conf/etc/syslog-ng/syslog-ng.conf | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 0 .../provision/bootstrap.d/10-permissions.sh | 0 .../conf/provision/bootstrap.d/10-php-init.sh | 0 .../provision/bootstrap.d/10-supervisor.sh | 0 .../bootstrap.d/10-user-application.sh | 0 .../conf/provision/bootstrap.d/11-php-conf.sh | 0 .../conf/provision/bootstrap.d/20-app.sh | 0 .../bootstrap.d/20-setup-php-fpm-pool.sh | 0 .../provision/bootstrap.d/20-setup-php-fpm.sh | 0 .../provision/bootstrap.d/20-setup-php.sh | 0 .../provision/bootstrap.d/30-setup-ioncube.sh | 0 .../conf/provision/bootstrap.d/90-cleanup.sh | 0 .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 0 .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 0 .../conf/provision/entrypoint.d/20-php.sh | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 0 .../conf/provision/service.d/dnsmasq.sh | 0 .../conf/provision/service.d/postfix.sh | 0 .../conf/provision/service.d/ssh.sh | 0 .../conf/provision/service.d/syslog.sh | 0 docker/{php-official => php}/8.5/Dockerfile | 2 +- .../{php-official => php}/8.5/Dockerfile.twig | 0 docker/{php-official => php}/8.5/conf/VERSION | 0 .../8.5/conf/bin/bootstrap.sh | 0 .../8.5/conf/bin/config.sh | 0 .../8.5/conf/bin/control.sh | 0 .../8.5/conf/bin/entrypoint.d/cli.sh | 0 .../8.5/conf/bin/entrypoint.d/default.sh | 0 .../8.5/conf/bin/entrypoint.d/noop.sh | 0 .../8.5/conf/bin/entrypoint.d/root.sh | 0 .../8.5/conf/bin/entrypoint.d/supervisord.sh | 0 .../8.5/conf/bin/entrypoint.sh | 0 .../8.5/conf/bin/service.d/cron.d/10-init.sh | 0 .../8.5/conf/bin/service.d/cron.sh | 0 .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../8.5/conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/php-fpm.d/10-init.sh | 0 .../8.5/conf/bin/service.d/php-fpm.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../8.5/conf/bin/service.d/postfix.sh | 0 .../8.5/conf/bin/service.d/ssh.d/10-init.sh | 0 .../8.5/conf/bin/service.d/ssh.sh | 0 .../bin/service.d/supervisor.d/10-init.sh | 0 .../8.5/conf/bin/service.d/supervisor.sh | 0 .../conf/bin/service.d/syslog-ng.d/10-init.sh | 0 .../8.5/conf/bin/service.d/syslog-ng.sh | 0 .../bin/usr-bin/container-file-auto-restore | 0 .../8.5/conf/bin/usr-bin/docker-cronjob | 0 .../8.5/conf/bin/usr-bin/docker-php-setting | 0 .../8.5/conf/bin/usr-bin/docker-service | 0 .../conf/bin/usr-bin/docker-service-disable | 0 .../conf/bin/usr-bin/docker-service-enable | 0 .../8.5/conf/bin/usr-bin/service | 0 .../8.5/conf/bin/usr-bin/version-compare | 0 .../8.5/conf/etc/cron/.gitkeep | 0 .../8.5/conf/etc/logrotate.d/syslog-ng | 0 .../8.5/conf/etc/php/conf.d/.gitkeep | 0 .../8.5/conf/etc/php/fpm/.gitkeep | 0 .../8.5/conf/etc/php/php.ini | 0 .../8.5/conf/etc/php/php.webdevops.ini | 0 .../8.5/conf/etc/supervisor.conf | 0 .../8.5/conf/etc/supervisor.d/.gitkeep | 0 .../8.5/conf/etc/supervisor.d/cron.conf | 0 .../8.5/conf/etc/supervisor.d/dnsmasq.conf | 0 .../8.5/conf/etc/supervisor.d/php-fpm.conf | 0 .../8.5/conf/etc/supervisor.d/postfix.conf | 0 .../8.5/conf/etc/supervisor.d/ssh.conf | 0 .../8.5/conf/etc/supervisor.d/syslog.conf | 0 .../8.5/conf/etc/syslog-ng/syslog-ng.conf | 0 .../8.5/conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 0 .../provision/bootstrap.d/10-permissions.sh | 0 .../conf/provision/bootstrap.d/10-php-init.sh | 0 .../provision/bootstrap.d/10-supervisor.sh | 0 .../bootstrap.d/10-user-application.sh | 0 .../conf/provision/bootstrap.d/11-php-conf.sh | 0 .../8.5/conf/provision/bootstrap.d/20-app.sh | 0 .../bootstrap.d/20-setup-php-fpm-pool.sh | 0 .../provision/bootstrap.d/20-setup-php-fpm.sh | 0 .../provision/bootstrap.d/20-setup-php.sh | 0 .../provision/bootstrap.d/30-setup-ioncube.sh | 0 .../conf/provision/bootstrap.d/90-cleanup.sh | 0 .../8.5/conf/provision/build.d/.gitkeep | 0 .../8.5/conf/provision/build.d/10-cleanup.sh | 0 .../8.5/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 0 .../8.5/conf/provision/entrypoint.d/20-php.sh | 0 .../8.5/conf/provision/service.d/.gitkeep | 0 .../8.5/conf/provision/service.d/cron.sh | 0 .../8.5/conf/provision/service.d/dnsmasq.sh | 0 .../8.5/conf/provision/service.d/postfix.sh | 0 .../8.5/conf/provision/service.d/ssh.sh | 0 .../8.5/conf/provision/service.d/syslog.sh | 0 docs/README.md | 4 +- docs/discontinued-images.md | 13 ++- docs/images/php.md | 2 +- 633 files changed, 245 insertions(+), 305 deletions(-) delete mode 100644 ci/src/Dockerfile/ImageLinks.php delete mode 100644 ci/tests/Dockerfile/ImageLinksTest.php delete mode 120000 ci/tests/Fixtures/repository/docker/php/8.4 rename ci/tests/Fixtures/repository/docker/{php-official => php}/8.4/Dockerfile (82%) rename ci/tests/Fixtures/repository/docker/{php-official => php}/8.4/Dockerfile.twig (100%) delete mode 120000 ci/tests/Fixtures/repository/docker/php/8.5 delete mode 120000 ci/tests/Fixtures/repository/docker/php/8.5-alpine rename ci/tests/Fixtures/repository/docker/{php-official => php}/8.5-alpine/Dockerfile (79%) rename ci/tests/Fixtures/repository/docker/{php-official => php}/8.5-alpine/Dockerfile.twig (100%) rename ci/tests/Fixtures/repository/docker/{php-official => php}/8.5/Dockerfile (81%) rename ci/tests/Fixtures/repository/docker/{php-official => php}/8.5/Dockerfile.twig (100%) delete mode 120000 docker/php/8.2 delete mode 120000 docker/php/8.2-alpine rename docker/{php-official => php}/8.2-alpine/Dockerfile (99%) rename docker/{php-official => php}/8.2-alpine/Dockerfile.twig (100%) rename docker/{php-official => php}/8.2-alpine/conf/VERSION (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/bootstrap.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/config.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/control.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/entrypoint.d/cli.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/entrypoint.d/default.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/entrypoint.d/noop.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/entrypoint.d/root.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/entrypoint.d/supervisord.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/entrypoint.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/service.d/cron.d/10-init.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/service.d/cron.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/service.d/php-fpm.d/10-init.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/service.d/php-fpm.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/service.d/postfix.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/service.d/ssh.d/10-init.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/service.d/ssh.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/service.d/supervisor.d/10-init.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/service.d/supervisor.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/service.d/syslog-ng.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/usr-bin/container-file-auto-restore (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/usr-bin/docker-cronjob (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/usr-bin/docker-php-setting (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/usr-bin/docker-service (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/usr-bin/docker-service-disable (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/usr-bin/docker-service-enable (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/usr-bin/service (100%) rename docker/{php-official => php}/8.2-alpine/conf/bin/usr-bin/version-compare (100%) rename docker/{php-official => php}/8.2-alpine/conf/etc/cron/.gitkeep (100%) rename docker/{php-official => php}/8.2-alpine/conf/etc/logrotate.d/syslog-ng (100%) rename docker/{php-official => php}/8.2-alpine/conf/etc/php/conf.d/.gitkeep (100%) rename docker/{php-official => php}/8.2-alpine/conf/etc/php/fpm/.gitkeep (100%) rename docker/{php-official => php}/8.2-alpine/conf/etc/php/php.ini (100%) rename docker/{php-official => php}/8.2-alpine/conf/etc/php/php.webdevops.ini (100%) rename docker/{php-official => php}/8.2-alpine/conf/etc/supervisor.conf (100%) rename docker/{php-official => php}/8.2-alpine/conf/etc/supervisor.d/.gitkeep (100%) rename docker/{php-official => php}/8.2-alpine/conf/etc/supervisor.d/cron.conf (100%) rename docker/{php-official => php}/8.2-alpine/conf/etc/supervisor.d/dnsmasq.conf (100%) rename docker/{php-official => php}/8.2-alpine/conf/etc/supervisor.d/php-fpm.conf (100%) rename docker/{php-official => php}/8.2-alpine/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{php-official => php}/8.2-alpine/conf/etc/supervisor.d/ssh.conf (100%) rename docker/{php-official => php}/8.2-alpine/conf/etc/supervisor.d/syslog.conf (100%) rename docker/{php-official => php}/8.2-alpine/conf/etc/syslog-ng/syslog-ng.conf (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/bootstrap.d/.gitkeep (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/bootstrap.d/10-entrypoint.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/bootstrap.d/10-permissions.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/bootstrap.d/10-php-init.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/bootstrap.d/10-supervisor.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/bootstrap.d/10-user-application.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/bootstrap.d/11-php-conf.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/bootstrap.d/20-app.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/bootstrap.d/20-setup-php.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/bootstrap.d/90-cleanup.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/build.d/.gitkeep (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/build.d/10-cleanup.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/entrypoint.d/.gitkeep (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/entrypoint.d/05-permissions.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/entrypoint.d/20-php-fpm.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/entrypoint.d/20-php.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/service.d/.gitkeep (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/service.d/cron.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/service.d/dnsmasq.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/service.d/postfix.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/service.d/ssh.sh (100%) rename docker/{php-official => php}/8.2-alpine/conf/provision/service.d/syslog.sh (100%) rename docker/{php-official => php}/8.2/Dockerfile (99%) rename docker/{php-official => php}/8.2/Dockerfile.twig (100%) rename docker/{php-official => php}/8.2/conf/VERSION (100%) rename docker/{php-official => php}/8.2/conf/bin/bootstrap.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/config.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/control.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/entrypoint.d/cli.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/entrypoint.d/default.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/entrypoint.d/noop.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/entrypoint.d/root.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/entrypoint.d/supervisord.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/entrypoint.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/service.d/cron.d/10-init.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/service.d/cron.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/service.d/php-fpm.d/10-init.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/service.d/php-fpm.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/service.d/postfix.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/service.d/ssh.d/10-init.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/service.d/ssh.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/service.d/supervisor.d/10-init.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/service.d/supervisor.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/service.d/syslog-ng.d/10-init.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/service.d/syslog-ng.sh (100%) rename docker/{php-official => php}/8.2/conf/bin/usr-bin/container-file-auto-restore (100%) rename docker/{php-official => php}/8.2/conf/bin/usr-bin/docker-cronjob (100%) rename docker/{php-official => php}/8.2/conf/bin/usr-bin/docker-php-setting (100%) rename docker/{php-official => php}/8.2/conf/bin/usr-bin/docker-service (100%) rename docker/{php-official => php}/8.2/conf/bin/usr-bin/docker-service-disable (100%) rename docker/{php-official => php}/8.2/conf/bin/usr-bin/docker-service-enable (100%) rename docker/{php-official => php}/8.2/conf/bin/usr-bin/service (100%) rename docker/{php-official => php}/8.2/conf/bin/usr-bin/version-compare (100%) rename docker/{php-official => php}/8.2/conf/etc/cron/.gitkeep (100%) rename docker/{php-official => php}/8.2/conf/etc/logrotate.d/syslog-ng (100%) rename docker/{php-official => php}/8.2/conf/etc/php/conf.d/.gitkeep (100%) rename docker/{php-official => php}/8.2/conf/etc/php/fpm/.gitkeep (100%) rename docker/{php-official => php}/8.2/conf/etc/php/php.ini (100%) rename docker/{php-official => php}/8.2/conf/etc/php/php.webdevops.ini (100%) rename docker/{php-official => php}/8.2/conf/etc/supervisor.conf (100%) rename docker/{php-official => php}/8.2/conf/etc/supervisor.d/.gitkeep (100%) rename docker/{php-official => php}/8.2/conf/etc/supervisor.d/cron.conf (100%) rename docker/{php-official => php}/8.2/conf/etc/supervisor.d/dnsmasq.conf (100%) rename docker/{php-official => php}/8.2/conf/etc/supervisor.d/php-fpm.conf (100%) rename docker/{php-official => php}/8.2/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{php-official => php}/8.2/conf/etc/supervisor.d/ssh.conf (100%) rename docker/{php-official => php}/8.2/conf/etc/supervisor.d/syslog.conf (100%) rename docker/{php-official => php}/8.2/conf/etc/syslog-ng/syslog-ng.conf (100%) rename docker/{php-official => php}/8.2/conf/provision/bootstrap.d/.gitkeep (100%) rename docker/{php-official => php}/8.2/conf/provision/bootstrap.d/10-entrypoint.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/bootstrap.d/10-permissions.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/bootstrap.d/10-php-init.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/bootstrap.d/10-supervisor.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/bootstrap.d/10-user-application.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/bootstrap.d/11-php-conf.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/bootstrap.d/20-app.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/bootstrap.d/20-setup-php-fpm.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/bootstrap.d/20-setup-php.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/bootstrap.d/30-setup-ioncube.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/bootstrap.d/90-cleanup.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/build.d/.gitkeep (100%) rename docker/{php-official => php}/8.2/conf/provision/build.d/10-cleanup.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/entrypoint.d/.gitkeep (100%) rename docker/{php-official => php}/8.2/conf/provision/entrypoint.d/05-permissions.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/entrypoint.d/20-php-fpm.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/entrypoint.d/20-php.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/service.d/.gitkeep (100%) rename docker/{php-official => php}/8.2/conf/provision/service.d/cron.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/service.d/dnsmasq.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/service.d/postfix.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/service.d/ssh.sh (100%) rename docker/{php-official => php}/8.2/conf/provision/service.d/syslog.sh (100%) delete mode 120000 docker/php/8.3 delete mode 120000 docker/php/8.3-alpine rename docker/{php-official => php}/8.3-alpine/Dockerfile (99%) rename docker/{php-official => php}/8.3-alpine/Dockerfile.twig (100%) rename docker/{php-official => php}/8.3-alpine/conf/VERSION (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/bootstrap.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/config.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/control.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/entrypoint.d/cli.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/entrypoint.d/default.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/entrypoint.d/noop.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/entrypoint.d/root.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/entrypoint.d/supervisord.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/entrypoint.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/service.d/cron.d/10-init.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/service.d/cron.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/service.d/php-fpm.d/10-init.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/service.d/php-fpm.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/service.d/postfix.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/service.d/ssh.d/10-init.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/service.d/ssh.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/service.d/supervisor.d/10-init.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/service.d/supervisor.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/service.d/syslog-ng.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/usr-bin/container-file-auto-restore (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/usr-bin/docker-cronjob (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/usr-bin/docker-php-setting (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/usr-bin/docker-service (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/usr-bin/docker-service-disable (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/usr-bin/docker-service-enable (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/usr-bin/service (100%) rename docker/{php-official => php}/8.3-alpine/conf/bin/usr-bin/version-compare (100%) rename docker/{php-official => php}/8.3-alpine/conf/etc/cron/.gitkeep (100%) rename docker/{php-official => php}/8.3-alpine/conf/etc/logrotate.d/syslog-ng (100%) rename docker/{php-official => php}/8.3-alpine/conf/etc/php/conf.d/.gitkeep (100%) rename docker/{php-official => php}/8.3-alpine/conf/etc/php/fpm/.gitkeep (100%) rename docker/{php-official => php}/8.3-alpine/conf/etc/php/php.ini (100%) rename docker/{php-official => php}/8.3-alpine/conf/etc/php/php.webdevops.ini (100%) rename docker/{php-official => php}/8.3-alpine/conf/etc/supervisor.conf (100%) rename docker/{php-official => php}/8.3-alpine/conf/etc/supervisor.d/.gitkeep (100%) rename docker/{php-official => php}/8.3-alpine/conf/etc/supervisor.d/cron.conf (100%) rename docker/{php-official => php}/8.3-alpine/conf/etc/supervisor.d/dnsmasq.conf (100%) rename docker/{php-official => php}/8.3-alpine/conf/etc/supervisor.d/php-fpm.conf (100%) rename docker/{php-official => php}/8.3-alpine/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{php-official => php}/8.3-alpine/conf/etc/supervisor.d/ssh.conf (100%) rename docker/{php-official => php}/8.3-alpine/conf/etc/supervisor.d/syslog.conf (100%) rename docker/{php-official => php}/8.3-alpine/conf/etc/syslog-ng/syslog-ng.conf (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/bootstrap.d/.gitkeep (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/bootstrap.d/10-entrypoint.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/bootstrap.d/10-permissions.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/bootstrap.d/10-php-init.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/bootstrap.d/10-supervisor.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/bootstrap.d/10-user-application.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/bootstrap.d/11-php-conf.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/bootstrap.d/20-app.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/bootstrap.d/90-cleanup.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/build.d/.gitkeep (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/build.d/10-cleanup.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/entrypoint.d/.gitkeep (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/entrypoint.d/05-permissions.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/entrypoint.d/20-php-fpm.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/entrypoint.d/20-php.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/service.d/.gitkeep (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/service.d/cron.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/service.d/dnsmasq.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/service.d/postfix.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/service.d/ssh.sh (100%) rename docker/{php-official => php}/8.3-alpine/conf/provision/service.d/syslog.sh (100%) rename docker/{php-official => php}/8.3/Dockerfile (99%) rename docker/{php-official => php}/8.3/Dockerfile.twig (100%) rename docker/{php-official => php}/8.3/conf/VERSION (100%) rename docker/{php-official => php}/8.3/conf/bin/bootstrap.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/config.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/control.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/entrypoint.d/cli.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/entrypoint.d/default.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/entrypoint.d/noop.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/entrypoint.d/root.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/entrypoint.d/supervisord.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/entrypoint.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/service.d/cron.d/10-init.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/service.d/cron.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/service.d/php-fpm.d/10-init.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/service.d/php-fpm.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/service.d/postfix.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/service.d/ssh.d/10-init.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/service.d/ssh.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/service.d/supervisor.d/10-init.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/service.d/supervisor.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/service.d/syslog-ng.d/10-init.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/service.d/syslog-ng.sh (100%) rename docker/{php-official => php}/8.3/conf/bin/usr-bin/container-file-auto-restore (100%) rename docker/{php-official => php}/8.3/conf/bin/usr-bin/docker-cronjob (100%) rename docker/{php-official => php}/8.3/conf/bin/usr-bin/docker-php-setting (100%) rename docker/{php-official => php}/8.3/conf/bin/usr-bin/docker-service (100%) rename docker/{php-official => php}/8.3/conf/bin/usr-bin/docker-service-disable (100%) rename docker/{php-official => php}/8.3/conf/bin/usr-bin/docker-service-enable (100%) rename docker/{php-official => php}/8.3/conf/bin/usr-bin/service (100%) rename docker/{php-official => php}/8.3/conf/bin/usr-bin/version-compare (100%) rename docker/{php-official => php}/8.3/conf/etc/cron/.gitkeep (100%) rename docker/{php-official => php}/8.3/conf/etc/logrotate.d/syslog-ng (100%) rename docker/{php-official => php}/8.3/conf/etc/php/conf.d/.gitkeep (100%) rename docker/{php-official => php}/8.3/conf/etc/php/fpm/.gitkeep (100%) rename docker/{php-official => php}/8.3/conf/etc/php/php.ini (100%) rename docker/{php-official => php}/8.3/conf/etc/php/php.webdevops.ini (100%) rename docker/{php-official => php}/8.3/conf/etc/supervisor.conf (100%) rename docker/{php-official => php}/8.3/conf/etc/supervisor.d/.gitkeep (100%) rename docker/{php-official => php}/8.3/conf/etc/supervisor.d/cron.conf (100%) rename docker/{php-official => php}/8.3/conf/etc/supervisor.d/dnsmasq.conf (100%) rename docker/{php-official => php}/8.3/conf/etc/supervisor.d/php-fpm.conf (100%) rename docker/{php-official => php}/8.3/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{php-official => php}/8.3/conf/etc/supervisor.d/ssh.conf (100%) rename docker/{php-official => php}/8.3/conf/etc/supervisor.d/syslog.conf (100%) rename docker/{php-official => php}/8.3/conf/etc/syslog-ng/syslog-ng.conf (100%) rename docker/{php-official => php}/8.3/conf/provision/bootstrap.d/.gitkeep (100%) rename docker/{php-official => php}/8.3/conf/provision/bootstrap.d/10-entrypoint.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/bootstrap.d/10-permissions.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/bootstrap.d/10-php-init.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/bootstrap.d/10-supervisor.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/bootstrap.d/10-user-application.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/bootstrap.d/11-php-conf.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/bootstrap.d/20-app.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/bootstrap.d/20-setup-php-fpm.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/bootstrap.d/20-setup-php.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/bootstrap.d/90-cleanup.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/build.d/.gitkeep (100%) rename docker/{php-official => php}/8.3/conf/provision/build.d/10-cleanup.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/entrypoint.d/.gitkeep (100%) rename docker/{php-official => php}/8.3/conf/provision/entrypoint.d/05-permissions.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/entrypoint.d/20-php-fpm.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/entrypoint.d/20-php.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/service.d/.gitkeep (100%) rename docker/{php-official => php}/8.3/conf/provision/service.d/cron.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/service.d/dnsmasq.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/service.d/postfix.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/service.d/ssh.sh (100%) rename docker/{php-official => php}/8.3/conf/provision/service.d/syslog.sh (100%) delete mode 120000 docker/php/8.4 delete mode 120000 docker/php/8.4-alpine rename docker/{php-official => php}/8.4-alpine/Dockerfile (99%) rename docker/{php-official => php}/8.4-alpine/Dockerfile.twig (100%) rename docker/{php-official => php}/8.4-alpine/conf/VERSION (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/bootstrap.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/config.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/control.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/entrypoint.d/cli.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/entrypoint.d/default.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/entrypoint.d/noop.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/entrypoint.d/root.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/entrypoint.d/supervisord.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/entrypoint.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/service.d/cron.d/10-init.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/service.d/cron.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/service.d/php-fpm.d/10-init.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/service.d/php-fpm.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/service.d/postfix.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/service.d/ssh.d/10-init.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/service.d/ssh.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/service.d/supervisor.d/10-init.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/service.d/supervisor.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/service.d/syslog-ng.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/usr-bin/container-file-auto-restore (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/usr-bin/docker-cronjob (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/usr-bin/docker-php-setting (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/usr-bin/docker-service (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/usr-bin/docker-service-disable (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/usr-bin/docker-service-enable (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/usr-bin/service (100%) rename docker/{php-official => php}/8.4-alpine/conf/bin/usr-bin/version-compare (100%) rename docker/{php-official => php}/8.4-alpine/conf/etc/cron/.gitkeep (100%) rename docker/{php-official => php}/8.4-alpine/conf/etc/logrotate.d/syslog-ng (100%) rename docker/{php-official => php}/8.4-alpine/conf/etc/php/conf.d/.gitkeep (100%) rename docker/{php-official => php}/8.4-alpine/conf/etc/php/fpm/.gitkeep (100%) rename docker/{php-official => php}/8.4-alpine/conf/etc/php/php.ini (100%) rename docker/{php-official => php}/8.4-alpine/conf/etc/php/php.webdevops.ini (100%) rename docker/{php-official => php}/8.4-alpine/conf/etc/supervisor.conf (100%) rename docker/{php-official => php}/8.4-alpine/conf/etc/supervisor.d/.gitkeep (100%) rename docker/{php-official => php}/8.4-alpine/conf/etc/supervisor.d/cron.conf (100%) rename docker/{php-official => php}/8.4-alpine/conf/etc/supervisor.d/dnsmasq.conf (100%) rename docker/{php-official => php}/8.4-alpine/conf/etc/supervisor.d/php-fpm.conf (100%) rename docker/{php-official => php}/8.4-alpine/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{php-official => php}/8.4-alpine/conf/etc/supervisor.d/ssh.conf (100%) rename docker/{php-official => php}/8.4-alpine/conf/etc/supervisor.d/syslog.conf (100%) rename docker/{php-official => php}/8.4-alpine/conf/etc/syslog-ng/syslog-ng.conf (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/bootstrap.d/.gitkeep (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/bootstrap.d/10-entrypoint.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/bootstrap.d/10-permissions.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/bootstrap.d/10-php-init.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/bootstrap.d/10-supervisor.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/bootstrap.d/10-user-application.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/bootstrap.d/11-php-conf.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/bootstrap.d/20-app.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/bootstrap.d/20-setup-php.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/bootstrap.d/90-cleanup.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/build.d/.gitkeep (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/build.d/10-cleanup.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/entrypoint.d/.gitkeep (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/entrypoint.d/05-permissions.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/entrypoint.d/20-php-fpm.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/entrypoint.d/20-php.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/service.d/.gitkeep (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/service.d/cron.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/service.d/dnsmasq.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/service.d/postfix.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/service.d/ssh.sh (100%) rename docker/{php-official => php}/8.4-alpine/conf/provision/service.d/syslog.sh (100%) rename docker/{php-official => php}/8.4/Dockerfile (99%) rename docker/{php-official => php}/8.4/Dockerfile.twig (100%) rename docker/{php-official => php}/8.4/conf/VERSION (100%) rename docker/{php-official => php}/8.4/conf/bin/bootstrap.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/config.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/control.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/entrypoint.d/cli.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/entrypoint.d/default.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/entrypoint.d/noop.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/entrypoint.d/root.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/entrypoint.d/supervisord.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/entrypoint.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/service.d/cron.d/10-init.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/service.d/cron.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/service.d/php-fpm.d/10-init.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/service.d/php-fpm.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/service.d/postfix.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/service.d/ssh.d/10-init.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/service.d/ssh.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/service.d/supervisor.d/10-init.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/service.d/supervisor.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/service.d/syslog-ng.d/10-init.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/service.d/syslog-ng.sh (100%) rename docker/{php-official => php}/8.4/conf/bin/usr-bin/container-file-auto-restore (100%) rename docker/{php-official => php}/8.4/conf/bin/usr-bin/docker-cronjob (100%) rename docker/{php-official => php}/8.4/conf/bin/usr-bin/docker-php-setting (100%) rename docker/{php-official => php}/8.4/conf/bin/usr-bin/docker-service (100%) rename docker/{php-official => php}/8.4/conf/bin/usr-bin/docker-service-disable (100%) rename docker/{php-official => php}/8.4/conf/bin/usr-bin/docker-service-enable (100%) rename docker/{php-official => php}/8.4/conf/bin/usr-bin/service (100%) rename docker/{php-official => php}/8.4/conf/bin/usr-bin/version-compare (100%) rename docker/{php-official => php}/8.4/conf/etc/cron/.gitkeep (100%) rename docker/{php-official => php}/8.4/conf/etc/logrotate.d/syslog-ng (100%) rename docker/{php-official => php}/8.4/conf/etc/php/conf.d/.gitkeep (100%) rename docker/{php-official => php}/8.4/conf/etc/php/fpm/.gitkeep (100%) rename docker/{php-official => php}/8.4/conf/etc/php/php.ini (100%) rename docker/{php-official => php}/8.4/conf/etc/php/php.webdevops.ini (100%) rename docker/{php-official => php}/8.4/conf/etc/supervisor.conf (100%) rename docker/{php-official => php}/8.4/conf/etc/supervisor.d/.gitkeep (100%) rename docker/{php-official => php}/8.4/conf/etc/supervisor.d/cron.conf (100%) rename docker/{php-official => php}/8.4/conf/etc/supervisor.d/dnsmasq.conf (100%) rename docker/{php-official => php}/8.4/conf/etc/supervisor.d/php-fpm.conf (100%) rename docker/{php-official => php}/8.4/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{php-official => php}/8.4/conf/etc/supervisor.d/ssh.conf (100%) rename docker/{php-official => php}/8.4/conf/etc/supervisor.d/syslog.conf (100%) rename docker/{php-official => php}/8.4/conf/etc/syslog-ng/syslog-ng.conf (100%) rename docker/{php-official => php}/8.4/conf/provision/bootstrap.d/.gitkeep (100%) rename docker/{php-official => php}/8.4/conf/provision/bootstrap.d/10-entrypoint.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/bootstrap.d/10-permissions.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/bootstrap.d/10-php-init.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/bootstrap.d/10-supervisor.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/bootstrap.d/10-user-application.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/bootstrap.d/11-php-conf.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/bootstrap.d/20-app.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/bootstrap.d/20-setup-php-fpm.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/bootstrap.d/20-setup-php.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/bootstrap.d/30-setup-ioncube.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/bootstrap.d/90-cleanup.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/build.d/.gitkeep (100%) rename docker/{php-official => php}/8.4/conf/provision/build.d/10-cleanup.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/entrypoint.d/.gitkeep (100%) rename docker/{php-official => php}/8.4/conf/provision/entrypoint.d/05-permissions.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/entrypoint.d/20-php-fpm.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/entrypoint.d/20-php.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/service.d/.gitkeep (100%) rename docker/{php-official => php}/8.4/conf/provision/service.d/cron.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/service.d/dnsmasq.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/service.d/postfix.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/service.d/ssh.sh (100%) rename docker/{php-official => php}/8.4/conf/provision/service.d/syslog.sh (100%) delete mode 120000 docker/php/8.5 delete mode 120000 docker/php/8.5-alpine rename docker/{php-official => php}/8.5-alpine/Dockerfile (99%) rename docker/{php-official => php}/8.5-alpine/Dockerfile.twig (100%) rename docker/{php-official => php}/8.5-alpine/conf/VERSION (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/bootstrap.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/config.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/control.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/entrypoint.d/cli.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/entrypoint.d/default.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/entrypoint.d/noop.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/entrypoint.d/root.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/entrypoint.d/supervisord.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/entrypoint.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/service.d/cron.d/10-init.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/service.d/cron.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/service.d/php-fpm.d/10-init.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/service.d/php-fpm.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/service.d/postfix.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/service.d/ssh.d/10-init.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/service.d/ssh.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/service.d/supervisor.d/10-init.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/service.d/supervisor.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/service.d/syslog-ng.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/usr-bin/container-file-auto-restore (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/usr-bin/docker-cronjob (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/usr-bin/docker-php-setting (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/usr-bin/docker-service (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/usr-bin/docker-service-disable (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/usr-bin/docker-service-enable (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/usr-bin/service (100%) rename docker/{php-official => php}/8.5-alpine/conf/bin/usr-bin/version-compare (100%) rename docker/{php-official => php}/8.5-alpine/conf/etc/cron/.gitkeep (100%) rename docker/{php-official => php}/8.5-alpine/conf/etc/logrotate.d/syslog-ng (100%) rename docker/{php-official => php}/8.5-alpine/conf/etc/php/conf.d/.gitkeep (100%) rename docker/{php-official => php}/8.5-alpine/conf/etc/php/fpm/.gitkeep (100%) rename docker/{php-official => php}/8.5-alpine/conf/etc/php/php.ini (100%) rename docker/{php-official => php}/8.5-alpine/conf/etc/php/php.webdevops.ini (100%) rename docker/{php-official => php}/8.5-alpine/conf/etc/supervisor.conf (100%) rename docker/{php-official => php}/8.5-alpine/conf/etc/supervisor.d/.gitkeep (100%) rename docker/{php-official => php}/8.5-alpine/conf/etc/supervisor.d/cron.conf (100%) rename docker/{php-official => php}/8.5-alpine/conf/etc/supervisor.d/dnsmasq.conf (100%) rename docker/{php-official => php}/8.5-alpine/conf/etc/supervisor.d/php-fpm.conf (100%) rename docker/{php-official => php}/8.5-alpine/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{php-official => php}/8.5-alpine/conf/etc/supervisor.d/ssh.conf (100%) rename docker/{php-official => php}/8.5-alpine/conf/etc/supervisor.d/syslog.conf (100%) rename docker/{php-official => php}/8.5-alpine/conf/etc/syslog-ng/syslog-ng.conf (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/bootstrap.d/.gitkeep (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/bootstrap.d/10-entrypoint.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/bootstrap.d/10-permissions.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/bootstrap.d/10-php-init.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/bootstrap.d/10-supervisor.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/bootstrap.d/10-user-application.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/bootstrap.d/11-php-conf.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/bootstrap.d/20-app.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/bootstrap.d/20-setup-php.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/bootstrap.d/90-cleanup.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/build.d/.gitkeep (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/build.d/10-cleanup.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/entrypoint.d/.gitkeep (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/entrypoint.d/05-permissions.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/entrypoint.d/20-php-fpm.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/entrypoint.d/20-php.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/service.d/.gitkeep (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/service.d/cron.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/service.d/dnsmasq.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/service.d/postfix.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/service.d/ssh.sh (100%) rename docker/{php-official => php}/8.5-alpine/conf/provision/service.d/syslog.sh (100%) rename docker/{php-official => php}/8.5/Dockerfile (99%) rename docker/{php-official => php}/8.5/Dockerfile.twig (100%) rename docker/{php-official => php}/8.5/conf/VERSION (100%) rename docker/{php-official => php}/8.5/conf/bin/bootstrap.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/config.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/control.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/entrypoint.d/cli.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/entrypoint.d/default.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/entrypoint.d/noop.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/entrypoint.d/root.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/entrypoint.d/supervisord.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/entrypoint.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/service.d/cron.d/10-init.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/service.d/cron.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/service.d/php-fpm.d/10-init.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/service.d/php-fpm.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/service.d/postfix.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/service.d/ssh.d/10-init.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/service.d/ssh.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/service.d/supervisor.d/10-init.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/service.d/supervisor.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/service.d/syslog-ng.d/10-init.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/service.d/syslog-ng.sh (100%) rename docker/{php-official => php}/8.5/conf/bin/usr-bin/container-file-auto-restore (100%) rename docker/{php-official => php}/8.5/conf/bin/usr-bin/docker-cronjob (100%) rename docker/{php-official => php}/8.5/conf/bin/usr-bin/docker-php-setting (100%) rename docker/{php-official => php}/8.5/conf/bin/usr-bin/docker-service (100%) rename docker/{php-official => php}/8.5/conf/bin/usr-bin/docker-service-disable (100%) rename docker/{php-official => php}/8.5/conf/bin/usr-bin/docker-service-enable (100%) rename docker/{php-official => php}/8.5/conf/bin/usr-bin/service (100%) rename docker/{php-official => php}/8.5/conf/bin/usr-bin/version-compare (100%) rename docker/{php-official => php}/8.5/conf/etc/cron/.gitkeep (100%) rename docker/{php-official => php}/8.5/conf/etc/logrotate.d/syslog-ng (100%) rename docker/{php-official => php}/8.5/conf/etc/php/conf.d/.gitkeep (100%) rename docker/{php-official => php}/8.5/conf/etc/php/fpm/.gitkeep (100%) rename docker/{php-official => php}/8.5/conf/etc/php/php.ini (100%) rename docker/{php-official => php}/8.5/conf/etc/php/php.webdevops.ini (100%) rename docker/{php-official => php}/8.5/conf/etc/supervisor.conf (100%) rename docker/{php-official => php}/8.5/conf/etc/supervisor.d/.gitkeep (100%) rename docker/{php-official => php}/8.5/conf/etc/supervisor.d/cron.conf (100%) rename docker/{php-official => php}/8.5/conf/etc/supervisor.d/dnsmasq.conf (100%) rename docker/{php-official => php}/8.5/conf/etc/supervisor.d/php-fpm.conf (100%) rename docker/{php-official => php}/8.5/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{php-official => php}/8.5/conf/etc/supervisor.d/ssh.conf (100%) rename docker/{php-official => php}/8.5/conf/etc/supervisor.d/syslog.conf (100%) rename docker/{php-official => php}/8.5/conf/etc/syslog-ng/syslog-ng.conf (100%) rename docker/{php-official => php}/8.5/conf/provision/bootstrap.d/.gitkeep (100%) rename docker/{php-official => php}/8.5/conf/provision/bootstrap.d/10-entrypoint.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/bootstrap.d/10-permissions.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/bootstrap.d/10-php-init.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/bootstrap.d/10-supervisor.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/bootstrap.d/10-user-application.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/bootstrap.d/11-php-conf.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/bootstrap.d/20-app.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/bootstrap.d/20-setup-php-fpm.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/bootstrap.d/20-setup-php.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/bootstrap.d/30-setup-ioncube.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/bootstrap.d/90-cleanup.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/build.d/.gitkeep (100%) rename docker/{php-official => php}/8.5/conf/provision/build.d/10-cleanup.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/entrypoint.d/.gitkeep (100%) rename docker/{php-official => php}/8.5/conf/provision/entrypoint.d/05-permissions.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/entrypoint.d/20-php-fpm.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/entrypoint.d/20-php.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/service.d/.gitkeep (100%) rename docker/{php-official => php}/8.5/conf/provision/service.d/cron.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/service.d/dnsmasq.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/service.d/postfix.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/service.d/ssh.sh (100%) rename docker/{php-official => php}/8.5/conf/provision/service.d/syslog.sh (100%) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 30ced584f..2b2b8c32b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -7148,7 +7148,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.2 + context: docker/php/8.2 platforms: '${{ matrix.platform }}' load: true tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.2' @@ -7164,7 +7164,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.2 + context: docker/php/8.2 platforms: '${{ matrix.platform }}' load: true tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.2' @@ -7210,7 +7210,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.2 + context: docker/php/8.2 platforms: '${{ matrix.platform }}' cache-from: 'type=gha,scope=webdevops/php:8.2-${{ matrix.arch }}' cache-to: 'type=gha,scope=webdevops/php:8.2-${{ matrix.arch }},mode=max' @@ -7273,7 +7273,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.2-alpine + context: docker/php/8.2-alpine platforms: '${{ matrix.platform }}' load: true tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine' @@ -7289,7 +7289,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.2-alpine + context: docker/php/8.2-alpine platforms: '${{ matrix.platform }}' load: true tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine' @@ -7335,7 +7335,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.2-alpine + context: docker/php/8.2-alpine platforms: '${{ matrix.platform }}' cache-from: 'type=gha,scope=webdevops/php:8.2-alpine-${{ matrix.arch }}' cache-to: 'type=gha,scope=webdevops/php:8.2-alpine-${{ matrix.arch }},mode=max' @@ -7474,7 +7474,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.3 + context: docker/php/8.3 platforms: '${{ matrix.platform }}' load: true tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.3' @@ -7490,7 +7490,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.3 + context: docker/php/8.3 platforms: '${{ matrix.platform }}' load: true tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.3' @@ -7536,7 +7536,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.3 + context: docker/php/8.3 platforms: '${{ matrix.platform }}' cache-from: 'type=gha,scope=webdevops/php:8.3-${{ matrix.arch }}' cache-to: 'type=gha,scope=webdevops/php:8.3-${{ matrix.arch }},mode=max' @@ -7599,7 +7599,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.3-alpine + context: docker/php/8.3-alpine platforms: '${{ matrix.platform }}' load: true tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine' @@ -7615,7 +7615,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.3-alpine + context: docker/php/8.3-alpine platforms: '${{ matrix.platform }}' load: true tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine' @@ -7661,7 +7661,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.3-alpine + context: docker/php/8.3-alpine platforms: '${{ matrix.platform }}' cache-from: 'type=gha,scope=webdevops/php:8.3-alpine-${{ matrix.arch }}' cache-to: 'type=gha,scope=webdevops/php:8.3-alpine-${{ matrix.arch }},mode=max' @@ -7800,7 +7800,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.4 + context: docker/php/8.4 platforms: '${{ matrix.platform }}' load: true tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.4' @@ -7816,7 +7816,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.4 + context: docker/php/8.4 platforms: '${{ matrix.platform }}' load: true tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.4' @@ -7862,7 +7862,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.4 + context: docker/php/8.4 platforms: '${{ matrix.platform }}' cache-from: 'type=gha,scope=webdevops/php:8.4-${{ matrix.arch }}' cache-to: 'type=gha,scope=webdevops/php:8.4-${{ matrix.arch }},mode=max' @@ -7925,7 +7925,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.4-alpine + context: docker/php/8.4-alpine platforms: '${{ matrix.platform }}' load: true tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine' @@ -7941,7 +7941,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.4-alpine + context: docker/php/8.4-alpine platforms: '${{ matrix.platform }}' load: true tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine' @@ -7987,7 +7987,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.4-alpine + context: docker/php/8.4-alpine platforms: '${{ matrix.platform }}' cache-from: 'type=gha,scope=webdevops/php:8.4-alpine-${{ matrix.arch }}' cache-to: 'type=gha,scope=webdevops/php:8.4-alpine-${{ matrix.arch }},mode=max' @@ -8126,7 +8126,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.5 + context: docker/php/8.5 platforms: '${{ matrix.platform }}' load: true tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.5' @@ -8142,7 +8142,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.5 + context: docker/php/8.5 platforms: '${{ matrix.platform }}' load: true tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.5' @@ -8188,7 +8188,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.5 + context: docker/php/8.5 platforms: '${{ matrix.platform }}' cache-from: 'type=gha,scope=webdevops/php:8.5-${{ matrix.arch }}' cache-to: 'type=gha,scope=webdevops/php:8.5-${{ matrix.arch }},mode=max' @@ -8251,7 +8251,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.5-alpine + context: docker/php/8.5-alpine platforms: '${{ matrix.platform }}' load: true tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine' @@ -8267,7 +8267,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.5-alpine + context: docker/php/8.5-alpine platforms: '${{ matrix.platform }}' load: true tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine' @@ -8313,7 +8313,7 @@ jobs: env: COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GITHUB_TOKEN }}"}}' with: - context: docker/php-official/8.5-alpine + context: docker/php/8.5-alpine platforms: '${{ matrix.platform }}' cache-from: 'type=gha,scope=webdevops/php:8.5-alpine-${{ matrix.arch }}' cache-to: 'type=gha,scope=webdevops/php:8.5-alpine-${{ matrix.arch }},mode=max' diff --git a/AGENTS.md b/AGENTS.md index 2ea77f5ca..c763af23d 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -17,7 +17,7 @@ | `tests/` | container-structure-test definitions run by the CI | | `docs/` | User documentation | -`docker/php/` are symlinks to `docker/php-official/`, kept by `ci/console generate:dockerfile`; both images are built from the same Dockerfiles. The tags that are built are the `-t "webdevops/..."` lines in `.github/workflows/build.yaml`. +`webdevops/php-official` is a deprecated name of `webdevops/php`: the CI publishes the image of `docker/php/` under that name too, but only for the tags listed under `docker: aliases` in `conf/console.yml`. Do not add new tags there. The tags that are built are the `-t "webdevops/..."` lines in `.github/workflows/build.yaml`. ## Build and test @@ -56,7 +56,7 @@ Where the documentation lives: | `docs/customization.md` | Commands, scripts at start and build time, tools for your Dockerfile, services, cron jobs and their time zone, healthcheck, configuration files and placeholders, supervisord, locales, application user and changing its UID | | `docs/images/*.md` | One page per image family: tags, base image, services, settings, development variant. `php.md` also has Debian or Alpine, production, installing extensions, mail and Xdebug with an IDE | | `docs/known-issues.md` | Options and tools that do not work, with affected images and workaround; migration from older images | -| `docs/discontinued-images.md` | Replacements for images that are no longer built (`storage`, `vsftp`, `ssh`) | +| `docs/discontinued-images.md` | Replacements for images that are no longer built (`storage`, `vsftp`, `ssh`) or deprecated (`php-official`) | ### When to update it @@ -95,7 +95,7 @@ Update the documentation whenever a change touches any of these: 4. **Document only what works.** Never describe an option that has no effect as working. Fix it, or leave it out and list it in `docs/known-issues.md`. If it works only in some images, say exactly which. Anything `docs/known-issues.md` lists as not working must never appear as working anywhere else. An `ENV` line or a script that reads a variable is no proof that it works: `SERVICE_POSTFIX_OPTS` is passed to `postfix start`, which ignores it. When you fix a known issue, remove its entry in the same pull request. -5. **Keep lists in sync.** The tag lists in `README.md` and in `docs/images/*.md` must match the tags pushed by `.github/workflows/build.yaml`. The README banner follows the built tags by itself when you run `ci/console generate:readme-banner`; change its texts in `conf/readme-banner.yml`. `webdevops/php-official` is not listed in the README; it is built from the same Dockerfiles as `webdevops/php`. The defaults in `docs/environment-variables.md` must match what a container reports. +5. **Keep lists in sync.** The tag lists in `README.md` and in `docs/images/*.md` must match the tags pushed by `.github/workflows/build.yaml`. The README banner follows the built tags by itself when you run `ci/console generate:readme-banner`; change its texts in `conf/readme-banner.yml`. `webdevops/php-official` is not listed in the README; it is a deprecated name of `webdevops/php`. The defaults in `docs/environment-variables.md` must match what a container reports. 6. **Follow the style.** - English, GitHub Markdown, relative links, diagrams as Mermaid. No documentation tooling. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index efd2d5e6d..5be5f61da 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ The container runs as your user, so the files it writes belong to you. | Command | Writes | | --- | --- | -| `ci/console generate:dockerfile` | `docker///Dockerfile` from the `Dockerfile.twig` next to it and the Twig templates in the `template` directory, and the links `docker/php/` to `docker/php-official/` | +| `ci/console generate:dockerfile` | `docker///Dockerfile` from the `Dockerfile.twig` next to it and the Twig templates in the `template` directory | | `ci/console generate:provision` | `docker///conf/` from the `provisioning` directory, as configured in `conf/provision.yml` | | `ci/console generate:github-ci` | `.github/workflows/build.yaml`, a build and a publish job for every Dockerfile | | `ci/console generate:readme-banner` | `docs/assets/readme-banner-*.svg` | @@ -30,7 +30,9 @@ A `Dockerfile.twig` imports the macros it uses from `template/Dockerfile`, e.g. The commands that the images have in `/usr/local/bin`, such as `apt-install`, `apk-install`, `docker-run-bootstrap` and `generate-locales`, are in `provisioning/baselayout/general/usr/local/bin`. They only handle Debian, Ubuntu and Alpine, the systems the images are built on. `generate:provision` copies them into `docker/toolbox/latest/conf/`, `toolbox` keeps them under `/baselayout`, and `bootstrap` and the PHP images copy them from there with `COPY --from=webdevops/toolbox`. It checks all of `conf/provision.yml` before it changes a file and stops if a source directory or a tag does not exist, or if an image has another setting than `configuration`. `generate:dockerfile` stops if a directory `docker//` has files but no `Dockerfile.twig`; it first removes the `.DS_Store` files of the macOS Finder under `docker`. -To stop building a tag, remove its directory and those of the tags that build on it; `generate:github-ci` names any it finds. `generate:dockerfile` adds and removes the links in `docker/php` along with the `php-official` tags. +To stop building a tag, remove its directory and those of the tags that build on it; `generate:github-ci` names any it finds. + +`webdevops/php-official` is a deprecated name of `webdevops/php`. `generate:github-ci` publishes a `php` tag under that name too only if `docker: aliases` in `conf/console.yml` lists it; new PHP versions are not added there. When you stop building a `php` tag, remove it from that list as well: `generate:github-ci` stops while the list names a tag that is not built. ## Building in CI @@ -111,7 +113,7 @@ A container counts as started once its entrypoint has run its scripts and starte | `ci/image-tests/Fixtures/` | Files for all containers except those started with `withFiles: false`, e.g. the one for the test without `/app`: the pages in `/app`, and in `/opt/image-tests` small programs that stand in for what a test talks to: `fastcgi-request.php` sends a request straight to PHP-FPM, `smtp-sink.php` takes the mail of Postfix in place of a mail catcher, `smtp-relay.php` asks Postfix to relay, `dbgp-listener.php` takes the connections of Xdebug in place of an IDE, `capture-mail.sh` stands in for sendmail, and `nginx.conf` is a configuration for `SERVICE_NGINX_OPTS` | | `ci/image-tests/Hooks/` | Files for the further containers, again except those with `withFiles: false`: the hooks, a command `image-test` of its own, a second virtual host for the test of `WEB_ALIAS_DOMAIN`, and an Apache configuration for the test of `SERVICE_APACHE_OPTS` | -`ci/console test:image webdevops/:` runs the tests of an image; `webdevops/php-official` has the tests of `webdevops/php`. It takes the distribution and its version from `dockerTest` in `conf/console.yml`, and removes the containers of the image afterwards, also when the run is interrupted with Ctrl-C or `docker stop`. +`ci/console test:image webdevops/:` runs the tests of an image; `webdevops/php-official`, a deprecated name of `webdevops/php`, has the tests of `webdevops/php`. It takes the distribution and its version from `dockerTest` in `conf/console.yml`, and removes the containers of the image afterwards, also when the run is interrupted with Ctrl-C or `docker stop`. A runner killed with `SIGKILL` leaves its containers behind; they carry the label `webdevops.image-test`, so `docker rm --force $(docker ps --all --quiet --filter label=webdevops.image-test)` removes them. It runs in a container of `ci/image-tests/Dockerfile`, which has PHP and the `docker` command and gets the Docker socket: `make test-image` builds that image (`make test-image-runner`) and runs the tests in it (`make test-image-run`). The runner builds on the official PHP image, not on a webdevops image, so a broken `webdevops/php` cannot break the tests that find the defect. diff --git a/ci/src/Commands/GenerateGithubCiCommand.php b/ci/src/Commands/GenerateGithubCiCommand.php index ee3618d80..02938ce48 100644 --- a/ci/src/Commands/GenerateGithubCiCommand.php +++ b/ci/src/Commands/GenerateGithubCiCommand.php @@ -176,9 +176,33 @@ private function buildTree(): Tree } $this->checkInternalImages($data); + $this->checkAliases($data); return new Tree($data); } + /** + * Every tag that "docker: aliases" in conf/console.yml publishes under a deprecated name has to be built here. + * + * @param list> $nodes + */ + private function checkAliases(array $nodes): void + { + $built = array_column($nodes, 'id'); + foreach ($this->fileReader->aliases() as $name => $alias) { + foreach ($alias['tags'] as $tag) { + $image = 'webdevops/' . $alias['image'] . ':' . $tag; + if (!in_array($image, $built, true)) { + throw new RuntimeException(sprintf( + '"docker: aliases" in conf/console.yml publishes %s as webdevops/%s:%s, which is not built. Remove the tag from the list.', + $image, + $name, + $tag, + )); + } + } + } + } + /** * Every webdevops image that an image builds on (FROM) or copies from (COPY --from) has to be built here too. * The tree would otherwise only report a node that "points to non-existent parent". diff --git a/ci/src/Dockerfile/DockerfileGenerator.php b/ci/src/Dockerfile/DockerfileGenerator.php index ae146d306..6e48e4a89 100644 --- a/ci/src/Dockerfile/DockerfileGenerator.php +++ b/ci/src/Dockerfile/DockerfileGenerator.php @@ -19,8 +19,7 @@ * Renders docker///Dockerfile from the Dockerfile.twig next to it. * * template/Dockerfile/layout.twig writes the header and includes the Dockerfile.twig, which imports the macros it - * uses from template/Dockerfile/, e.g. {% import 'docker.twig' as docker %}. Directories that are symbolic links, - * such as docker/php/8.5, are left out; ImageLinks keeps them up to date. + * uses from template/Dockerfile/, e.g. {% import 'docker.twig' as docker %}. */ final readonly class DockerfileGenerator { @@ -32,7 +31,7 @@ public function __construct(private string $rootPath = __DIR__ . '/../../..') } /** - * Renders every Dockerfile and updates the links of ImageLinks. A tag directory without Dockerfile.twig is an + * Renders every Dockerfile. A tag directory without Dockerfile.twig is an * error: nothing would update its files, but generate:github-ci would still build and publish a Dockerfile in it. * The .DS_Store files that the macOS Finder leaves under docker/ are removed first. * @@ -52,8 +51,6 @@ public function generate(?callable $log = null): void )); } - new ImageLinks($this->rootPath)->update($tagDirectories); - $loader = new FilesystemLoader($this->rootPath . '/template/Dockerfile'); $loader->addPath($this->rootPath . '/docker', 'docker'); diff --git a/ci/src/Dockerfile/ImageLinks.php b/ci/src/Dockerfile/ImageLinks.php deleted file mode 100644 index b4ae6be32..000000000 --- a/ci/src/Dockerfile/ImageLinks.php +++ /dev/null @@ -1,89 +0,0 @@ - links to docker/php-official/ for every tag of php-official, and no other link stays there. - */ -final readonly class ImageLinks -{ - /** - * The images whose tags are links, each with the image they link to. - */ - public const array LINKS = ['php' => 'php-official']; - - /** - * @param string $rootPath the repository root - */ - public function __construct(private string $rootPath) - { - } - - public function update(TagDirectories $tagDirectories): void - { - foreach (self::LINKS as $image => $target) { - $directory = $this->rootPath . '/docker/' . $image; - if (!is_dir($directory) && !mkdir($directory) && !is_dir($directory)) { - throw new RuntimeException(sprintf('Cannot create docker/%s.', $image)); - } - - $tags = array_map(basename(...), $tagDirectories->tags($target)); - foreach (scandir($directory) ?: [] as $entry) { - if (is_link($directory . '/' . $entry) && !in_array($entry, $tags, true) && !unlink($directory . '/' . $entry)) { - throw new RuntimeException(sprintf('Cannot remove docker/%s/%s.', $image, $entry)); - } - } - - foreach ($tags as $tag) { - $this->link($image . '/' . $tag, '../' . $target . '/' . $tag); - } - } - } - - /** - * Makes docker/$path a symbolic link to $target. - */ - private function link(string $path, string $target): void - { - $link = $this->rootPath . '/docker/' . $path; - if (is_link($link)) { - if (readlink($link) === $target) { - return; - } - - if (!unlink($link)) { - throw new RuntimeException(sprintf('Cannot remove docker/%s.', $path)); - } - } elseif (is_file($link) && file_get_contents($link) === $target) { - // Git without symbolic links (core.symlinks=false) checks a link out as a file that holds its target - return; - } elseif (file_exists($link)) { - throw new RuntimeException(sprintf('docker/%s has to be a symbolic link to %s, but is a file or a directory.', $path, $target)); - } - - if (!symlink($target, $link)) { - throw new RuntimeException(sprintf('Cannot link docker/%s to %s.', $path, $target)); - } - } -} diff --git a/ci/src/FileReader.php b/ci/src/FileReader.php index 756a861e2..bf4cad8b0 100644 --- a/ci/src/FileReader.php +++ b/ci/src/FileReader.php @@ -34,10 +34,40 @@ public function autoLatestTag(): string return $tag; } + /** + * "docker: aliases" in conf/console.yml: the deprecated image names that the CI also publishes an image under, each + * with that image and the tags it is published for, e.g. ['php-official' => ['image' => 'php', 'tags' => ['8.5']]]. + * A deprecated name gets no new tags: it is only published for the tags listed there. + * + * @return array}> + */ + public function aliases(): array + { + $settings = $this->settings['docker']['aliases'] ?? []; + $error = '"docker: aliases" in conf/console.yml has to map each deprecated name to the image it names and the tags in quotes, e.g. php-official: {image: php, tags: [\'8.5\']}.'; + if (!is_array($settings)) { + throw new RuntimeException($error); + } + + $aliases = []; + foreach ($settings as $name => $alias) { + $image = is_array($alias) ? $alias['image'] ?? null : null; + $tags = is_array($alias) ? $alias['tags'] ?? null : null; + // an unquoted tag such as 8.10 is a number in YAML and would lose its trailing zero + if (!is_string($name) || !is_string($image) || $image === '' || !is_array($tags) || !array_is_list($tags) || array_any($tags, static fn (mixed $tag): bool => !is_string($tag) || $tag === '')) { + throw new RuntimeException($error); + } + + /** @var list $tags */ + $aliases[$name] = ['image' => $image, 'tags' => $tags]; + } + + return $aliases; + } + /** * The Dockerfile of every tag under docker/ (see TagDirectories), relative to the repository root and sorted, e.g. - * docker/base/alpine/Dockerfile. Tags whose Dockerfile was not generated yet are left out. Directories that are - * symbolic links, such as docker/php/8.5, are left out too: they build the same Dockerfile. + * docker/base/alpine/Dockerfile. Tags whose Dockerfile was not generated yet are left out. * * @return list */ @@ -126,11 +156,11 @@ public function getInfo(string $dockerfile): array $node['imageDependencies'][$dependencyRef] = $this->resolveInternalImageReference($dependencyRef); } - // Treat *-official images - if (str_contains($id, '-official:')) { - $node['aliases'][] = $id; - $node['id'] = $node['name'] = str_replace('-official:', ':', $id); - $node['image'] = str_replace('-official', '', $node['image']); + // deprecated names of the image, e.g. webdevops/php-official:8.5 for webdevops/php:8.5 + foreach ($this->aliases() as $name => $alias) { + if ($alias['image'] === $imageName && in_array($tagName, $alias['tags'], true)) { + $node['aliases'][] = 'webdevops/' . $name . ':' . $tagName; + } } if ($tagName === $this->autoLatestTag()) { diff --git a/ci/src/ImageTests.php b/ci/src/ImageTests.php index e41591a63..d0934f727 100644 --- a/ci/src/ImageTests.php +++ b/ci/src/ImageTests.php @@ -47,8 +47,8 @@ public function __construct(private string $rootPath = __DIR__ . '/../..') /** * The test class of $image relative to the repository root, e.g. ci/image-tests/Images/PhpNginxTest.php for - * php-nginx; null if the image has no tests. php-official has the tests of php: both are built from the same - * Dockerfiles. + * php-nginx; null if the image has no tests. php-official, a deprecated name of php (see "docker: aliases" in + * conf/console.yml), has the tests of php. */ public function testFile(string $image): ?string { diff --git a/ci/src/TagDirectories.php b/ci/src/TagDirectories.php index b13e2b4b4..4d1c8b446 100644 --- a/ci/src/TagDirectories.php +++ b/ci/src/TagDirectories.php @@ -18,8 +18,8 @@ /** * The tag directories under docker/: every docker/// with a Dockerfile.twig, the template its - * Dockerfile is rendered from. Directories that are symbolic links, such as docker/php/8.5, are left out: they show - * a tag of the image they link to. docker/ is read once, when the object is created. + * Dockerfile is rendered from. Directories that are symbolic links are left out: they would build the Dockerfile of + * the directory they link to a second time. docker/ is read once, when the object is created. */ final readonly class TagDirectories { diff --git a/ci/tests/Commands/GenerateGithubCiCommandTest.php b/ci/tests/Commands/GenerateGithubCiCommandTest.php index a0943d1bd..09871d1f5 100644 --- a/ci/tests/Commands/GenerateGithubCiCommandTest.php +++ b/ci/tests/Commands/GenerateGithubCiCommandTest.php @@ -18,6 +18,7 @@ use function array_diff; use function array_keys; use function array_values; +use function str_replace; use function strpos; use function substr; @@ -114,6 +115,30 @@ public function testPublishesTheAliases(): void self::assertStringContainsString('-t "webdevops/base:latest"', $manifest('base_ubuntu-22-04_publish')); self::assertStringContainsString('-t "webdevops/php-official:8.4"', $manifest('php_8-4_publish')); + self::assertStringContainsString('-t "ghcr.io/webdevops/php-official:8.4"', $manifest('php_8-4_publish')); + self::assertStringNotContainsString('php-official', $manifest('php-nginx_8-5-alpine_publish')); + } + + public function testDeprecatedNameGetsNoNewTags(): void + { + $this->repository->write('conf/console.yml', str_replace("tags: ['8.4', '8.5-alpine', '8.5']", "tags: ['8.4']", $this->repository->read('conf/console.yml'))); + + $jobs = $this->generate()['jobs']; + $manifest = fn (string $job): string => array_column($jobs[$job]['steps'], 'run', 'name')['Create and push multi-arch manifest']; + + self::assertStringContainsString('-t "webdevops/php-official:8.4"', $manifest('php_8-4_publish')); + self::assertStringContainsString('-t "webdevops/php:8.5"', $manifest('php_8-5_publish')); + self::assertStringNotContainsString('php-official', $manifest('php_8-5_publish')); + } + + public function testAliasOfATagThatIsNotBuiltIsAnError(): void + { + // e.g. docker/php/8.4 was removed, but not its tag in the list + $this->repository->write('conf/console.yml', str_replace("tags: ['8.4', '8.5-alpine', '8.5']", "tags: ['8.3', '8.4']", $this->repository->read('conf/console.yml'))); + + $this->expectException(RuntimeException::class); + $this->expectExceptionMessage('"docker: aliases" in conf/console.yml publishes webdevops/php:8.3 as webdevops/php-official:8.3, which is not built. Remove the tag from the list.'); + new CommandTester(new GenerateGithubCiCommand($this->repository->path))->execute([]); } public function testPrintsTheImageTree(): void @@ -132,7 +157,7 @@ public function testPrintsTheImageTree(): void */ public static function missingInternalImages(): iterable { - // e.g. php-official 8.5-alpine was removed, but not php-nginx 8.5-alpine + // e.g. php 8.5-alpine was removed, but not php-nginx 8.5-alpine yield 'base image' => [ 'docker/php-nginx/8.5-alpine/Dockerfile', "FROM webdevops/php:8.6-alpine\n", diff --git a/ci/tests/Commands/GenerateProvisionCommandTest.php b/ci/tests/Commands/GenerateProvisionCommandTest.php index a6783b99b..43fc53917 100644 --- a/ci/tests/Commands/GenerateProvisionCommandTest.php +++ b/ci/tests/Commands/GenerateProvisionCommandTest.php @@ -21,7 +21,7 @@ public function testProvisionsTheImagesAndListsTheSources(): void $tester = new CommandTester(new GenerateProvisionCommand($repository->path)); self::assertSame(Command::SUCCESS, $tester->execute([])); - self::assertStringContainsString("php/official-alpine => webdevops/php-official:*-alpine\n", $tester->getDisplay()); + self::assertStringContainsString("php/official-alpine => webdevops/php:*-alpine\n", $tester->getDisplay()); self::assertSame("alpine\n", $repository->read('docker/base/alpine/conf/etc/os')); } finally { $repository->remove(); diff --git a/ci/tests/Dockerfile/DockerfileGeneratorTest.php b/ci/tests/Dockerfile/DockerfileGeneratorTest.php index 721633757..4ba7d1788 100644 --- a/ci/tests/Dockerfile/DockerfileGeneratorTest.php +++ b/ci/tests/Dockerfile/DockerfileGeneratorTest.php @@ -13,8 +13,6 @@ use Webdevops\Build\Tests\TemporaryRepository; use function file_get_contents; -use function readlink; -use function unlink; #[CoversClass(DockerfileGenerator::class)] final class DockerfileGeneratorTest extends TestCase @@ -52,18 +50,17 @@ public function testRendersTheDockerfiles(): void } } - public function testLogsEachDockerfileAndLeavesOutLinkedDirectories(): void + public function testLogsEachDockerfile(): void { - // docker/php/8.4 links to docker/php-official/8.4 self::assertSame([ 'webdevops/base-app:ubuntu-22.04', 'webdevops/base:alpine', 'webdevops/base:ubuntu-22.04', 'webdevops/php-nginx-dev:8.5-alpine', 'webdevops/php-nginx:8.5-alpine', - 'webdevops/php-official:8.4', - 'webdevops/php-official:8.5-alpine', - 'webdevops/php-official:8.5', + 'webdevops/php:8.4', + 'webdevops/php:8.5-alpine', + 'webdevops/php:8.5', 'webdevops/toolbox:latest', ], $this->generate()); } @@ -98,14 +95,14 @@ public function testDirectoryWithoutTemplateIsAnError(): void // e.g. the template was removed to stop building the tag, but not the generated files $this->repository->write('docker/base/alpine/Dockerfile', ''); $this->repository->write('docker/base/alpine-edge/Dockerfile', "# Dockerfile for webdevops/base:alpine-edge\n"); - $this->repository->write('docker/php-official/8.3/conf/etc/php.conf', "php\n"); + $this->repository->write('docker/php/8.3/conf/etc/php.conf', "php\n"); try { $this->generate(); self::fail('the directories without template were accepted'); } catch (RuntimeException $runtimeException) { self::assertSame( - 'No Dockerfile.twig in docker/base/alpine-edge, docker/php-official/8.3. ' + 'No Dockerfile.twig in docker/base/alpine-edge, docker/php/8.3. ' . 'Add the template, or remove the directory to stop building the tag.', $runtimeException->getMessage(), ); @@ -129,15 +126,6 @@ public function testRemovesTheFilesOfTheFinder(): void self::assertFileDoesNotExist($this->repository->path . '/docker/toolbox/latest/conf/.DS_Store', 'it would get into a local build'); } - public function testUpdatesTheLinksOfPhp(): void - { - unlink($this->repository->path . '/docker/php/8.5'); - - $this->generate(); - - self::assertSame('../php-official/8.5', readlink($this->repository->path . '/docker/php/8.5')); - } - public function testNewTagIsRendered(): void { $this->repository->write('docker/base/alpine-edge/Dockerfile.twig', $this->repository->read('docker/base/alpine/Dockerfile.twig')); diff --git a/ci/tests/Dockerfile/ImageLinksTest.php b/ci/tests/Dockerfile/ImageLinksTest.php deleted file mode 100644 index 65ccf5956..000000000 --- a/ci/tests/Dockerfile/ImageLinksTest.php +++ /dev/null @@ -1,89 +0,0 @@ -repository = new TemporaryRepository(); - } - - protected function tearDown(): void - { - $this->repository->remove(); - } - - public function testLinksEveryTagOfPhpOfficial(): void - { - unlink($this->repository->path . '/docker/php/8.5'); - - $this->update(); - - self::assertSame(['.', '..', '8.4', '8.5', '8.5-alpine'], scandir($this->repository->path . '/docker/php')); - self::assertSame('../php-official/8.5', readlink($this->repository->path . '/docker/php/8.5')); - } - - public function testRemovesLinksOfRemovedTags(): void - { - // e.g. php-official 8.3 was removed, its link not - symlink('../php-official/8.3', $this->repository->path . '/docker/php/8.3'); - - $this->update(); - - self::assertFalse(is_link($this->repository->path . '/docker/php/8.3')); - } - - public function testCorrectsALinkWithAnotherTarget(): void - { - unlink($this->repository->path . '/docker/php/8.5'); - symlink('../php-official/8.4', $this->repository->path . '/docker/php/8.5'); - - $this->update(); - - self::assertSame('../php-official/8.5', readlink($this->repository->path . '/docker/php/8.5')); - } - - public function testKeepsALinkThatGitCheckedOutAsAFile(): void - { - unlink($this->repository->path . '/docker/php/8.5'); - $this->repository->write('docker/php/8.5', '../php-official/8.5'); - - $this->update(); - - self::assertSame('../php-official/8.5', $this->repository->read('docker/php/8.5')); - } - - public function testADirectoryInThePlaceOfALinkIsAnError(): void - { - unlink($this->repository->path . '/docker/php/8.5'); - $this->repository->write('docker/php/8.5/Dockerfile', ''); - - $this->expectException(RuntimeException::class); - $this->expectExceptionMessage('docker/php/8.5 has to be a symbolic link to ../php-official/8.5, but is a file or a directory.'); - $this->update(); - } - - private function update(): void - { - new ImageLinks($this->repository->path)->update(new TagDirectories($this->repository->path)); - } -} diff --git a/ci/tests/FileReaderTest.php b/ci/tests/FileReaderTest.php index c9e563a91..fcd6e3f36 100644 --- a/ci/tests/FileReaderTest.php +++ b/ci/tests/FileReaderTest.php @@ -19,16 +19,15 @@ final class FileReaderTest extends TestCase public function testCollectsTheGeneratedDockerfilesSorted(): void { - // docker/php/8.4 links to docker/php-official/8.4 and is left out, as in the repository self::assertSame([ 'docker/base-app/ubuntu-22.04/Dockerfile', 'docker/base/alpine/Dockerfile', 'docker/base/ubuntu-22.04/Dockerfile', 'docker/php-nginx-dev/8.5-alpine/Dockerfile', 'docker/php-nginx/8.5-alpine/Dockerfile', - 'docker/php-official/8.4/Dockerfile', - 'docker/php-official/8.5-alpine/Dockerfile', - 'docker/php-official/8.5/Dockerfile', + 'docker/php/8.4/Dockerfile', + 'docker/php/8.5-alpine/Dockerfile', + 'docker/php/8.5/Dockerfile', 'docker/toolbox/latest/Dockerfile', ], new FileReader(self::ROOT)->collectDockerfiles()); } @@ -80,14 +79,53 @@ public function testToolboxHasNoParent(): void self::assertSame([], $node['imageDependencies']); } - public function testOfficialImageIsPublishedAsPhp(): void + public function testDeprecatedNameIsPublishedForTheListedTags(): void { - $node = $this->info('php-official/8.4'); + $node = $this->info('php/8.4'); self::assertSame('webdevops/php:8.4', $node['id']); self::assertSame('webdevops/php:8.4', $node['name']); self::assertSame('php', $node['image']); self::assertSame(['webdevops/php-official:8.4'], $node['aliases']); + self::assertSame([], $this->info('php-nginx/8.5-alpine')['aliases'], 'php-official names php only'); + } + + public function testDeprecatedNameGetsNoNewTags(): void + { + $repository = new TemporaryRepository(); + $repository->write('conf/console.yml', str_replace("tags: ['8.4', '8.5-alpine', '8.5']", "tags: ['8.4']", $repository->read('conf/console.yml'))); + + try { + self::assertSame([], new FileReader($repository->path)->getInfo('docker/php/8.5/Dockerfile')['aliases']); + self::assertSame(['php-official' => ['image' => 'php', 'tags' => ['8.4']]], new FileReader($repository->path)->aliases()); + } finally { + $repository->remove(); + } + } + + /** + * @return iterable + */ + public static function invalidAliases(): iterable + { + yield 'tag without quotes' => [" tags: [8.4, '8.5-alpine', '8.5']"]; + yield 'empty tag' => [" tags: ['', '8.5-alpine', '8.5']"]; + yield 'no list' => [" tags: '8.4'"]; + } + + #[DataProvider('invalidAliases')] + public function testAliasTagsHaveToBeQuotedTags(string $line): void + { + $repository = new TemporaryRepository(); + $repository->write('conf/console.yml', str_replace(" tags: ['8.4', '8.5-alpine', '8.5']", $line, $repository->read('conf/console.yml'))); + + try { + $this->expectException(RuntimeException::class); + $this->expectExceptionMessage('"docker: aliases" in conf/console.yml has to map each deprecated name to the image it names and the tags in quotes, e.g. php-official: {image: php, tags: [\'8.5\']}.'); + new FileReader($repository->path)->getInfo('docker/php/8.5/Dockerfile'); + } finally { + $repository->remove(); + } } public function testInternalParentImage(): void diff --git a/ci/tests/Fixtures/repository/conf/console.yml b/ci/tests/Fixtures/repository/conf/console.yml index 2dada0a9b..84f197e07 100644 --- a/ci/tests/Fixtures/repository/conf/console.yml +++ b/ci/tests/Fixtures/repository/conf/console.yml @@ -3,6 +3,10 @@ docker: autoLatestTag: 'ubuntu-22.04' + aliases: + php-official: + image: 'php' + tags: ['8.4', '8.5-alpine', '8.5'] dockerTest: configuration: diff --git a/ci/tests/Fixtures/repository/conf/provision.yml b/ci/tests/Fixtures/repository/conf/provision.yml index 0e43d6808..36acd99b3 100644 --- a/ci/tests/Fixtures/repository/conf/provision.yml +++ b/ci/tests/Fixtures/repository/conf/provision.yml @@ -6,7 +6,7 @@ provision: configuration: base/general: '*' base/alpine: alpine - php-official: + php: configuration: base/general: '*' php/general: '*' diff --git a/ci/tests/Fixtures/repository/docker/php/8.4 b/ci/tests/Fixtures/repository/docker/php/8.4 deleted file mode 120000 index 59c4a3067..000000000 --- a/ci/tests/Fixtures/repository/docker/php/8.4 +++ /dev/null @@ -1 +0,0 @@ -../php-official/8.4 \ No newline at end of file diff --git a/ci/tests/Fixtures/repository/docker/php-official/8.4/Dockerfile b/ci/tests/Fixtures/repository/docker/php/8.4/Dockerfile similarity index 82% rename from ci/tests/Fixtures/repository/docker/php-official/8.4/Dockerfile rename to ci/tests/Fixtures/repository/docker/php/8.4/Dockerfile index 3c80892d5..dac9a83fb 100644 --- a/ci/tests/Fixtures/repository/docker/php-official/8.4/Dockerfile +++ b/ci/tests/Fixtures/repository/docker/php/8.4/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:8.4 +# Dockerfile for webdevops/php:8.4 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/ci/tests/Fixtures/repository/docker/php-official/8.4/Dockerfile.twig b/ci/tests/Fixtures/repository/docker/php/8.4/Dockerfile.twig similarity index 100% rename from ci/tests/Fixtures/repository/docker/php-official/8.4/Dockerfile.twig rename to ci/tests/Fixtures/repository/docker/php/8.4/Dockerfile.twig diff --git a/ci/tests/Fixtures/repository/docker/php/8.5 b/ci/tests/Fixtures/repository/docker/php/8.5 deleted file mode 120000 index a0754b593..000000000 --- a/ci/tests/Fixtures/repository/docker/php/8.5 +++ /dev/null @@ -1 +0,0 @@ -../php-official/8.5 \ No newline at end of file diff --git a/ci/tests/Fixtures/repository/docker/php/8.5-alpine b/ci/tests/Fixtures/repository/docker/php/8.5-alpine deleted file mode 120000 index d3fc8eeba..000000000 --- a/ci/tests/Fixtures/repository/docker/php/8.5-alpine +++ /dev/null @@ -1 +0,0 @@ -../php-official/8.5-alpine \ No newline at end of file diff --git a/ci/tests/Fixtures/repository/docker/php-official/8.5-alpine/Dockerfile b/ci/tests/Fixtures/repository/docker/php/8.5-alpine/Dockerfile similarity index 79% rename from ci/tests/Fixtures/repository/docker/php-official/8.5-alpine/Dockerfile rename to ci/tests/Fixtures/repository/docker/php/8.5-alpine/Dockerfile index b6c953df9..0ea8a2dc8 100644 --- a/ci/tests/Fixtures/repository/docker/php-official/8.5-alpine/Dockerfile +++ b/ci/tests/Fixtures/repository/docker/php/8.5-alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:8.5-alpine +# Dockerfile for webdevops/php:8.5-alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/ci/tests/Fixtures/repository/docker/php-official/8.5-alpine/Dockerfile.twig b/ci/tests/Fixtures/repository/docker/php/8.5-alpine/Dockerfile.twig similarity index 100% rename from ci/tests/Fixtures/repository/docker/php-official/8.5-alpine/Dockerfile.twig rename to ci/tests/Fixtures/repository/docker/php/8.5-alpine/Dockerfile.twig diff --git a/ci/tests/Fixtures/repository/docker/php-official/8.5/Dockerfile b/ci/tests/Fixtures/repository/docker/php/8.5/Dockerfile similarity index 81% rename from ci/tests/Fixtures/repository/docker/php-official/8.5/Dockerfile rename to ci/tests/Fixtures/repository/docker/php/8.5/Dockerfile index d35d37565..7ed84a297 100644 --- a/ci/tests/Fixtures/repository/docker/php-official/8.5/Dockerfile +++ b/ci/tests/Fixtures/repository/docker/php/8.5/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:8.5 +# Dockerfile for webdevops/php:8.5 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/ci/tests/Fixtures/repository/docker/php-official/8.5/Dockerfile.twig b/ci/tests/Fixtures/repository/docker/php/8.5/Dockerfile.twig similarity index 100% rename from ci/tests/Fixtures/repository/docker/php-official/8.5/Dockerfile.twig rename to ci/tests/Fixtures/repository/docker/php/8.5/Dockerfile.twig diff --git a/ci/tests/Provision/ProvisionerTest.php b/ci/tests/Provision/ProvisionerTest.php index f1bfc838a..9f8ed6b50 100644 --- a/ci/tests/Provision/ProvisionerTest.php +++ b/ci/tests/Provision/ProvisionerTest.php @@ -33,9 +33,9 @@ public function testCopiesTheSourcesIntoTheConfDirectoryOfTheirTags(): void $this->provision(); self::assertSame("general\n", $this->repository->read('docker/base/ubuntu-22.04/conf/etc/os')); - self::assertSame("php\n", $this->repository->read('docker/php-official/8.4/conf/etc/php.conf')); - self::assertSame("php\n", $this->repository->read('docker/php-official/8.5/conf/etc/php.conf'), '8.5 does not match *-alpine'); - self::assertSame("#!/bin/sh\necho service\n", $this->repository->read('docker/php-official/8.5-alpine/conf/bin/service')); + self::assertSame("php\n", $this->repository->read('docker/php/8.4/conf/etc/php.conf')); + self::assertSame("php\n", $this->repository->read('docker/php/8.5/conf/etc/php.conf'), '8.5 does not match *-alpine'); + self::assertSame("#!/bin/sh\necho service\n", $this->repository->read('docker/php/8.5-alpine/conf/bin/service')); } public function testLaterSourcesReplaceFilesOfEarlierOnes(): void @@ -43,7 +43,7 @@ public function testLaterSourcesReplaceFilesOfEarlierOnes(): void $this->provision(); self::assertSame("alpine\n", $this->repository->read('docker/base/alpine/conf/etc/os')); - self::assertSame("php alpine\n", $this->repository->read('docker/php-official/8.5-alpine/conf/etc/php.conf')); + self::assertSame("php alpine\n", $this->repository->read('docker/php/8.5-alpine/conf/etc/php.conf')); } public function testKeepsThePermissionsOfTheFiles(): void @@ -67,12 +67,12 @@ public function testLeavesOutTheFilesOfTheFinder(): void public function testEmptiesTheConfDirectoriesFirst(): void { $this->repository->write('docker/base/alpine/conf/etc/removed-from-provisioning', 'old'); - $this->repository->write('docker/php-official/8.4/conf/etc/os', 'old'); + $this->repository->write('docker/php/8.4/conf/etc/os', 'old'); $this->provision(); self::assertFileDoesNotExist($this->repository->path . '/docker/base/alpine/conf/etc/removed-from-provisioning'); - self::assertSame("general\n", $this->repository->read('docker/php-official/8.4/conf/etc/os')); + self::assertSame("general\n", $this->repository->read('docker/php/8.4/conf/etc/os')); } public function testLeavesImagesAloneThatConfProvisionYmlDoesNotName(): void @@ -126,13 +126,13 @@ public function testDirectoryWithoutTemplateIsNoTag(): void public function testChecksTheWholeConfigurationBeforeChangingFiles(): void { $this->repository->write('docker/base/alpine/conf/etc/os', 'old'); - $this->configure("provision:\n base:\n configuration:\n base/general: '*'\n php-official:\n configuration:\n php/general: '8.6'\n"); + $this->configure("provision:\n base:\n configuration:\n base/general: '*'\n php:\n configuration:\n php/general: '8.6'\n"); try { $this->provision(); - self::fail('8.6 is no tag of php-official'); + self::fail('8.6 is no tag of php'); } catch (RuntimeException $runtimeException) { - self::assertSame('conf/provision.yml copies provisioning/php/general into webdevops/php-official:8.6, but webdevops/php-official has no such tag under docker/.', $runtimeException->getMessage()); + self::assertSame('conf/provision.yml copies provisioning/php/general into webdevops/php:8.6, but webdevops/php has no such tag under docker/.', $runtimeException->getMessage()); self::assertSame('old', $this->repository->read('docker/base/alpine/conf/etc/os')); } } @@ -142,9 +142,9 @@ public function testLogsEachSource(): void self::assertSame([ 'base/general => webdevops/base:*', 'base/alpine => webdevops/base:alpine', - 'base/general => webdevops/php-official:*', - 'php/general => webdevops/php-official:*', - 'php/official-alpine => webdevops/php-official:*-alpine', + 'base/general => webdevops/php:*', + 'php/general => webdevops/php:*', + 'php/official-alpine => webdevops/php:*-alpine', ], $this->provision()); } @@ -166,10 +166,10 @@ public static function invalidConfigurations(): iterable "provision:\n missing-image:\n configuration:\n base/general: '*'\n", 'conf/provision.yml copies provisioning/base/general into webdevops/missing-image:*, but webdevops/missing-image has no such tag under docker/.', ]; - yield 'image whose tags are symbolic links' => [ - // docker/php/8.4 links to docker/php-official/8.4 - "provision:\n php:\n configuration:\n php/general: '*'\n", - 'conf/provision.yml copies provisioning/php/general into webdevops/php:*, but webdevops/php has no such tag under docker/.', + yield 'deprecated name of an image' => [ + // webdevops/php-official is only published as webdevops/php, see "docker: aliases" in conf/console.yml + "provision:\n php-official:\n configuration:\n php/general: '*'\n", + 'conf/provision.yml copies provisioning/php/general into webdevops/php-official:*, but webdevops/php-official has no such tag under docker/.', ]; yield 'empty tag list' => [ "provision:\n base:\n configuration:\n base/general: []\n", diff --git a/ci/tests/TagDirectoriesTest.php b/ci/tests/TagDirectoriesTest.php index a19695a66..57c0155c0 100644 --- a/ci/tests/TagDirectoriesTest.php +++ b/ci/tests/TagDirectoriesTest.php @@ -9,6 +9,7 @@ use Webdevops\Build\TagDirectories; use function mkdir; +use function symlink; #[CoversClass(TagDirectories::class)] final class TagDirectoriesTest extends TestCase @@ -27,16 +28,15 @@ protected function tearDown(): void public function testTagsAreTheDirectoriesWithATemplateSortedLikeTheirDockerfiles(): void { - // docker/php/8.4 links to docker/php-official/8.4 and is left out self::assertSame([ 'docker/base-app/ubuntu-22.04', 'docker/base/alpine', 'docker/base/ubuntu-22.04', 'docker/php-nginx-dev/8.5-alpine', 'docker/php-nginx/8.5-alpine', - 'docker/php-official/8.4', - 'docker/php-official/8.5-alpine', - 'docker/php-official/8.5', + 'docker/php/8.4', + 'docker/php/8.5-alpine', + 'docker/php/8.5', 'docker/toolbox/latest', ], $this->tagDirectories()->tags()); } @@ -44,7 +44,7 @@ public function testTagsAreTheDirectoriesWithATemplateSortedLikeTheirDockerfiles public function testTagsOfOneImage(): void { self::assertSame(['docker/base/alpine', 'docker/base/ubuntu-22.04'], $this->tagDirectories()->tags('base')); - self::assertSame([], $this->tagDirectories()->tags('php'), 'every tag of php is a symbolic link'); + self::assertSame(['docker/php/8.4', 'docker/php/8.5-alpine', 'docker/php/8.5'], $this->tagDirectories()->tags('php')); self::assertSame([], $this->tagDirectories()->tags('missing')); } @@ -60,6 +60,15 @@ public function testDirectoriesWithoutTemplateAreNoTags(): void self::assertSame(['docker/base/alpine-edge', 'docker/base/alpine-old'], $this->tagDirectories()->withoutTemplate(), 'an empty directory is left alone'); } + public function testSymbolicLinksAreLeftOut(): void + { + symlink('8.5', $this->repository->path . '/docker/php/8.6'); + symlink('php', $this->repository->path . '/docker/php-copy'); + + self::assertSame(['docker/php/8.4', 'docker/php/8.5-alpine', 'docker/php/8.5'], $this->tagDirectories()->tags('php')); + self::assertSame([], $this->tagDirectories()->tags('php-copy')); + } + public function testNoDirectoryWithoutTemplateInTheFixture(): void { self::assertSame([], $this->tagDirectories()->withoutTemplate()); diff --git a/ci/tests/TemporaryRepository.php b/ci/tests/TemporaryRepository.php index af520b8e4..fd9ded219 100644 --- a/ci/tests/TemporaryRepository.php +++ b/ci/tests/TemporaryRepository.php @@ -19,11 +19,9 @@ use function is_dir; use function mkdir; use function random_bytes; -use function readlink; use function rmdir; use function strlen; use function substr; -use function symlink; use function sys_get_temp_dir; use function unlink; @@ -52,10 +50,7 @@ public function __construct() } $target = $this->path . substr($file->getPathname(), strlen(self::FIXTURE)); - if ($file->isLink()) { - // Like docker/php/, which links to docker/php-official/ - symlink((string)readlink($file->getPathname()), $target); - } elseif ($file->isDir()) { + if ($file->isDir()) { mkdir($target); } else { copy($file->getPathname(), $target); diff --git a/conf/console.yml b/conf/console.yml index bb765521f..dc379e263 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -4,6 +4,12 @@ docker: # This tag is also published as latest autoLatestTag: 'ubuntu-22.04' + # Deprecated image names that the CI also publishes an image under, only for the tags listed here. + # webdevops/php-official is webdevops/php and gets no new tags, see docs/discontinued-images.md. + aliases: + php-official: + image: 'php' + tags: ['8.2', '8.2-alpine', '8.3', '8.3-alpine', '8.4', '8.4-alpine', '8.5', '8.5-alpine'] # Settings of the image tests (ci/console test:image), per image tag dockerTest: diff --git a/conf/provision.yml b/conf/provision.yml index 6354db489..8e572b22d 100644 --- a/conf/provision.yml +++ b/conf/provision.yml @@ -41,7 +41,7 @@ provision: php-dev/general : '*' nginx-dev/general : '*' development/general: '*' - php-official: + php: configuration: base/general : '*' base-app/general : '*' diff --git a/docker/php/8.2 b/docker/php/8.2 deleted file mode 120000 index b00424bec..000000000 --- a/docker/php/8.2 +++ /dev/null @@ -1 +0,0 @@ -../php-official/8.2 \ No newline at end of file diff --git a/docker/php/8.2-alpine b/docker/php/8.2-alpine deleted file mode 120000 index fc16ca4da..000000000 --- a/docker/php/8.2-alpine +++ /dev/null @@ -1 +0,0 @@ -../php-official/8.2-alpine \ No newline at end of file diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php/8.2-alpine/Dockerfile similarity index 99% rename from docker/php-official/8.2-alpine/Dockerfile rename to docker/php/8.2-alpine/Dockerfile index 9470cf9ba..f8a4526be 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php/8.2-alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:8.2-alpine +# Dockerfile for webdevops/php:8.2-alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/php-official/8.2-alpine/Dockerfile.twig b/docker/php/8.2-alpine/Dockerfile.twig similarity index 100% rename from docker/php-official/8.2-alpine/Dockerfile.twig rename to docker/php/8.2-alpine/Dockerfile.twig diff --git a/docker/php-official/8.2-alpine/conf/VERSION b/docker/php/8.2-alpine/conf/VERSION similarity index 100% rename from docker/php-official/8.2-alpine/conf/VERSION rename to docker/php/8.2-alpine/conf/VERSION diff --git a/docker/php-official/8.2-alpine/conf/bin/bootstrap.sh b/docker/php/8.2-alpine/conf/bin/bootstrap.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/bootstrap.sh rename to docker/php/8.2-alpine/conf/bin/bootstrap.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/config.sh b/docker/php/8.2-alpine/conf/bin/config.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/config.sh rename to docker/php/8.2-alpine/conf/bin/config.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/control.sh b/docker/php/8.2-alpine/conf/bin/control.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/control.sh rename to docker/php/8.2-alpine/conf/bin/control.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/entrypoint.d/cli.sh b/docker/php/8.2-alpine/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/entrypoint.d/cli.sh rename to docker/php/8.2-alpine/conf/bin/entrypoint.d/cli.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/entrypoint.d/default.sh b/docker/php/8.2-alpine/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/entrypoint.d/default.sh rename to docker/php/8.2-alpine/conf/bin/entrypoint.d/default.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/entrypoint.d/noop.sh b/docker/php/8.2-alpine/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/entrypoint.d/noop.sh rename to docker/php/8.2-alpine/conf/bin/entrypoint.d/noop.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/entrypoint.d/root.sh b/docker/php/8.2-alpine/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/entrypoint.d/root.sh rename to docker/php/8.2-alpine/conf/bin/entrypoint.d/root.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/entrypoint.d/supervisord.sh b/docker/php/8.2-alpine/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/entrypoint.d/supervisord.sh rename to docker/php/8.2-alpine/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/entrypoint.sh b/docker/php/8.2-alpine/conf/bin/entrypoint.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/entrypoint.sh rename to docker/php/8.2-alpine/conf/bin/entrypoint.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/service.d/cron.d/10-init.sh b/docker/php/8.2-alpine/conf/bin/service.d/cron.d/10-init.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/service.d/cron.d/10-init.sh rename to docker/php/8.2-alpine/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/service.d/cron.sh b/docker/php/8.2-alpine/conf/bin/service.d/cron.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/service.d/cron.sh rename to docker/php/8.2-alpine/conf/bin/service.d/cron.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php/8.2-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/php/8.2-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/service.d/dnsmasq.sh b/docker/php/8.2-alpine/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/service.d/dnsmasq.sh rename to docker/php/8.2-alpine/conf/bin/service.d/dnsmasq.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/8.2-alpine/conf/bin/service.d/php-fpm.d/10-init.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php/8.2-alpine/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/service.d/php-fpm.sh b/docker/php/8.2-alpine/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/service.d/php-fpm.sh rename to docker/php/8.2-alpine/conf/bin/service.d/php-fpm.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/php/8.2-alpine/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/service.d/postfix.d/10-init.sh rename to docker/php/8.2-alpine/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/service.d/postfix.sh b/docker/php/8.2-alpine/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/service.d/postfix.sh rename to docker/php/8.2-alpine/conf/bin/service.d/postfix.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/service.d/ssh.d/10-init.sh b/docker/php/8.2-alpine/conf/bin/service.d/ssh.d/10-init.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/service.d/ssh.d/10-init.sh rename to docker/php/8.2-alpine/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/service.d/ssh.sh b/docker/php/8.2-alpine/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/service.d/ssh.sh rename to docker/php/8.2-alpine/conf/bin/service.d/ssh.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php/8.2-alpine/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php/8.2-alpine/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/service.d/supervisor.sh b/docker/php/8.2-alpine/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/service.d/supervisor.sh rename to docker/php/8.2-alpine/conf/bin/service.d/supervisor.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php/8.2-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/php/8.2-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/service.d/syslog-ng.sh b/docker/php/8.2-alpine/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/service.d/syslog-ng.sh rename to docker/php/8.2-alpine/conf/bin/service.d/syslog-ng.sh diff --git a/docker/php-official/8.2-alpine/conf/bin/usr-bin/container-file-auto-restore b/docker/php/8.2-alpine/conf/bin/usr-bin/container-file-auto-restore similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/usr-bin/container-file-auto-restore rename to docker/php/8.2-alpine/conf/bin/usr-bin/container-file-auto-restore diff --git a/docker/php-official/8.2-alpine/conf/bin/usr-bin/docker-cronjob b/docker/php/8.2-alpine/conf/bin/usr-bin/docker-cronjob similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/usr-bin/docker-cronjob rename to docker/php/8.2-alpine/conf/bin/usr-bin/docker-cronjob diff --git a/docker/php-official/8.2-alpine/conf/bin/usr-bin/docker-php-setting b/docker/php/8.2-alpine/conf/bin/usr-bin/docker-php-setting similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/usr-bin/docker-php-setting rename to docker/php/8.2-alpine/conf/bin/usr-bin/docker-php-setting diff --git a/docker/php-official/8.2-alpine/conf/bin/usr-bin/docker-service b/docker/php/8.2-alpine/conf/bin/usr-bin/docker-service similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/usr-bin/docker-service rename to docker/php/8.2-alpine/conf/bin/usr-bin/docker-service diff --git a/docker/php-official/8.2-alpine/conf/bin/usr-bin/docker-service-disable b/docker/php/8.2-alpine/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/usr-bin/docker-service-disable rename to docker/php/8.2-alpine/conf/bin/usr-bin/docker-service-disable diff --git a/docker/php-official/8.2-alpine/conf/bin/usr-bin/docker-service-enable b/docker/php/8.2-alpine/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/usr-bin/docker-service-enable rename to docker/php/8.2-alpine/conf/bin/usr-bin/docker-service-enable diff --git a/docker/php-official/8.2-alpine/conf/bin/usr-bin/service b/docker/php/8.2-alpine/conf/bin/usr-bin/service similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/usr-bin/service rename to docker/php/8.2-alpine/conf/bin/usr-bin/service diff --git a/docker/php-official/8.2-alpine/conf/bin/usr-bin/version-compare b/docker/php/8.2-alpine/conf/bin/usr-bin/version-compare similarity index 100% rename from docker/php-official/8.2-alpine/conf/bin/usr-bin/version-compare rename to docker/php/8.2-alpine/conf/bin/usr-bin/version-compare diff --git a/docker/php-official/8.2-alpine/conf/etc/cron/.gitkeep b/docker/php/8.2-alpine/conf/etc/cron/.gitkeep similarity index 100% rename from docker/php-official/8.2-alpine/conf/etc/cron/.gitkeep rename to docker/php/8.2-alpine/conf/etc/cron/.gitkeep diff --git a/docker/php-official/8.2-alpine/conf/etc/logrotate.d/syslog-ng b/docker/php/8.2-alpine/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/php-official/8.2-alpine/conf/etc/logrotate.d/syslog-ng rename to docker/php/8.2-alpine/conf/etc/logrotate.d/syslog-ng diff --git a/docker/php-official/8.2-alpine/conf/etc/php/conf.d/.gitkeep b/docker/php/8.2-alpine/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/php-official/8.2-alpine/conf/etc/php/conf.d/.gitkeep rename to docker/php/8.2-alpine/conf/etc/php/conf.d/.gitkeep diff --git a/docker/php-official/8.2-alpine/conf/etc/php/fpm/.gitkeep b/docker/php/8.2-alpine/conf/etc/php/fpm/.gitkeep similarity index 100% rename from docker/php-official/8.2-alpine/conf/etc/php/fpm/.gitkeep rename to docker/php/8.2-alpine/conf/etc/php/fpm/.gitkeep diff --git a/docker/php-official/8.2-alpine/conf/etc/php/php.ini b/docker/php/8.2-alpine/conf/etc/php/php.ini similarity index 100% rename from docker/php-official/8.2-alpine/conf/etc/php/php.ini rename to docker/php/8.2-alpine/conf/etc/php/php.ini diff --git a/docker/php-official/8.2-alpine/conf/etc/php/php.webdevops.ini b/docker/php/8.2-alpine/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php-official/8.2-alpine/conf/etc/php/php.webdevops.ini rename to docker/php/8.2-alpine/conf/etc/php/php.webdevops.ini diff --git a/docker/php-official/8.2-alpine/conf/etc/supervisor.conf b/docker/php/8.2-alpine/conf/etc/supervisor.conf similarity index 100% rename from docker/php-official/8.2-alpine/conf/etc/supervisor.conf rename to docker/php/8.2-alpine/conf/etc/supervisor.conf diff --git a/docker/php-official/8.2-alpine/conf/etc/supervisor.d/.gitkeep b/docker/php/8.2-alpine/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/php-official/8.2-alpine/conf/etc/supervisor.d/.gitkeep rename to docker/php/8.2-alpine/conf/etc/supervisor.d/.gitkeep diff --git a/docker/php-official/8.2-alpine/conf/etc/supervisor.d/cron.conf b/docker/php/8.2-alpine/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/php-official/8.2-alpine/conf/etc/supervisor.d/cron.conf rename to docker/php/8.2-alpine/conf/etc/supervisor.d/cron.conf diff --git a/docker/php-official/8.2-alpine/conf/etc/supervisor.d/dnsmasq.conf b/docker/php/8.2-alpine/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/php-official/8.2-alpine/conf/etc/supervisor.d/dnsmasq.conf rename to docker/php/8.2-alpine/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/php-official/8.2-alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php/8.2-alpine/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php-official/8.2-alpine/conf/etc/supervisor.d/php-fpm.conf rename to docker/php/8.2-alpine/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/php-official/8.2-alpine/conf/etc/supervisor.d/postfix.conf b/docker/php/8.2-alpine/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/php-official/8.2-alpine/conf/etc/supervisor.d/postfix.conf rename to docker/php/8.2-alpine/conf/etc/supervisor.d/postfix.conf diff --git a/docker/php-official/8.2-alpine/conf/etc/supervisor.d/ssh.conf b/docker/php/8.2-alpine/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/php-official/8.2-alpine/conf/etc/supervisor.d/ssh.conf rename to docker/php/8.2-alpine/conf/etc/supervisor.d/ssh.conf diff --git a/docker/php-official/8.2-alpine/conf/etc/supervisor.d/syslog.conf b/docker/php/8.2-alpine/conf/etc/supervisor.d/syslog.conf similarity index 100% rename from docker/php-official/8.2-alpine/conf/etc/supervisor.d/syslog.conf rename to docker/php/8.2-alpine/conf/etc/supervisor.d/syslog.conf diff --git a/docker/php-official/8.2-alpine/conf/etc/syslog-ng/syslog-ng.conf b/docker/php/8.2-alpine/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/php-official/8.2-alpine/conf/etc/syslog-ng/syslog-ng.conf rename to docker/php/8.2-alpine/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php/8.2-alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/bootstrap.d/.gitkeep rename to docker/php/8.2-alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php/8.2-alpine/conf/provision/bootstrap.d/10-entrypoint.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/bootstrap.d/10-entrypoint.sh rename to docker/php/8.2-alpine/conf/provision/bootstrap.d/10-entrypoint.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/10-permissions.sh b/docker/php/8.2-alpine/conf/provision/bootstrap.d/10-permissions.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/bootstrap.d/10-permissions.sh rename to docker/php/8.2-alpine/conf/provision/bootstrap.d/10-permissions.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/8.2-alpine/conf/provision/bootstrap.d/10-php-init.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/bootstrap.d/10-php-init.sh rename to docker/php/8.2-alpine/conf/provision/bootstrap.d/10-php-init.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php/8.2-alpine/conf/provision/bootstrap.d/10-supervisor.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/bootstrap.d/10-supervisor.sh rename to docker/php/8.2-alpine/conf/provision/bootstrap.d/10-supervisor.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php/8.2-alpine/conf/provision/bootstrap.d/10-user-application.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/bootstrap.d/10-user-application.sh rename to docker/php/8.2-alpine/conf/provision/bootstrap.d/10-user-application.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/8.2-alpine/conf/provision/bootstrap.d/11-php-conf.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/bootstrap.d/11-php-conf.sh rename to docker/php/8.2-alpine/conf/provision/bootstrap.d/11-php-conf.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/20-app.sh b/docker/php/8.2-alpine/conf/provision/bootstrap.d/20-app.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/bootstrap.d/20-app.sh rename to docker/php/8.2-alpine/conf/provision/bootstrap.d/20-app.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/8.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh rename to docker/php/8.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/8.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh rename to docker/php/8.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/8.2-alpine/conf/provision/bootstrap.d/20-setup-php.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/bootstrap.d/20-setup-php.sh rename to docker/php/8.2-alpine/conf/provision/bootstrap.d/20-setup-php.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/8.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh rename to docker/php/8.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php/8.2-alpine/conf/provision/bootstrap.d/90-cleanup.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/bootstrap.d/90-cleanup.sh rename to docker/php/8.2-alpine/conf/provision/bootstrap.d/90-cleanup.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/build.d/.gitkeep b/docker/php/8.2-alpine/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/build.d/.gitkeep rename to docker/php/8.2-alpine/conf/provision/build.d/.gitkeep diff --git a/docker/php-official/8.2-alpine/conf/provision/build.d/10-cleanup.sh b/docker/php/8.2-alpine/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/build.d/10-cleanup.sh rename to docker/php/8.2-alpine/conf/provision/build.d/10-cleanup.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php/8.2-alpine/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/entrypoint.d/.gitkeep rename to docker/php/8.2-alpine/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/php-official/8.2-alpine/conf/provision/entrypoint.d/05-permissions.sh b/docker/php/8.2-alpine/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/entrypoint.d/05-permissions.sh rename to docker/php/8.2-alpine/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/8.2-alpine/conf/provision/entrypoint.d/20-php-fpm.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/entrypoint.d/20-php-fpm.sh rename to docker/php/8.2-alpine/conf/provision/entrypoint.d/20-php-fpm.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php/8.2-alpine/conf/provision/entrypoint.d/20-php.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/entrypoint.d/20-php.sh rename to docker/php/8.2-alpine/conf/provision/entrypoint.d/20-php.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/service.d/.gitkeep b/docker/php/8.2-alpine/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/service.d/.gitkeep rename to docker/php/8.2-alpine/conf/provision/service.d/.gitkeep diff --git a/docker/php-official/8.2-alpine/conf/provision/service.d/cron.sh b/docker/php/8.2-alpine/conf/provision/service.d/cron.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/service.d/cron.sh rename to docker/php/8.2-alpine/conf/provision/service.d/cron.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/service.d/dnsmasq.sh b/docker/php/8.2-alpine/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/service.d/dnsmasq.sh rename to docker/php/8.2-alpine/conf/provision/service.d/dnsmasq.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/service.d/postfix.sh b/docker/php/8.2-alpine/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/service.d/postfix.sh rename to docker/php/8.2-alpine/conf/provision/service.d/postfix.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/service.d/ssh.sh b/docker/php/8.2-alpine/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/service.d/ssh.sh rename to docker/php/8.2-alpine/conf/provision/service.d/ssh.sh diff --git a/docker/php-official/8.2-alpine/conf/provision/service.d/syslog.sh b/docker/php/8.2-alpine/conf/provision/service.d/syslog.sh similarity index 100% rename from docker/php-official/8.2-alpine/conf/provision/service.d/syslog.sh rename to docker/php/8.2-alpine/conf/provision/service.d/syslog.sh diff --git a/docker/php-official/8.2/Dockerfile b/docker/php/8.2/Dockerfile similarity index 99% rename from docker/php-official/8.2/Dockerfile rename to docker/php/8.2/Dockerfile index bf20e5675..f7659e383 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php/8.2/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:8.2 +# Dockerfile for webdevops/php:8.2 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/php-official/8.2/Dockerfile.twig b/docker/php/8.2/Dockerfile.twig similarity index 100% rename from docker/php-official/8.2/Dockerfile.twig rename to docker/php/8.2/Dockerfile.twig diff --git a/docker/php-official/8.2/conf/VERSION b/docker/php/8.2/conf/VERSION similarity index 100% rename from docker/php-official/8.2/conf/VERSION rename to docker/php/8.2/conf/VERSION diff --git a/docker/php-official/8.2/conf/bin/bootstrap.sh b/docker/php/8.2/conf/bin/bootstrap.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/bootstrap.sh rename to docker/php/8.2/conf/bin/bootstrap.sh diff --git a/docker/php-official/8.2/conf/bin/config.sh b/docker/php/8.2/conf/bin/config.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/config.sh rename to docker/php/8.2/conf/bin/config.sh diff --git a/docker/php-official/8.2/conf/bin/control.sh b/docker/php/8.2/conf/bin/control.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/control.sh rename to docker/php/8.2/conf/bin/control.sh diff --git a/docker/php-official/8.2/conf/bin/entrypoint.d/cli.sh b/docker/php/8.2/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/entrypoint.d/cli.sh rename to docker/php/8.2/conf/bin/entrypoint.d/cli.sh diff --git a/docker/php-official/8.2/conf/bin/entrypoint.d/default.sh b/docker/php/8.2/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/entrypoint.d/default.sh rename to docker/php/8.2/conf/bin/entrypoint.d/default.sh diff --git a/docker/php-official/8.2/conf/bin/entrypoint.d/noop.sh b/docker/php/8.2/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/entrypoint.d/noop.sh rename to docker/php/8.2/conf/bin/entrypoint.d/noop.sh diff --git a/docker/php-official/8.2/conf/bin/entrypoint.d/root.sh b/docker/php/8.2/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/entrypoint.d/root.sh rename to docker/php/8.2/conf/bin/entrypoint.d/root.sh diff --git a/docker/php-official/8.2/conf/bin/entrypoint.d/supervisord.sh b/docker/php/8.2/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/entrypoint.d/supervisord.sh rename to docker/php/8.2/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/php-official/8.2/conf/bin/entrypoint.sh b/docker/php/8.2/conf/bin/entrypoint.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/entrypoint.sh rename to docker/php/8.2/conf/bin/entrypoint.sh diff --git a/docker/php-official/8.2/conf/bin/service.d/cron.d/10-init.sh b/docker/php/8.2/conf/bin/service.d/cron.d/10-init.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/service.d/cron.d/10-init.sh rename to docker/php/8.2/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/php-official/8.2/conf/bin/service.d/cron.sh b/docker/php/8.2/conf/bin/service.d/cron.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/service.d/cron.sh rename to docker/php/8.2/conf/bin/service.d/cron.sh diff --git a/docker/php-official/8.2/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php/8.2/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/php/8.2/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/php-official/8.2/conf/bin/service.d/dnsmasq.sh b/docker/php/8.2/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/service.d/dnsmasq.sh rename to docker/php/8.2/conf/bin/service.d/dnsmasq.sh diff --git a/docker/php-official/8.2/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/8.2/conf/bin/service.d/php-fpm.d/10-init.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php/8.2/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php-official/8.2/conf/bin/service.d/php-fpm.sh b/docker/php/8.2/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/service.d/php-fpm.sh rename to docker/php/8.2/conf/bin/service.d/php-fpm.sh diff --git a/docker/php-official/8.2/conf/bin/service.d/postfix.d/10-init.sh b/docker/php/8.2/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/service.d/postfix.d/10-init.sh rename to docker/php/8.2/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/php-official/8.2/conf/bin/service.d/postfix.sh b/docker/php/8.2/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/service.d/postfix.sh rename to docker/php/8.2/conf/bin/service.d/postfix.sh diff --git a/docker/php-official/8.2/conf/bin/service.d/ssh.d/10-init.sh b/docker/php/8.2/conf/bin/service.d/ssh.d/10-init.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/service.d/ssh.d/10-init.sh rename to docker/php/8.2/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/php-official/8.2/conf/bin/service.d/ssh.sh b/docker/php/8.2/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/service.d/ssh.sh rename to docker/php/8.2/conf/bin/service.d/ssh.sh diff --git a/docker/php-official/8.2/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php/8.2/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php/8.2/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/php-official/8.2/conf/bin/service.d/supervisor.sh b/docker/php/8.2/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/service.d/supervisor.sh rename to docker/php/8.2/conf/bin/service.d/supervisor.sh diff --git a/docker/php-official/8.2/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php/8.2/conf/bin/service.d/syslog-ng.d/10-init.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/php/8.2/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/php-official/8.2/conf/bin/service.d/syslog-ng.sh b/docker/php/8.2/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/php-official/8.2/conf/bin/service.d/syslog-ng.sh rename to docker/php/8.2/conf/bin/service.d/syslog-ng.sh diff --git a/docker/php-official/8.2/conf/bin/usr-bin/container-file-auto-restore b/docker/php/8.2/conf/bin/usr-bin/container-file-auto-restore similarity index 100% rename from docker/php-official/8.2/conf/bin/usr-bin/container-file-auto-restore rename to docker/php/8.2/conf/bin/usr-bin/container-file-auto-restore diff --git a/docker/php-official/8.2/conf/bin/usr-bin/docker-cronjob b/docker/php/8.2/conf/bin/usr-bin/docker-cronjob similarity index 100% rename from docker/php-official/8.2/conf/bin/usr-bin/docker-cronjob rename to docker/php/8.2/conf/bin/usr-bin/docker-cronjob diff --git a/docker/php-official/8.2/conf/bin/usr-bin/docker-php-setting b/docker/php/8.2/conf/bin/usr-bin/docker-php-setting similarity index 100% rename from docker/php-official/8.2/conf/bin/usr-bin/docker-php-setting rename to docker/php/8.2/conf/bin/usr-bin/docker-php-setting diff --git a/docker/php-official/8.2/conf/bin/usr-bin/docker-service b/docker/php/8.2/conf/bin/usr-bin/docker-service similarity index 100% rename from docker/php-official/8.2/conf/bin/usr-bin/docker-service rename to docker/php/8.2/conf/bin/usr-bin/docker-service diff --git a/docker/php-official/8.2/conf/bin/usr-bin/docker-service-disable b/docker/php/8.2/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/php-official/8.2/conf/bin/usr-bin/docker-service-disable rename to docker/php/8.2/conf/bin/usr-bin/docker-service-disable diff --git a/docker/php-official/8.2/conf/bin/usr-bin/docker-service-enable b/docker/php/8.2/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/php-official/8.2/conf/bin/usr-bin/docker-service-enable rename to docker/php/8.2/conf/bin/usr-bin/docker-service-enable diff --git a/docker/php-official/8.2/conf/bin/usr-bin/service b/docker/php/8.2/conf/bin/usr-bin/service similarity index 100% rename from docker/php-official/8.2/conf/bin/usr-bin/service rename to docker/php/8.2/conf/bin/usr-bin/service diff --git a/docker/php-official/8.2/conf/bin/usr-bin/version-compare b/docker/php/8.2/conf/bin/usr-bin/version-compare similarity index 100% rename from docker/php-official/8.2/conf/bin/usr-bin/version-compare rename to docker/php/8.2/conf/bin/usr-bin/version-compare diff --git a/docker/php-official/8.2/conf/etc/cron/.gitkeep b/docker/php/8.2/conf/etc/cron/.gitkeep similarity index 100% rename from docker/php-official/8.2/conf/etc/cron/.gitkeep rename to docker/php/8.2/conf/etc/cron/.gitkeep diff --git a/docker/php-official/8.2/conf/etc/logrotate.d/syslog-ng b/docker/php/8.2/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/php-official/8.2/conf/etc/logrotate.d/syslog-ng rename to docker/php/8.2/conf/etc/logrotate.d/syslog-ng diff --git a/docker/php-official/8.2/conf/etc/php/conf.d/.gitkeep b/docker/php/8.2/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/php-official/8.2/conf/etc/php/conf.d/.gitkeep rename to docker/php/8.2/conf/etc/php/conf.d/.gitkeep diff --git a/docker/php-official/8.2/conf/etc/php/fpm/.gitkeep b/docker/php/8.2/conf/etc/php/fpm/.gitkeep similarity index 100% rename from docker/php-official/8.2/conf/etc/php/fpm/.gitkeep rename to docker/php/8.2/conf/etc/php/fpm/.gitkeep diff --git a/docker/php-official/8.2/conf/etc/php/php.ini b/docker/php/8.2/conf/etc/php/php.ini similarity index 100% rename from docker/php-official/8.2/conf/etc/php/php.ini rename to docker/php/8.2/conf/etc/php/php.ini diff --git a/docker/php-official/8.2/conf/etc/php/php.webdevops.ini b/docker/php/8.2/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php-official/8.2/conf/etc/php/php.webdevops.ini rename to docker/php/8.2/conf/etc/php/php.webdevops.ini diff --git a/docker/php-official/8.2/conf/etc/supervisor.conf b/docker/php/8.2/conf/etc/supervisor.conf similarity index 100% rename from docker/php-official/8.2/conf/etc/supervisor.conf rename to docker/php/8.2/conf/etc/supervisor.conf diff --git a/docker/php-official/8.2/conf/etc/supervisor.d/.gitkeep b/docker/php/8.2/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/php-official/8.2/conf/etc/supervisor.d/.gitkeep rename to docker/php/8.2/conf/etc/supervisor.d/.gitkeep diff --git a/docker/php-official/8.2/conf/etc/supervisor.d/cron.conf b/docker/php/8.2/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/php-official/8.2/conf/etc/supervisor.d/cron.conf rename to docker/php/8.2/conf/etc/supervisor.d/cron.conf diff --git a/docker/php-official/8.2/conf/etc/supervisor.d/dnsmasq.conf b/docker/php/8.2/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/php-official/8.2/conf/etc/supervisor.d/dnsmasq.conf rename to docker/php/8.2/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/php-official/8.2/conf/etc/supervisor.d/php-fpm.conf b/docker/php/8.2/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php-official/8.2/conf/etc/supervisor.d/php-fpm.conf rename to docker/php/8.2/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/php-official/8.2/conf/etc/supervisor.d/postfix.conf b/docker/php/8.2/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/php-official/8.2/conf/etc/supervisor.d/postfix.conf rename to docker/php/8.2/conf/etc/supervisor.d/postfix.conf diff --git a/docker/php-official/8.2/conf/etc/supervisor.d/ssh.conf b/docker/php/8.2/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/php-official/8.2/conf/etc/supervisor.d/ssh.conf rename to docker/php/8.2/conf/etc/supervisor.d/ssh.conf diff --git a/docker/php-official/8.2/conf/etc/supervisor.d/syslog.conf b/docker/php/8.2/conf/etc/supervisor.d/syslog.conf similarity index 100% rename from docker/php-official/8.2/conf/etc/supervisor.d/syslog.conf rename to docker/php/8.2/conf/etc/supervisor.d/syslog.conf diff --git a/docker/php-official/8.2/conf/etc/syslog-ng/syslog-ng.conf b/docker/php/8.2/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/php-official/8.2/conf/etc/syslog-ng/syslog-ng.conf rename to docker/php/8.2/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/php-official/8.2/conf/provision/bootstrap.d/.gitkeep b/docker/php/8.2/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/php-official/8.2/conf/provision/bootstrap.d/.gitkeep rename to docker/php/8.2/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/php-official/8.2/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php/8.2/conf/provision/bootstrap.d/10-entrypoint.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/bootstrap.d/10-entrypoint.sh rename to docker/php/8.2/conf/provision/bootstrap.d/10-entrypoint.sh diff --git a/docker/php-official/8.2/conf/provision/bootstrap.d/10-permissions.sh b/docker/php/8.2/conf/provision/bootstrap.d/10-permissions.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/bootstrap.d/10-permissions.sh rename to docker/php/8.2/conf/provision/bootstrap.d/10-permissions.sh diff --git a/docker/php-official/8.2/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/8.2/conf/provision/bootstrap.d/10-php-init.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/bootstrap.d/10-php-init.sh rename to docker/php/8.2/conf/provision/bootstrap.d/10-php-init.sh diff --git a/docker/php-official/8.2/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php/8.2/conf/provision/bootstrap.d/10-supervisor.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/bootstrap.d/10-supervisor.sh rename to docker/php/8.2/conf/provision/bootstrap.d/10-supervisor.sh diff --git a/docker/php-official/8.2/conf/provision/bootstrap.d/10-user-application.sh b/docker/php/8.2/conf/provision/bootstrap.d/10-user-application.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/bootstrap.d/10-user-application.sh rename to docker/php/8.2/conf/provision/bootstrap.d/10-user-application.sh diff --git a/docker/php-official/8.2/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/8.2/conf/provision/bootstrap.d/11-php-conf.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/bootstrap.d/11-php-conf.sh rename to docker/php/8.2/conf/provision/bootstrap.d/11-php-conf.sh diff --git a/docker/php-official/8.2/conf/provision/bootstrap.d/20-app.sh b/docker/php/8.2/conf/provision/bootstrap.d/20-app.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/bootstrap.d/20-app.sh rename to docker/php/8.2/conf/provision/bootstrap.d/20-app.sh diff --git a/docker/php-official/8.2/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/8.2/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh rename to docker/php/8.2/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh diff --git a/docker/php-official/8.2/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/8.2/conf/provision/bootstrap.d/20-setup-php-fpm.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/bootstrap.d/20-setup-php-fpm.sh rename to docker/php/8.2/conf/provision/bootstrap.d/20-setup-php-fpm.sh diff --git a/docker/php-official/8.2/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/8.2/conf/provision/bootstrap.d/20-setup-php.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/bootstrap.d/20-setup-php.sh rename to docker/php/8.2/conf/provision/bootstrap.d/20-setup-php.sh diff --git a/docker/php-official/8.2/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/8.2/conf/provision/bootstrap.d/30-setup-ioncube.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/bootstrap.d/30-setup-ioncube.sh rename to docker/php/8.2/conf/provision/bootstrap.d/30-setup-ioncube.sh diff --git a/docker/php-official/8.2/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php/8.2/conf/provision/bootstrap.d/90-cleanup.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/bootstrap.d/90-cleanup.sh rename to docker/php/8.2/conf/provision/bootstrap.d/90-cleanup.sh diff --git a/docker/php-official/8.2/conf/provision/build.d/.gitkeep b/docker/php/8.2/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/php-official/8.2/conf/provision/build.d/.gitkeep rename to docker/php/8.2/conf/provision/build.d/.gitkeep diff --git a/docker/php-official/8.2/conf/provision/build.d/10-cleanup.sh b/docker/php/8.2/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/build.d/10-cleanup.sh rename to docker/php/8.2/conf/provision/build.d/10-cleanup.sh diff --git a/docker/php-official/8.2/conf/provision/entrypoint.d/.gitkeep b/docker/php/8.2/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/php-official/8.2/conf/provision/entrypoint.d/.gitkeep rename to docker/php/8.2/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/php-official/8.2/conf/provision/entrypoint.d/05-permissions.sh b/docker/php/8.2/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/entrypoint.d/05-permissions.sh rename to docker/php/8.2/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/php-official/8.2/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/8.2/conf/provision/entrypoint.d/20-php-fpm.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/entrypoint.d/20-php-fpm.sh rename to docker/php/8.2/conf/provision/entrypoint.d/20-php-fpm.sh diff --git a/docker/php-official/8.2/conf/provision/entrypoint.d/20-php.sh b/docker/php/8.2/conf/provision/entrypoint.d/20-php.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/entrypoint.d/20-php.sh rename to docker/php/8.2/conf/provision/entrypoint.d/20-php.sh diff --git a/docker/php-official/8.2/conf/provision/service.d/.gitkeep b/docker/php/8.2/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/php-official/8.2/conf/provision/service.d/.gitkeep rename to docker/php/8.2/conf/provision/service.d/.gitkeep diff --git a/docker/php-official/8.2/conf/provision/service.d/cron.sh b/docker/php/8.2/conf/provision/service.d/cron.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/service.d/cron.sh rename to docker/php/8.2/conf/provision/service.d/cron.sh diff --git a/docker/php-official/8.2/conf/provision/service.d/dnsmasq.sh b/docker/php/8.2/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/service.d/dnsmasq.sh rename to docker/php/8.2/conf/provision/service.d/dnsmasq.sh diff --git a/docker/php-official/8.2/conf/provision/service.d/postfix.sh b/docker/php/8.2/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/service.d/postfix.sh rename to docker/php/8.2/conf/provision/service.d/postfix.sh diff --git a/docker/php-official/8.2/conf/provision/service.d/ssh.sh b/docker/php/8.2/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/service.d/ssh.sh rename to docker/php/8.2/conf/provision/service.d/ssh.sh diff --git a/docker/php-official/8.2/conf/provision/service.d/syslog.sh b/docker/php/8.2/conf/provision/service.d/syslog.sh similarity index 100% rename from docker/php-official/8.2/conf/provision/service.d/syslog.sh rename to docker/php/8.2/conf/provision/service.d/syslog.sh diff --git a/docker/php/8.3 b/docker/php/8.3 deleted file mode 120000 index ac8f4df77..000000000 --- a/docker/php/8.3 +++ /dev/null @@ -1 +0,0 @@ -../php-official/8.3 \ No newline at end of file diff --git a/docker/php/8.3-alpine b/docker/php/8.3-alpine deleted file mode 120000 index bce304294..000000000 --- a/docker/php/8.3-alpine +++ /dev/null @@ -1 +0,0 @@ -../php-official/8.3-alpine \ No newline at end of file diff --git a/docker/php-official/8.3-alpine/Dockerfile b/docker/php/8.3-alpine/Dockerfile similarity index 99% rename from docker/php-official/8.3-alpine/Dockerfile rename to docker/php/8.3-alpine/Dockerfile index 96356c571..281b40f16 100644 --- a/docker/php-official/8.3-alpine/Dockerfile +++ b/docker/php/8.3-alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:8.3-alpine +# Dockerfile for webdevops/php:8.3-alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/php-official/8.3-alpine/Dockerfile.twig b/docker/php/8.3-alpine/Dockerfile.twig similarity index 100% rename from docker/php-official/8.3-alpine/Dockerfile.twig rename to docker/php/8.3-alpine/Dockerfile.twig diff --git a/docker/php-official/8.3-alpine/conf/VERSION b/docker/php/8.3-alpine/conf/VERSION similarity index 100% rename from docker/php-official/8.3-alpine/conf/VERSION rename to docker/php/8.3-alpine/conf/VERSION diff --git a/docker/php-official/8.3-alpine/conf/bin/bootstrap.sh b/docker/php/8.3-alpine/conf/bin/bootstrap.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/bootstrap.sh rename to docker/php/8.3-alpine/conf/bin/bootstrap.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/config.sh b/docker/php/8.3-alpine/conf/bin/config.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/config.sh rename to docker/php/8.3-alpine/conf/bin/config.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/control.sh b/docker/php/8.3-alpine/conf/bin/control.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/control.sh rename to docker/php/8.3-alpine/conf/bin/control.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/cli.sh b/docker/php/8.3-alpine/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/entrypoint.d/cli.sh rename to docker/php/8.3-alpine/conf/bin/entrypoint.d/cli.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/default.sh b/docker/php/8.3-alpine/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/entrypoint.d/default.sh rename to docker/php/8.3-alpine/conf/bin/entrypoint.d/default.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/noop.sh b/docker/php/8.3-alpine/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/entrypoint.d/noop.sh rename to docker/php/8.3-alpine/conf/bin/entrypoint.d/noop.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/root.sh b/docker/php/8.3-alpine/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/entrypoint.d/root.sh rename to docker/php/8.3-alpine/conf/bin/entrypoint.d/root.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/supervisord.sh b/docker/php/8.3-alpine/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/entrypoint.d/supervisord.sh rename to docker/php/8.3-alpine/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/entrypoint.sh b/docker/php/8.3-alpine/conf/bin/entrypoint.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/entrypoint.sh rename to docker/php/8.3-alpine/conf/bin/entrypoint.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/cron.d/10-init.sh b/docker/php/8.3-alpine/conf/bin/service.d/cron.d/10-init.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/service.d/cron.d/10-init.sh rename to docker/php/8.3-alpine/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/cron.sh b/docker/php/8.3-alpine/conf/bin/service.d/cron.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/service.d/cron.sh rename to docker/php/8.3-alpine/conf/bin/service.d/cron.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php/8.3-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/php/8.3-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/dnsmasq.sh b/docker/php/8.3-alpine/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/service.d/dnsmasq.sh rename to docker/php/8.3-alpine/conf/bin/service.d/dnsmasq.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/8.3-alpine/conf/bin/service.d/php-fpm.d/10-init.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php/8.3-alpine/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.sh b/docker/php/8.3-alpine/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.sh rename to docker/php/8.3-alpine/conf/bin/service.d/php-fpm.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/php/8.3-alpine/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/service.d/postfix.d/10-init.sh rename to docker/php/8.3-alpine/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/postfix.sh b/docker/php/8.3-alpine/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/service.d/postfix.sh rename to docker/php/8.3-alpine/conf/bin/service.d/postfix.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/ssh.d/10-init.sh b/docker/php/8.3-alpine/conf/bin/service.d/ssh.d/10-init.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/service.d/ssh.d/10-init.sh rename to docker/php/8.3-alpine/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/ssh.sh b/docker/php/8.3-alpine/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/service.d/ssh.sh rename to docker/php/8.3-alpine/conf/bin/service.d/ssh.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php/8.3-alpine/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php/8.3-alpine/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/supervisor.sh b/docker/php/8.3-alpine/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/service.d/supervisor.sh rename to docker/php/8.3-alpine/conf/bin/service.d/supervisor.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php/8.3-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/php/8.3-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/syslog-ng.sh b/docker/php/8.3-alpine/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/service.d/syslog-ng.sh rename to docker/php/8.3-alpine/conf/bin/service.d/syslog-ng.sh diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/container-file-auto-restore b/docker/php/8.3-alpine/conf/bin/usr-bin/container-file-auto-restore similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/usr-bin/container-file-auto-restore rename to docker/php/8.3-alpine/conf/bin/usr-bin/container-file-auto-restore diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-cronjob b/docker/php/8.3-alpine/conf/bin/usr-bin/docker-cronjob similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-cronjob rename to docker/php/8.3-alpine/conf/bin/usr-bin/docker-cronjob diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-php-setting b/docker/php/8.3-alpine/conf/bin/usr-bin/docker-php-setting similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-php-setting rename to docker/php/8.3-alpine/conf/bin/usr-bin/docker-php-setting diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service b/docker/php/8.3-alpine/conf/bin/usr-bin/docker-service similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service rename to docker/php/8.3-alpine/conf/bin/usr-bin/docker-service diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service-disable b/docker/php/8.3-alpine/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service-disable rename to docker/php/8.3-alpine/conf/bin/usr-bin/docker-service-disable diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service-enable b/docker/php/8.3-alpine/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service-enable rename to docker/php/8.3-alpine/conf/bin/usr-bin/docker-service-enable diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/service b/docker/php/8.3-alpine/conf/bin/usr-bin/service similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/usr-bin/service rename to docker/php/8.3-alpine/conf/bin/usr-bin/service diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/version-compare b/docker/php/8.3-alpine/conf/bin/usr-bin/version-compare similarity index 100% rename from docker/php-official/8.3-alpine/conf/bin/usr-bin/version-compare rename to docker/php/8.3-alpine/conf/bin/usr-bin/version-compare diff --git a/docker/php-official/8.3-alpine/conf/etc/cron/.gitkeep b/docker/php/8.3-alpine/conf/etc/cron/.gitkeep similarity index 100% rename from docker/php-official/8.3-alpine/conf/etc/cron/.gitkeep rename to docker/php/8.3-alpine/conf/etc/cron/.gitkeep diff --git a/docker/php-official/8.3-alpine/conf/etc/logrotate.d/syslog-ng b/docker/php/8.3-alpine/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/php-official/8.3-alpine/conf/etc/logrotate.d/syslog-ng rename to docker/php/8.3-alpine/conf/etc/logrotate.d/syslog-ng diff --git a/docker/php-official/8.3-alpine/conf/etc/php/conf.d/.gitkeep b/docker/php/8.3-alpine/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/php-official/8.3-alpine/conf/etc/php/conf.d/.gitkeep rename to docker/php/8.3-alpine/conf/etc/php/conf.d/.gitkeep diff --git a/docker/php-official/8.3-alpine/conf/etc/php/fpm/.gitkeep b/docker/php/8.3-alpine/conf/etc/php/fpm/.gitkeep similarity index 100% rename from docker/php-official/8.3-alpine/conf/etc/php/fpm/.gitkeep rename to docker/php/8.3-alpine/conf/etc/php/fpm/.gitkeep diff --git a/docker/php-official/8.3-alpine/conf/etc/php/php.ini b/docker/php/8.3-alpine/conf/etc/php/php.ini similarity index 100% rename from docker/php-official/8.3-alpine/conf/etc/php/php.ini rename to docker/php/8.3-alpine/conf/etc/php/php.ini diff --git a/docker/php-official/8.3-alpine/conf/etc/php/php.webdevops.ini b/docker/php/8.3-alpine/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php-official/8.3-alpine/conf/etc/php/php.webdevops.ini rename to docker/php/8.3-alpine/conf/etc/php/php.webdevops.ini diff --git a/docker/php-official/8.3-alpine/conf/etc/supervisor.conf b/docker/php/8.3-alpine/conf/etc/supervisor.conf similarity index 100% rename from docker/php-official/8.3-alpine/conf/etc/supervisor.conf rename to docker/php/8.3-alpine/conf/etc/supervisor.conf diff --git a/docker/php-official/8.3-alpine/conf/etc/supervisor.d/.gitkeep b/docker/php/8.3-alpine/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/php-official/8.3-alpine/conf/etc/supervisor.d/.gitkeep rename to docker/php/8.3-alpine/conf/etc/supervisor.d/.gitkeep diff --git a/docker/php-official/8.3-alpine/conf/etc/supervisor.d/cron.conf b/docker/php/8.3-alpine/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/php-official/8.3-alpine/conf/etc/supervisor.d/cron.conf rename to docker/php/8.3-alpine/conf/etc/supervisor.d/cron.conf diff --git a/docker/php-official/8.3-alpine/conf/etc/supervisor.d/dnsmasq.conf b/docker/php/8.3-alpine/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/php-official/8.3-alpine/conf/etc/supervisor.d/dnsmasq.conf rename to docker/php/8.3-alpine/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/php-official/8.3-alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php/8.3-alpine/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php-official/8.3-alpine/conf/etc/supervisor.d/php-fpm.conf rename to docker/php/8.3-alpine/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/php-official/8.3-alpine/conf/etc/supervisor.d/postfix.conf b/docker/php/8.3-alpine/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/php-official/8.3-alpine/conf/etc/supervisor.d/postfix.conf rename to docker/php/8.3-alpine/conf/etc/supervisor.d/postfix.conf diff --git a/docker/php-official/8.3-alpine/conf/etc/supervisor.d/ssh.conf b/docker/php/8.3-alpine/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/php-official/8.3-alpine/conf/etc/supervisor.d/ssh.conf rename to docker/php/8.3-alpine/conf/etc/supervisor.d/ssh.conf diff --git a/docker/php-official/8.3-alpine/conf/etc/supervisor.d/syslog.conf b/docker/php/8.3-alpine/conf/etc/supervisor.d/syslog.conf similarity index 100% rename from docker/php-official/8.3-alpine/conf/etc/supervisor.d/syslog.conf rename to docker/php/8.3-alpine/conf/etc/supervisor.d/syslog.conf diff --git a/docker/php-official/8.3-alpine/conf/etc/syslog-ng/syslog-ng.conf b/docker/php/8.3-alpine/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/php-official/8.3-alpine/conf/etc/syslog-ng/syslog-ng.conf rename to docker/php/8.3-alpine/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php/8.3-alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/bootstrap.d/.gitkeep rename to docker/php/8.3-alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php/8.3-alpine/conf/provision/bootstrap.d/10-entrypoint.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-entrypoint.sh rename to docker/php/8.3-alpine/conf/provision/bootstrap.d/10-entrypoint.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-permissions.sh b/docker/php/8.3-alpine/conf/provision/bootstrap.d/10-permissions.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-permissions.sh rename to docker/php/8.3-alpine/conf/provision/bootstrap.d/10-permissions.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/8.3-alpine/conf/provision/bootstrap.d/10-php-init.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-php-init.sh rename to docker/php/8.3-alpine/conf/provision/bootstrap.d/10-php-init.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php/8.3-alpine/conf/provision/bootstrap.d/10-supervisor.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-supervisor.sh rename to docker/php/8.3-alpine/conf/provision/bootstrap.d/10-supervisor.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php/8.3-alpine/conf/provision/bootstrap.d/10-user-application.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-user-application.sh rename to docker/php/8.3-alpine/conf/provision/bootstrap.d/10-user-application.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/8.3-alpine/conf/provision/bootstrap.d/11-php-conf.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/bootstrap.d/11-php-conf.sh rename to docker/php/8.3-alpine/conf/provision/bootstrap.d/11-php-conf.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-app.sh b/docker/php/8.3-alpine/conf/provision/bootstrap.d/20-app.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-app.sh rename to docker/php/8.3-alpine/conf/provision/bootstrap.d/20-app.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh rename to docker/php/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh rename to docker/php/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/8.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh rename to docker/php/8.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh rename to docker/php/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php/8.3-alpine/conf/provision/bootstrap.d/90-cleanup.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/bootstrap.d/90-cleanup.sh rename to docker/php/8.3-alpine/conf/provision/bootstrap.d/90-cleanup.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/build.d/.gitkeep b/docker/php/8.3-alpine/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/build.d/.gitkeep rename to docker/php/8.3-alpine/conf/provision/build.d/.gitkeep diff --git a/docker/php-official/8.3-alpine/conf/provision/build.d/10-cleanup.sh b/docker/php/8.3-alpine/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/build.d/10-cleanup.sh rename to docker/php/8.3-alpine/conf/provision/build.d/10-cleanup.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php/8.3-alpine/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/entrypoint.d/.gitkeep rename to docker/php/8.3-alpine/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/05-permissions.sh b/docker/php/8.3-alpine/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/entrypoint.d/05-permissions.sh rename to docker/php/8.3-alpine/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/8.3-alpine/conf/provision/entrypoint.d/20-php-fpm.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/entrypoint.d/20-php-fpm.sh rename to docker/php/8.3-alpine/conf/provision/entrypoint.d/20-php-fpm.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php/8.3-alpine/conf/provision/entrypoint.d/20-php.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/entrypoint.d/20-php.sh rename to docker/php/8.3-alpine/conf/provision/entrypoint.d/20-php.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/service.d/.gitkeep b/docker/php/8.3-alpine/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/service.d/.gitkeep rename to docker/php/8.3-alpine/conf/provision/service.d/.gitkeep diff --git a/docker/php-official/8.3-alpine/conf/provision/service.d/cron.sh b/docker/php/8.3-alpine/conf/provision/service.d/cron.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/service.d/cron.sh rename to docker/php/8.3-alpine/conf/provision/service.d/cron.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/service.d/dnsmasq.sh b/docker/php/8.3-alpine/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/service.d/dnsmasq.sh rename to docker/php/8.3-alpine/conf/provision/service.d/dnsmasq.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/service.d/postfix.sh b/docker/php/8.3-alpine/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/service.d/postfix.sh rename to docker/php/8.3-alpine/conf/provision/service.d/postfix.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/service.d/ssh.sh b/docker/php/8.3-alpine/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/service.d/ssh.sh rename to docker/php/8.3-alpine/conf/provision/service.d/ssh.sh diff --git a/docker/php-official/8.3-alpine/conf/provision/service.d/syslog.sh b/docker/php/8.3-alpine/conf/provision/service.d/syslog.sh similarity index 100% rename from docker/php-official/8.3-alpine/conf/provision/service.d/syslog.sh rename to docker/php/8.3-alpine/conf/provision/service.d/syslog.sh diff --git a/docker/php-official/8.3/Dockerfile b/docker/php/8.3/Dockerfile similarity index 99% rename from docker/php-official/8.3/Dockerfile rename to docker/php/8.3/Dockerfile index a58a0c6a8..84855b09b 100644 --- a/docker/php-official/8.3/Dockerfile +++ b/docker/php/8.3/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:8.3 +# Dockerfile for webdevops/php:8.3 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/php-official/8.3/Dockerfile.twig b/docker/php/8.3/Dockerfile.twig similarity index 100% rename from docker/php-official/8.3/Dockerfile.twig rename to docker/php/8.3/Dockerfile.twig diff --git a/docker/php-official/8.3/conf/VERSION b/docker/php/8.3/conf/VERSION similarity index 100% rename from docker/php-official/8.3/conf/VERSION rename to docker/php/8.3/conf/VERSION diff --git a/docker/php-official/8.3/conf/bin/bootstrap.sh b/docker/php/8.3/conf/bin/bootstrap.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/bootstrap.sh rename to docker/php/8.3/conf/bin/bootstrap.sh diff --git a/docker/php-official/8.3/conf/bin/config.sh b/docker/php/8.3/conf/bin/config.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/config.sh rename to docker/php/8.3/conf/bin/config.sh diff --git a/docker/php-official/8.3/conf/bin/control.sh b/docker/php/8.3/conf/bin/control.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/control.sh rename to docker/php/8.3/conf/bin/control.sh diff --git a/docker/php-official/8.3/conf/bin/entrypoint.d/cli.sh b/docker/php/8.3/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/entrypoint.d/cli.sh rename to docker/php/8.3/conf/bin/entrypoint.d/cli.sh diff --git a/docker/php-official/8.3/conf/bin/entrypoint.d/default.sh b/docker/php/8.3/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/entrypoint.d/default.sh rename to docker/php/8.3/conf/bin/entrypoint.d/default.sh diff --git a/docker/php-official/8.3/conf/bin/entrypoint.d/noop.sh b/docker/php/8.3/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/entrypoint.d/noop.sh rename to docker/php/8.3/conf/bin/entrypoint.d/noop.sh diff --git a/docker/php-official/8.3/conf/bin/entrypoint.d/root.sh b/docker/php/8.3/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/entrypoint.d/root.sh rename to docker/php/8.3/conf/bin/entrypoint.d/root.sh diff --git a/docker/php-official/8.3/conf/bin/entrypoint.d/supervisord.sh b/docker/php/8.3/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/entrypoint.d/supervisord.sh rename to docker/php/8.3/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/php-official/8.3/conf/bin/entrypoint.sh b/docker/php/8.3/conf/bin/entrypoint.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/entrypoint.sh rename to docker/php/8.3/conf/bin/entrypoint.sh diff --git a/docker/php-official/8.3/conf/bin/service.d/cron.d/10-init.sh b/docker/php/8.3/conf/bin/service.d/cron.d/10-init.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/service.d/cron.d/10-init.sh rename to docker/php/8.3/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/php-official/8.3/conf/bin/service.d/cron.sh b/docker/php/8.3/conf/bin/service.d/cron.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/service.d/cron.sh rename to docker/php/8.3/conf/bin/service.d/cron.sh diff --git a/docker/php-official/8.3/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php/8.3/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/php/8.3/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/php-official/8.3/conf/bin/service.d/dnsmasq.sh b/docker/php/8.3/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/service.d/dnsmasq.sh rename to docker/php/8.3/conf/bin/service.d/dnsmasq.sh diff --git a/docker/php-official/8.3/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/8.3/conf/bin/service.d/php-fpm.d/10-init.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php/8.3/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php-official/8.3/conf/bin/service.d/php-fpm.sh b/docker/php/8.3/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/service.d/php-fpm.sh rename to docker/php/8.3/conf/bin/service.d/php-fpm.sh diff --git a/docker/php-official/8.3/conf/bin/service.d/postfix.d/10-init.sh b/docker/php/8.3/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/service.d/postfix.d/10-init.sh rename to docker/php/8.3/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/php-official/8.3/conf/bin/service.d/postfix.sh b/docker/php/8.3/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/service.d/postfix.sh rename to docker/php/8.3/conf/bin/service.d/postfix.sh diff --git a/docker/php-official/8.3/conf/bin/service.d/ssh.d/10-init.sh b/docker/php/8.3/conf/bin/service.d/ssh.d/10-init.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/service.d/ssh.d/10-init.sh rename to docker/php/8.3/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/php-official/8.3/conf/bin/service.d/ssh.sh b/docker/php/8.3/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/service.d/ssh.sh rename to docker/php/8.3/conf/bin/service.d/ssh.sh diff --git a/docker/php-official/8.3/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php/8.3/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php/8.3/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/php-official/8.3/conf/bin/service.d/supervisor.sh b/docker/php/8.3/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/service.d/supervisor.sh rename to docker/php/8.3/conf/bin/service.d/supervisor.sh diff --git a/docker/php-official/8.3/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php/8.3/conf/bin/service.d/syslog-ng.d/10-init.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/php/8.3/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/php-official/8.3/conf/bin/service.d/syslog-ng.sh b/docker/php/8.3/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/php-official/8.3/conf/bin/service.d/syslog-ng.sh rename to docker/php/8.3/conf/bin/service.d/syslog-ng.sh diff --git a/docker/php-official/8.3/conf/bin/usr-bin/container-file-auto-restore b/docker/php/8.3/conf/bin/usr-bin/container-file-auto-restore similarity index 100% rename from docker/php-official/8.3/conf/bin/usr-bin/container-file-auto-restore rename to docker/php/8.3/conf/bin/usr-bin/container-file-auto-restore diff --git a/docker/php-official/8.3/conf/bin/usr-bin/docker-cronjob b/docker/php/8.3/conf/bin/usr-bin/docker-cronjob similarity index 100% rename from docker/php-official/8.3/conf/bin/usr-bin/docker-cronjob rename to docker/php/8.3/conf/bin/usr-bin/docker-cronjob diff --git a/docker/php-official/8.3/conf/bin/usr-bin/docker-php-setting b/docker/php/8.3/conf/bin/usr-bin/docker-php-setting similarity index 100% rename from docker/php-official/8.3/conf/bin/usr-bin/docker-php-setting rename to docker/php/8.3/conf/bin/usr-bin/docker-php-setting diff --git a/docker/php-official/8.3/conf/bin/usr-bin/docker-service b/docker/php/8.3/conf/bin/usr-bin/docker-service similarity index 100% rename from docker/php-official/8.3/conf/bin/usr-bin/docker-service rename to docker/php/8.3/conf/bin/usr-bin/docker-service diff --git a/docker/php-official/8.3/conf/bin/usr-bin/docker-service-disable b/docker/php/8.3/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/php-official/8.3/conf/bin/usr-bin/docker-service-disable rename to docker/php/8.3/conf/bin/usr-bin/docker-service-disable diff --git a/docker/php-official/8.3/conf/bin/usr-bin/docker-service-enable b/docker/php/8.3/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/php-official/8.3/conf/bin/usr-bin/docker-service-enable rename to docker/php/8.3/conf/bin/usr-bin/docker-service-enable diff --git a/docker/php-official/8.3/conf/bin/usr-bin/service b/docker/php/8.3/conf/bin/usr-bin/service similarity index 100% rename from docker/php-official/8.3/conf/bin/usr-bin/service rename to docker/php/8.3/conf/bin/usr-bin/service diff --git a/docker/php-official/8.3/conf/bin/usr-bin/version-compare b/docker/php/8.3/conf/bin/usr-bin/version-compare similarity index 100% rename from docker/php-official/8.3/conf/bin/usr-bin/version-compare rename to docker/php/8.3/conf/bin/usr-bin/version-compare diff --git a/docker/php-official/8.3/conf/etc/cron/.gitkeep b/docker/php/8.3/conf/etc/cron/.gitkeep similarity index 100% rename from docker/php-official/8.3/conf/etc/cron/.gitkeep rename to docker/php/8.3/conf/etc/cron/.gitkeep diff --git a/docker/php-official/8.3/conf/etc/logrotate.d/syslog-ng b/docker/php/8.3/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/php-official/8.3/conf/etc/logrotate.d/syslog-ng rename to docker/php/8.3/conf/etc/logrotate.d/syslog-ng diff --git a/docker/php-official/8.3/conf/etc/php/conf.d/.gitkeep b/docker/php/8.3/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/php-official/8.3/conf/etc/php/conf.d/.gitkeep rename to docker/php/8.3/conf/etc/php/conf.d/.gitkeep diff --git a/docker/php-official/8.3/conf/etc/php/fpm/.gitkeep b/docker/php/8.3/conf/etc/php/fpm/.gitkeep similarity index 100% rename from docker/php-official/8.3/conf/etc/php/fpm/.gitkeep rename to docker/php/8.3/conf/etc/php/fpm/.gitkeep diff --git a/docker/php-official/8.3/conf/etc/php/php.ini b/docker/php/8.3/conf/etc/php/php.ini similarity index 100% rename from docker/php-official/8.3/conf/etc/php/php.ini rename to docker/php/8.3/conf/etc/php/php.ini diff --git a/docker/php-official/8.3/conf/etc/php/php.webdevops.ini b/docker/php/8.3/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php-official/8.3/conf/etc/php/php.webdevops.ini rename to docker/php/8.3/conf/etc/php/php.webdevops.ini diff --git a/docker/php-official/8.3/conf/etc/supervisor.conf b/docker/php/8.3/conf/etc/supervisor.conf similarity index 100% rename from docker/php-official/8.3/conf/etc/supervisor.conf rename to docker/php/8.3/conf/etc/supervisor.conf diff --git a/docker/php-official/8.3/conf/etc/supervisor.d/.gitkeep b/docker/php/8.3/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/php-official/8.3/conf/etc/supervisor.d/.gitkeep rename to docker/php/8.3/conf/etc/supervisor.d/.gitkeep diff --git a/docker/php-official/8.3/conf/etc/supervisor.d/cron.conf b/docker/php/8.3/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/php-official/8.3/conf/etc/supervisor.d/cron.conf rename to docker/php/8.3/conf/etc/supervisor.d/cron.conf diff --git a/docker/php-official/8.3/conf/etc/supervisor.d/dnsmasq.conf b/docker/php/8.3/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/php-official/8.3/conf/etc/supervisor.d/dnsmasq.conf rename to docker/php/8.3/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/php-official/8.3/conf/etc/supervisor.d/php-fpm.conf b/docker/php/8.3/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php-official/8.3/conf/etc/supervisor.d/php-fpm.conf rename to docker/php/8.3/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/php-official/8.3/conf/etc/supervisor.d/postfix.conf b/docker/php/8.3/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/php-official/8.3/conf/etc/supervisor.d/postfix.conf rename to docker/php/8.3/conf/etc/supervisor.d/postfix.conf diff --git a/docker/php-official/8.3/conf/etc/supervisor.d/ssh.conf b/docker/php/8.3/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/php-official/8.3/conf/etc/supervisor.d/ssh.conf rename to docker/php/8.3/conf/etc/supervisor.d/ssh.conf diff --git a/docker/php-official/8.3/conf/etc/supervisor.d/syslog.conf b/docker/php/8.3/conf/etc/supervisor.d/syslog.conf similarity index 100% rename from docker/php-official/8.3/conf/etc/supervisor.d/syslog.conf rename to docker/php/8.3/conf/etc/supervisor.d/syslog.conf diff --git a/docker/php-official/8.3/conf/etc/syslog-ng/syslog-ng.conf b/docker/php/8.3/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/php-official/8.3/conf/etc/syslog-ng/syslog-ng.conf rename to docker/php/8.3/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/.gitkeep b/docker/php/8.3/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/php-official/8.3/conf/provision/bootstrap.d/.gitkeep rename to docker/php/8.3/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php/8.3/conf/provision/bootstrap.d/10-entrypoint.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/bootstrap.d/10-entrypoint.sh rename to docker/php/8.3/conf/provision/bootstrap.d/10-entrypoint.sh diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/10-permissions.sh b/docker/php/8.3/conf/provision/bootstrap.d/10-permissions.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/bootstrap.d/10-permissions.sh rename to docker/php/8.3/conf/provision/bootstrap.d/10-permissions.sh diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/8.3/conf/provision/bootstrap.d/10-php-init.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/bootstrap.d/10-php-init.sh rename to docker/php/8.3/conf/provision/bootstrap.d/10-php-init.sh diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php/8.3/conf/provision/bootstrap.d/10-supervisor.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/bootstrap.d/10-supervisor.sh rename to docker/php/8.3/conf/provision/bootstrap.d/10-supervisor.sh diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/10-user-application.sh b/docker/php/8.3/conf/provision/bootstrap.d/10-user-application.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/bootstrap.d/10-user-application.sh rename to docker/php/8.3/conf/provision/bootstrap.d/10-user-application.sh diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/8.3/conf/provision/bootstrap.d/11-php-conf.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/bootstrap.d/11-php-conf.sh rename to docker/php/8.3/conf/provision/bootstrap.d/11-php-conf.sh diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/20-app.sh b/docker/php/8.3/conf/provision/bootstrap.d/20-app.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/bootstrap.d/20-app.sh rename to docker/php/8.3/conf/provision/bootstrap.d/20-app.sh diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/8.3/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh rename to docker/php/8.3/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/8.3/conf/provision/bootstrap.d/20-setup-php-fpm.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php-fpm.sh rename to docker/php/8.3/conf/provision/bootstrap.d/20-setup-php-fpm.sh diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/8.3/conf/provision/bootstrap.d/20-setup-php.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php.sh rename to docker/php/8.3/conf/provision/bootstrap.d/20-setup-php.sh diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh rename to docker/php/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php/8.3/conf/provision/bootstrap.d/90-cleanup.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/bootstrap.d/90-cleanup.sh rename to docker/php/8.3/conf/provision/bootstrap.d/90-cleanup.sh diff --git a/docker/php-official/8.3/conf/provision/build.d/.gitkeep b/docker/php/8.3/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/php-official/8.3/conf/provision/build.d/.gitkeep rename to docker/php/8.3/conf/provision/build.d/.gitkeep diff --git a/docker/php-official/8.3/conf/provision/build.d/10-cleanup.sh b/docker/php/8.3/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/build.d/10-cleanup.sh rename to docker/php/8.3/conf/provision/build.d/10-cleanup.sh diff --git a/docker/php-official/8.3/conf/provision/entrypoint.d/.gitkeep b/docker/php/8.3/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/php-official/8.3/conf/provision/entrypoint.d/.gitkeep rename to docker/php/8.3/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/php-official/8.3/conf/provision/entrypoint.d/05-permissions.sh b/docker/php/8.3/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/entrypoint.d/05-permissions.sh rename to docker/php/8.3/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/php-official/8.3/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/8.3/conf/provision/entrypoint.d/20-php-fpm.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/entrypoint.d/20-php-fpm.sh rename to docker/php/8.3/conf/provision/entrypoint.d/20-php-fpm.sh diff --git a/docker/php-official/8.3/conf/provision/entrypoint.d/20-php.sh b/docker/php/8.3/conf/provision/entrypoint.d/20-php.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/entrypoint.d/20-php.sh rename to docker/php/8.3/conf/provision/entrypoint.d/20-php.sh diff --git a/docker/php-official/8.3/conf/provision/service.d/.gitkeep b/docker/php/8.3/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/php-official/8.3/conf/provision/service.d/.gitkeep rename to docker/php/8.3/conf/provision/service.d/.gitkeep diff --git a/docker/php-official/8.3/conf/provision/service.d/cron.sh b/docker/php/8.3/conf/provision/service.d/cron.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/service.d/cron.sh rename to docker/php/8.3/conf/provision/service.d/cron.sh diff --git a/docker/php-official/8.3/conf/provision/service.d/dnsmasq.sh b/docker/php/8.3/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/service.d/dnsmasq.sh rename to docker/php/8.3/conf/provision/service.d/dnsmasq.sh diff --git a/docker/php-official/8.3/conf/provision/service.d/postfix.sh b/docker/php/8.3/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/service.d/postfix.sh rename to docker/php/8.3/conf/provision/service.d/postfix.sh diff --git a/docker/php-official/8.3/conf/provision/service.d/ssh.sh b/docker/php/8.3/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/service.d/ssh.sh rename to docker/php/8.3/conf/provision/service.d/ssh.sh diff --git a/docker/php-official/8.3/conf/provision/service.d/syslog.sh b/docker/php/8.3/conf/provision/service.d/syslog.sh similarity index 100% rename from docker/php-official/8.3/conf/provision/service.d/syslog.sh rename to docker/php/8.3/conf/provision/service.d/syslog.sh diff --git a/docker/php/8.4 b/docker/php/8.4 deleted file mode 120000 index 59c4a3067..000000000 --- a/docker/php/8.4 +++ /dev/null @@ -1 +0,0 @@ -../php-official/8.4 \ No newline at end of file diff --git a/docker/php/8.4-alpine b/docker/php/8.4-alpine deleted file mode 120000 index fbb811dfd..000000000 --- a/docker/php/8.4-alpine +++ /dev/null @@ -1 +0,0 @@ -../php-official/8.4-alpine \ No newline at end of file diff --git a/docker/php-official/8.4-alpine/Dockerfile b/docker/php/8.4-alpine/Dockerfile similarity index 99% rename from docker/php-official/8.4-alpine/Dockerfile rename to docker/php/8.4-alpine/Dockerfile index 294c93628..57f9c5680 100644 --- a/docker/php-official/8.4-alpine/Dockerfile +++ b/docker/php/8.4-alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:8.4-alpine +# Dockerfile for webdevops/php:8.4-alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/php-official/8.4-alpine/Dockerfile.twig b/docker/php/8.4-alpine/Dockerfile.twig similarity index 100% rename from docker/php-official/8.4-alpine/Dockerfile.twig rename to docker/php/8.4-alpine/Dockerfile.twig diff --git a/docker/php-official/8.4-alpine/conf/VERSION b/docker/php/8.4-alpine/conf/VERSION similarity index 100% rename from docker/php-official/8.4-alpine/conf/VERSION rename to docker/php/8.4-alpine/conf/VERSION diff --git a/docker/php-official/8.4-alpine/conf/bin/bootstrap.sh b/docker/php/8.4-alpine/conf/bin/bootstrap.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/bootstrap.sh rename to docker/php/8.4-alpine/conf/bin/bootstrap.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/config.sh b/docker/php/8.4-alpine/conf/bin/config.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/config.sh rename to docker/php/8.4-alpine/conf/bin/config.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/control.sh b/docker/php/8.4-alpine/conf/bin/control.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/control.sh rename to docker/php/8.4-alpine/conf/bin/control.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/cli.sh b/docker/php/8.4-alpine/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/entrypoint.d/cli.sh rename to docker/php/8.4-alpine/conf/bin/entrypoint.d/cli.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/default.sh b/docker/php/8.4-alpine/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/entrypoint.d/default.sh rename to docker/php/8.4-alpine/conf/bin/entrypoint.d/default.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/noop.sh b/docker/php/8.4-alpine/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/entrypoint.d/noop.sh rename to docker/php/8.4-alpine/conf/bin/entrypoint.d/noop.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/root.sh b/docker/php/8.4-alpine/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/entrypoint.d/root.sh rename to docker/php/8.4-alpine/conf/bin/entrypoint.d/root.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/supervisord.sh b/docker/php/8.4-alpine/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/entrypoint.d/supervisord.sh rename to docker/php/8.4-alpine/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/entrypoint.sh b/docker/php/8.4-alpine/conf/bin/entrypoint.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/entrypoint.sh rename to docker/php/8.4-alpine/conf/bin/entrypoint.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/cron.d/10-init.sh b/docker/php/8.4-alpine/conf/bin/service.d/cron.d/10-init.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/service.d/cron.d/10-init.sh rename to docker/php/8.4-alpine/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/cron.sh b/docker/php/8.4-alpine/conf/bin/service.d/cron.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/service.d/cron.sh rename to docker/php/8.4-alpine/conf/bin/service.d/cron.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php/8.4-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/php/8.4-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/dnsmasq.sh b/docker/php/8.4-alpine/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/service.d/dnsmasq.sh rename to docker/php/8.4-alpine/conf/bin/service.d/dnsmasq.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/8.4-alpine/conf/bin/service.d/php-fpm.d/10-init.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php/8.4-alpine/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.sh b/docker/php/8.4-alpine/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.sh rename to docker/php/8.4-alpine/conf/bin/service.d/php-fpm.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/php/8.4-alpine/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/service.d/postfix.d/10-init.sh rename to docker/php/8.4-alpine/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/postfix.sh b/docker/php/8.4-alpine/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/service.d/postfix.sh rename to docker/php/8.4-alpine/conf/bin/service.d/postfix.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/ssh.d/10-init.sh b/docker/php/8.4-alpine/conf/bin/service.d/ssh.d/10-init.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/service.d/ssh.d/10-init.sh rename to docker/php/8.4-alpine/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/ssh.sh b/docker/php/8.4-alpine/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/service.d/ssh.sh rename to docker/php/8.4-alpine/conf/bin/service.d/ssh.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php/8.4-alpine/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php/8.4-alpine/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/supervisor.sh b/docker/php/8.4-alpine/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/service.d/supervisor.sh rename to docker/php/8.4-alpine/conf/bin/service.d/supervisor.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php/8.4-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/php/8.4-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/syslog-ng.sh b/docker/php/8.4-alpine/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/service.d/syslog-ng.sh rename to docker/php/8.4-alpine/conf/bin/service.d/syslog-ng.sh diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/container-file-auto-restore b/docker/php/8.4-alpine/conf/bin/usr-bin/container-file-auto-restore similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/usr-bin/container-file-auto-restore rename to docker/php/8.4-alpine/conf/bin/usr-bin/container-file-auto-restore diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-cronjob b/docker/php/8.4-alpine/conf/bin/usr-bin/docker-cronjob similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-cronjob rename to docker/php/8.4-alpine/conf/bin/usr-bin/docker-cronjob diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-php-setting b/docker/php/8.4-alpine/conf/bin/usr-bin/docker-php-setting similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-php-setting rename to docker/php/8.4-alpine/conf/bin/usr-bin/docker-php-setting diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service b/docker/php/8.4-alpine/conf/bin/usr-bin/docker-service similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service rename to docker/php/8.4-alpine/conf/bin/usr-bin/docker-service diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service-disable b/docker/php/8.4-alpine/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service-disable rename to docker/php/8.4-alpine/conf/bin/usr-bin/docker-service-disable diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service-enable b/docker/php/8.4-alpine/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service-enable rename to docker/php/8.4-alpine/conf/bin/usr-bin/docker-service-enable diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/service b/docker/php/8.4-alpine/conf/bin/usr-bin/service similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/usr-bin/service rename to docker/php/8.4-alpine/conf/bin/usr-bin/service diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/version-compare b/docker/php/8.4-alpine/conf/bin/usr-bin/version-compare similarity index 100% rename from docker/php-official/8.4-alpine/conf/bin/usr-bin/version-compare rename to docker/php/8.4-alpine/conf/bin/usr-bin/version-compare diff --git a/docker/php-official/8.4-alpine/conf/etc/cron/.gitkeep b/docker/php/8.4-alpine/conf/etc/cron/.gitkeep similarity index 100% rename from docker/php-official/8.4-alpine/conf/etc/cron/.gitkeep rename to docker/php/8.4-alpine/conf/etc/cron/.gitkeep diff --git a/docker/php-official/8.4-alpine/conf/etc/logrotate.d/syslog-ng b/docker/php/8.4-alpine/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/php-official/8.4-alpine/conf/etc/logrotate.d/syslog-ng rename to docker/php/8.4-alpine/conf/etc/logrotate.d/syslog-ng diff --git a/docker/php-official/8.4-alpine/conf/etc/php/conf.d/.gitkeep b/docker/php/8.4-alpine/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/php-official/8.4-alpine/conf/etc/php/conf.d/.gitkeep rename to docker/php/8.4-alpine/conf/etc/php/conf.d/.gitkeep diff --git a/docker/php-official/8.4-alpine/conf/etc/php/fpm/.gitkeep b/docker/php/8.4-alpine/conf/etc/php/fpm/.gitkeep similarity index 100% rename from docker/php-official/8.4-alpine/conf/etc/php/fpm/.gitkeep rename to docker/php/8.4-alpine/conf/etc/php/fpm/.gitkeep diff --git a/docker/php-official/8.4-alpine/conf/etc/php/php.ini b/docker/php/8.4-alpine/conf/etc/php/php.ini similarity index 100% rename from docker/php-official/8.4-alpine/conf/etc/php/php.ini rename to docker/php/8.4-alpine/conf/etc/php/php.ini diff --git a/docker/php-official/8.4-alpine/conf/etc/php/php.webdevops.ini b/docker/php/8.4-alpine/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php-official/8.4-alpine/conf/etc/php/php.webdevops.ini rename to docker/php/8.4-alpine/conf/etc/php/php.webdevops.ini diff --git a/docker/php-official/8.4-alpine/conf/etc/supervisor.conf b/docker/php/8.4-alpine/conf/etc/supervisor.conf similarity index 100% rename from docker/php-official/8.4-alpine/conf/etc/supervisor.conf rename to docker/php/8.4-alpine/conf/etc/supervisor.conf diff --git a/docker/php-official/8.4-alpine/conf/etc/supervisor.d/.gitkeep b/docker/php/8.4-alpine/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/php-official/8.4-alpine/conf/etc/supervisor.d/.gitkeep rename to docker/php/8.4-alpine/conf/etc/supervisor.d/.gitkeep diff --git a/docker/php-official/8.4-alpine/conf/etc/supervisor.d/cron.conf b/docker/php/8.4-alpine/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/php-official/8.4-alpine/conf/etc/supervisor.d/cron.conf rename to docker/php/8.4-alpine/conf/etc/supervisor.d/cron.conf diff --git a/docker/php-official/8.4-alpine/conf/etc/supervisor.d/dnsmasq.conf b/docker/php/8.4-alpine/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/php-official/8.4-alpine/conf/etc/supervisor.d/dnsmasq.conf rename to docker/php/8.4-alpine/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/php-official/8.4-alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php/8.4-alpine/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php-official/8.4-alpine/conf/etc/supervisor.d/php-fpm.conf rename to docker/php/8.4-alpine/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/php-official/8.4-alpine/conf/etc/supervisor.d/postfix.conf b/docker/php/8.4-alpine/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/php-official/8.4-alpine/conf/etc/supervisor.d/postfix.conf rename to docker/php/8.4-alpine/conf/etc/supervisor.d/postfix.conf diff --git a/docker/php-official/8.4-alpine/conf/etc/supervisor.d/ssh.conf b/docker/php/8.4-alpine/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/php-official/8.4-alpine/conf/etc/supervisor.d/ssh.conf rename to docker/php/8.4-alpine/conf/etc/supervisor.d/ssh.conf diff --git a/docker/php-official/8.4-alpine/conf/etc/supervisor.d/syslog.conf b/docker/php/8.4-alpine/conf/etc/supervisor.d/syslog.conf similarity index 100% rename from docker/php-official/8.4-alpine/conf/etc/supervisor.d/syslog.conf rename to docker/php/8.4-alpine/conf/etc/supervisor.d/syslog.conf diff --git a/docker/php-official/8.4-alpine/conf/etc/syslog-ng/syslog-ng.conf b/docker/php/8.4-alpine/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/php-official/8.4-alpine/conf/etc/syslog-ng/syslog-ng.conf rename to docker/php/8.4-alpine/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php/8.4-alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/bootstrap.d/.gitkeep rename to docker/php/8.4-alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php/8.4-alpine/conf/provision/bootstrap.d/10-entrypoint.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-entrypoint.sh rename to docker/php/8.4-alpine/conf/provision/bootstrap.d/10-entrypoint.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-permissions.sh b/docker/php/8.4-alpine/conf/provision/bootstrap.d/10-permissions.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-permissions.sh rename to docker/php/8.4-alpine/conf/provision/bootstrap.d/10-permissions.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/8.4-alpine/conf/provision/bootstrap.d/10-php-init.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-php-init.sh rename to docker/php/8.4-alpine/conf/provision/bootstrap.d/10-php-init.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php/8.4-alpine/conf/provision/bootstrap.d/10-supervisor.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-supervisor.sh rename to docker/php/8.4-alpine/conf/provision/bootstrap.d/10-supervisor.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php/8.4-alpine/conf/provision/bootstrap.d/10-user-application.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-user-application.sh rename to docker/php/8.4-alpine/conf/provision/bootstrap.d/10-user-application.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/8.4-alpine/conf/provision/bootstrap.d/11-php-conf.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/bootstrap.d/11-php-conf.sh rename to docker/php/8.4-alpine/conf/provision/bootstrap.d/11-php-conf.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-app.sh b/docker/php/8.4-alpine/conf/provision/bootstrap.d/20-app.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-app.sh rename to docker/php/8.4-alpine/conf/provision/bootstrap.d/20-app.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh rename to docker/php/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh rename to docker/php/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/8.4-alpine/conf/provision/bootstrap.d/20-setup-php.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php.sh rename to docker/php/8.4-alpine/conf/provision/bootstrap.d/20-setup-php.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/8.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh rename to docker/php/8.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php/8.4-alpine/conf/provision/bootstrap.d/90-cleanup.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/bootstrap.d/90-cleanup.sh rename to docker/php/8.4-alpine/conf/provision/bootstrap.d/90-cleanup.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/build.d/.gitkeep b/docker/php/8.4-alpine/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/build.d/.gitkeep rename to docker/php/8.4-alpine/conf/provision/build.d/.gitkeep diff --git a/docker/php-official/8.4-alpine/conf/provision/build.d/10-cleanup.sh b/docker/php/8.4-alpine/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/build.d/10-cleanup.sh rename to docker/php/8.4-alpine/conf/provision/build.d/10-cleanup.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php/8.4-alpine/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/entrypoint.d/.gitkeep rename to docker/php/8.4-alpine/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/05-permissions.sh b/docker/php/8.4-alpine/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/entrypoint.d/05-permissions.sh rename to docker/php/8.4-alpine/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/8.4-alpine/conf/provision/entrypoint.d/20-php-fpm.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/entrypoint.d/20-php-fpm.sh rename to docker/php/8.4-alpine/conf/provision/entrypoint.d/20-php-fpm.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php/8.4-alpine/conf/provision/entrypoint.d/20-php.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/entrypoint.d/20-php.sh rename to docker/php/8.4-alpine/conf/provision/entrypoint.d/20-php.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/service.d/.gitkeep b/docker/php/8.4-alpine/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/service.d/.gitkeep rename to docker/php/8.4-alpine/conf/provision/service.d/.gitkeep diff --git a/docker/php-official/8.4-alpine/conf/provision/service.d/cron.sh b/docker/php/8.4-alpine/conf/provision/service.d/cron.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/service.d/cron.sh rename to docker/php/8.4-alpine/conf/provision/service.d/cron.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/service.d/dnsmasq.sh b/docker/php/8.4-alpine/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/service.d/dnsmasq.sh rename to docker/php/8.4-alpine/conf/provision/service.d/dnsmasq.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/service.d/postfix.sh b/docker/php/8.4-alpine/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/service.d/postfix.sh rename to docker/php/8.4-alpine/conf/provision/service.d/postfix.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/service.d/ssh.sh b/docker/php/8.4-alpine/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/service.d/ssh.sh rename to docker/php/8.4-alpine/conf/provision/service.d/ssh.sh diff --git a/docker/php-official/8.4-alpine/conf/provision/service.d/syslog.sh b/docker/php/8.4-alpine/conf/provision/service.d/syslog.sh similarity index 100% rename from docker/php-official/8.4-alpine/conf/provision/service.d/syslog.sh rename to docker/php/8.4-alpine/conf/provision/service.d/syslog.sh diff --git a/docker/php-official/8.4/Dockerfile b/docker/php/8.4/Dockerfile similarity index 99% rename from docker/php-official/8.4/Dockerfile rename to docker/php/8.4/Dockerfile index 7e06f2219..d9cc9a454 100644 --- a/docker/php-official/8.4/Dockerfile +++ b/docker/php/8.4/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:8.4 +# Dockerfile for webdevops/php:8.4 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/php-official/8.4/Dockerfile.twig b/docker/php/8.4/Dockerfile.twig similarity index 100% rename from docker/php-official/8.4/Dockerfile.twig rename to docker/php/8.4/Dockerfile.twig diff --git a/docker/php-official/8.4/conf/VERSION b/docker/php/8.4/conf/VERSION similarity index 100% rename from docker/php-official/8.4/conf/VERSION rename to docker/php/8.4/conf/VERSION diff --git a/docker/php-official/8.4/conf/bin/bootstrap.sh b/docker/php/8.4/conf/bin/bootstrap.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/bootstrap.sh rename to docker/php/8.4/conf/bin/bootstrap.sh diff --git a/docker/php-official/8.4/conf/bin/config.sh b/docker/php/8.4/conf/bin/config.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/config.sh rename to docker/php/8.4/conf/bin/config.sh diff --git a/docker/php-official/8.4/conf/bin/control.sh b/docker/php/8.4/conf/bin/control.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/control.sh rename to docker/php/8.4/conf/bin/control.sh diff --git a/docker/php-official/8.4/conf/bin/entrypoint.d/cli.sh b/docker/php/8.4/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/entrypoint.d/cli.sh rename to docker/php/8.4/conf/bin/entrypoint.d/cli.sh diff --git a/docker/php-official/8.4/conf/bin/entrypoint.d/default.sh b/docker/php/8.4/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/entrypoint.d/default.sh rename to docker/php/8.4/conf/bin/entrypoint.d/default.sh diff --git a/docker/php-official/8.4/conf/bin/entrypoint.d/noop.sh b/docker/php/8.4/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/entrypoint.d/noop.sh rename to docker/php/8.4/conf/bin/entrypoint.d/noop.sh diff --git a/docker/php-official/8.4/conf/bin/entrypoint.d/root.sh b/docker/php/8.4/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/entrypoint.d/root.sh rename to docker/php/8.4/conf/bin/entrypoint.d/root.sh diff --git a/docker/php-official/8.4/conf/bin/entrypoint.d/supervisord.sh b/docker/php/8.4/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/entrypoint.d/supervisord.sh rename to docker/php/8.4/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/php-official/8.4/conf/bin/entrypoint.sh b/docker/php/8.4/conf/bin/entrypoint.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/entrypoint.sh rename to docker/php/8.4/conf/bin/entrypoint.sh diff --git a/docker/php-official/8.4/conf/bin/service.d/cron.d/10-init.sh b/docker/php/8.4/conf/bin/service.d/cron.d/10-init.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/service.d/cron.d/10-init.sh rename to docker/php/8.4/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/php-official/8.4/conf/bin/service.d/cron.sh b/docker/php/8.4/conf/bin/service.d/cron.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/service.d/cron.sh rename to docker/php/8.4/conf/bin/service.d/cron.sh diff --git a/docker/php-official/8.4/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php/8.4/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/php/8.4/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/php-official/8.4/conf/bin/service.d/dnsmasq.sh b/docker/php/8.4/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/service.d/dnsmasq.sh rename to docker/php/8.4/conf/bin/service.d/dnsmasq.sh diff --git a/docker/php-official/8.4/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/8.4/conf/bin/service.d/php-fpm.d/10-init.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php/8.4/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php-official/8.4/conf/bin/service.d/php-fpm.sh b/docker/php/8.4/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/service.d/php-fpm.sh rename to docker/php/8.4/conf/bin/service.d/php-fpm.sh diff --git a/docker/php-official/8.4/conf/bin/service.d/postfix.d/10-init.sh b/docker/php/8.4/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/service.d/postfix.d/10-init.sh rename to docker/php/8.4/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/php-official/8.4/conf/bin/service.d/postfix.sh b/docker/php/8.4/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/service.d/postfix.sh rename to docker/php/8.4/conf/bin/service.d/postfix.sh diff --git a/docker/php-official/8.4/conf/bin/service.d/ssh.d/10-init.sh b/docker/php/8.4/conf/bin/service.d/ssh.d/10-init.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/service.d/ssh.d/10-init.sh rename to docker/php/8.4/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/php-official/8.4/conf/bin/service.d/ssh.sh b/docker/php/8.4/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/service.d/ssh.sh rename to docker/php/8.4/conf/bin/service.d/ssh.sh diff --git a/docker/php-official/8.4/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php/8.4/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php/8.4/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/php-official/8.4/conf/bin/service.d/supervisor.sh b/docker/php/8.4/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/service.d/supervisor.sh rename to docker/php/8.4/conf/bin/service.d/supervisor.sh diff --git a/docker/php-official/8.4/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php/8.4/conf/bin/service.d/syslog-ng.d/10-init.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/php/8.4/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/php-official/8.4/conf/bin/service.d/syslog-ng.sh b/docker/php/8.4/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/php-official/8.4/conf/bin/service.d/syslog-ng.sh rename to docker/php/8.4/conf/bin/service.d/syslog-ng.sh diff --git a/docker/php-official/8.4/conf/bin/usr-bin/container-file-auto-restore b/docker/php/8.4/conf/bin/usr-bin/container-file-auto-restore similarity index 100% rename from docker/php-official/8.4/conf/bin/usr-bin/container-file-auto-restore rename to docker/php/8.4/conf/bin/usr-bin/container-file-auto-restore diff --git a/docker/php-official/8.4/conf/bin/usr-bin/docker-cronjob b/docker/php/8.4/conf/bin/usr-bin/docker-cronjob similarity index 100% rename from docker/php-official/8.4/conf/bin/usr-bin/docker-cronjob rename to docker/php/8.4/conf/bin/usr-bin/docker-cronjob diff --git a/docker/php-official/8.4/conf/bin/usr-bin/docker-php-setting b/docker/php/8.4/conf/bin/usr-bin/docker-php-setting similarity index 100% rename from docker/php-official/8.4/conf/bin/usr-bin/docker-php-setting rename to docker/php/8.4/conf/bin/usr-bin/docker-php-setting diff --git a/docker/php-official/8.4/conf/bin/usr-bin/docker-service b/docker/php/8.4/conf/bin/usr-bin/docker-service similarity index 100% rename from docker/php-official/8.4/conf/bin/usr-bin/docker-service rename to docker/php/8.4/conf/bin/usr-bin/docker-service diff --git a/docker/php-official/8.4/conf/bin/usr-bin/docker-service-disable b/docker/php/8.4/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/php-official/8.4/conf/bin/usr-bin/docker-service-disable rename to docker/php/8.4/conf/bin/usr-bin/docker-service-disable diff --git a/docker/php-official/8.4/conf/bin/usr-bin/docker-service-enable b/docker/php/8.4/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/php-official/8.4/conf/bin/usr-bin/docker-service-enable rename to docker/php/8.4/conf/bin/usr-bin/docker-service-enable diff --git a/docker/php-official/8.4/conf/bin/usr-bin/service b/docker/php/8.4/conf/bin/usr-bin/service similarity index 100% rename from docker/php-official/8.4/conf/bin/usr-bin/service rename to docker/php/8.4/conf/bin/usr-bin/service diff --git a/docker/php-official/8.4/conf/bin/usr-bin/version-compare b/docker/php/8.4/conf/bin/usr-bin/version-compare similarity index 100% rename from docker/php-official/8.4/conf/bin/usr-bin/version-compare rename to docker/php/8.4/conf/bin/usr-bin/version-compare diff --git a/docker/php-official/8.4/conf/etc/cron/.gitkeep b/docker/php/8.4/conf/etc/cron/.gitkeep similarity index 100% rename from docker/php-official/8.4/conf/etc/cron/.gitkeep rename to docker/php/8.4/conf/etc/cron/.gitkeep diff --git a/docker/php-official/8.4/conf/etc/logrotate.d/syslog-ng b/docker/php/8.4/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/php-official/8.4/conf/etc/logrotate.d/syslog-ng rename to docker/php/8.4/conf/etc/logrotate.d/syslog-ng diff --git a/docker/php-official/8.4/conf/etc/php/conf.d/.gitkeep b/docker/php/8.4/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/php-official/8.4/conf/etc/php/conf.d/.gitkeep rename to docker/php/8.4/conf/etc/php/conf.d/.gitkeep diff --git a/docker/php-official/8.4/conf/etc/php/fpm/.gitkeep b/docker/php/8.4/conf/etc/php/fpm/.gitkeep similarity index 100% rename from docker/php-official/8.4/conf/etc/php/fpm/.gitkeep rename to docker/php/8.4/conf/etc/php/fpm/.gitkeep diff --git a/docker/php-official/8.4/conf/etc/php/php.ini b/docker/php/8.4/conf/etc/php/php.ini similarity index 100% rename from docker/php-official/8.4/conf/etc/php/php.ini rename to docker/php/8.4/conf/etc/php/php.ini diff --git a/docker/php-official/8.4/conf/etc/php/php.webdevops.ini b/docker/php/8.4/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php-official/8.4/conf/etc/php/php.webdevops.ini rename to docker/php/8.4/conf/etc/php/php.webdevops.ini diff --git a/docker/php-official/8.4/conf/etc/supervisor.conf b/docker/php/8.4/conf/etc/supervisor.conf similarity index 100% rename from docker/php-official/8.4/conf/etc/supervisor.conf rename to docker/php/8.4/conf/etc/supervisor.conf diff --git a/docker/php-official/8.4/conf/etc/supervisor.d/.gitkeep b/docker/php/8.4/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/php-official/8.4/conf/etc/supervisor.d/.gitkeep rename to docker/php/8.4/conf/etc/supervisor.d/.gitkeep diff --git a/docker/php-official/8.4/conf/etc/supervisor.d/cron.conf b/docker/php/8.4/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/php-official/8.4/conf/etc/supervisor.d/cron.conf rename to docker/php/8.4/conf/etc/supervisor.d/cron.conf diff --git a/docker/php-official/8.4/conf/etc/supervisor.d/dnsmasq.conf b/docker/php/8.4/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/php-official/8.4/conf/etc/supervisor.d/dnsmasq.conf rename to docker/php/8.4/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/php-official/8.4/conf/etc/supervisor.d/php-fpm.conf b/docker/php/8.4/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php-official/8.4/conf/etc/supervisor.d/php-fpm.conf rename to docker/php/8.4/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/php-official/8.4/conf/etc/supervisor.d/postfix.conf b/docker/php/8.4/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/php-official/8.4/conf/etc/supervisor.d/postfix.conf rename to docker/php/8.4/conf/etc/supervisor.d/postfix.conf diff --git a/docker/php-official/8.4/conf/etc/supervisor.d/ssh.conf b/docker/php/8.4/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/php-official/8.4/conf/etc/supervisor.d/ssh.conf rename to docker/php/8.4/conf/etc/supervisor.d/ssh.conf diff --git a/docker/php-official/8.4/conf/etc/supervisor.d/syslog.conf b/docker/php/8.4/conf/etc/supervisor.d/syslog.conf similarity index 100% rename from docker/php-official/8.4/conf/etc/supervisor.d/syslog.conf rename to docker/php/8.4/conf/etc/supervisor.d/syslog.conf diff --git a/docker/php-official/8.4/conf/etc/syslog-ng/syslog-ng.conf b/docker/php/8.4/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/php-official/8.4/conf/etc/syslog-ng/syslog-ng.conf rename to docker/php/8.4/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/.gitkeep b/docker/php/8.4/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/php-official/8.4/conf/provision/bootstrap.d/.gitkeep rename to docker/php/8.4/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php/8.4/conf/provision/bootstrap.d/10-entrypoint.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/bootstrap.d/10-entrypoint.sh rename to docker/php/8.4/conf/provision/bootstrap.d/10-entrypoint.sh diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/10-permissions.sh b/docker/php/8.4/conf/provision/bootstrap.d/10-permissions.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/bootstrap.d/10-permissions.sh rename to docker/php/8.4/conf/provision/bootstrap.d/10-permissions.sh diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/8.4/conf/provision/bootstrap.d/10-php-init.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/bootstrap.d/10-php-init.sh rename to docker/php/8.4/conf/provision/bootstrap.d/10-php-init.sh diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php/8.4/conf/provision/bootstrap.d/10-supervisor.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/bootstrap.d/10-supervisor.sh rename to docker/php/8.4/conf/provision/bootstrap.d/10-supervisor.sh diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/10-user-application.sh b/docker/php/8.4/conf/provision/bootstrap.d/10-user-application.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/bootstrap.d/10-user-application.sh rename to docker/php/8.4/conf/provision/bootstrap.d/10-user-application.sh diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/8.4/conf/provision/bootstrap.d/11-php-conf.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/bootstrap.d/11-php-conf.sh rename to docker/php/8.4/conf/provision/bootstrap.d/11-php-conf.sh diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/20-app.sh b/docker/php/8.4/conf/provision/bootstrap.d/20-app.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/bootstrap.d/20-app.sh rename to docker/php/8.4/conf/provision/bootstrap.d/20-app.sh diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/8.4/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh rename to docker/php/8.4/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/8.4/conf/provision/bootstrap.d/20-setup-php-fpm.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php-fpm.sh rename to docker/php/8.4/conf/provision/bootstrap.d/20-setup-php-fpm.sh diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/8.4/conf/provision/bootstrap.d/20-setup-php.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php.sh rename to docker/php/8.4/conf/provision/bootstrap.d/20-setup-php.sh diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/8.4/conf/provision/bootstrap.d/30-setup-ioncube.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/bootstrap.d/30-setup-ioncube.sh rename to docker/php/8.4/conf/provision/bootstrap.d/30-setup-ioncube.sh diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php/8.4/conf/provision/bootstrap.d/90-cleanup.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/bootstrap.d/90-cleanup.sh rename to docker/php/8.4/conf/provision/bootstrap.d/90-cleanup.sh diff --git a/docker/php-official/8.4/conf/provision/build.d/.gitkeep b/docker/php/8.4/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/php-official/8.4/conf/provision/build.d/.gitkeep rename to docker/php/8.4/conf/provision/build.d/.gitkeep diff --git a/docker/php-official/8.4/conf/provision/build.d/10-cleanup.sh b/docker/php/8.4/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/build.d/10-cleanup.sh rename to docker/php/8.4/conf/provision/build.d/10-cleanup.sh diff --git a/docker/php-official/8.4/conf/provision/entrypoint.d/.gitkeep b/docker/php/8.4/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/php-official/8.4/conf/provision/entrypoint.d/.gitkeep rename to docker/php/8.4/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/php-official/8.4/conf/provision/entrypoint.d/05-permissions.sh b/docker/php/8.4/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/entrypoint.d/05-permissions.sh rename to docker/php/8.4/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/php-official/8.4/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/8.4/conf/provision/entrypoint.d/20-php-fpm.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/entrypoint.d/20-php-fpm.sh rename to docker/php/8.4/conf/provision/entrypoint.d/20-php-fpm.sh diff --git a/docker/php-official/8.4/conf/provision/entrypoint.d/20-php.sh b/docker/php/8.4/conf/provision/entrypoint.d/20-php.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/entrypoint.d/20-php.sh rename to docker/php/8.4/conf/provision/entrypoint.d/20-php.sh diff --git a/docker/php-official/8.4/conf/provision/service.d/.gitkeep b/docker/php/8.4/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/php-official/8.4/conf/provision/service.d/.gitkeep rename to docker/php/8.4/conf/provision/service.d/.gitkeep diff --git a/docker/php-official/8.4/conf/provision/service.d/cron.sh b/docker/php/8.4/conf/provision/service.d/cron.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/service.d/cron.sh rename to docker/php/8.4/conf/provision/service.d/cron.sh diff --git a/docker/php-official/8.4/conf/provision/service.d/dnsmasq.sh b/docker/php/8.4/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/service.d/dnsmasq.sh rename to docker/php/8.4/conf/provision/service.d/dnsmasq.sh diff --git a/docker/php-official/8.4/conf/provision/service.d/postfix.sh b/docker/php/8.4/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/service.d/postfix.sh rename to docker/php/8.4/conf/provision/service.d/postfix.sh diff --git a/docker/php-official/8.4/conf/provision/service.d/ssh.sh b/docker/php/8.4/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/service.d/ssh.sh rename to docker/php/8.4/conf/provision/service.d/ssh.sh diff --git a/docker/php-official/8.4/conf/provision/service.d/syslog.sh b/docker/php/8.4/conf/provision/service.d/syslog.sh similarity index 100% rename from docker/php-official/8.4/conf/provision/service.d/syslog.sh rename to docker/php/8.4/conf/provision/service.d/syslog.sh diff --git a/docker/php/8.5 b/docker/php/8.5 deleted file mode 120000 index a0754b593..000000000 --- a/docker/php/8.5 +++ /dev/null @@ -1 +0,0 @@ -../php-official/8.5 \ No newline at end of file diff --git a/docker/php/8.5-alpine b/docker/php/8.5-alpine deleted file mode 120000 index d3fc8eeba..000000000 --- a/docker/php/8.5-alpine +++ /dev/null @@ -1 +0,0 @@ -../php-official/8.5-alpine \ No newline at end of file diff --git a/docker/php-official/8.5-alpine/Dockerfile b/docker/php/8.5-alpine/Dockerfile similarity index 99% rename from docker/php-official/8.5-alpine/Dockerfile rename to docker/php/8.5-alpine/Dockerfile index 095235aa5..67ef5366c 100644 --- a/docker/php-official/8.5-alpine/Dockerfile +++ b/docker/php/8.5-alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:8.5-alpine +# Dockerfile for webdevops/php:8.5-alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/php-official/8.5-alpine/Dockerfile.twig b/docker/php/8.5-alpine/Dockerfile.twig similarity index 100% rename from docker/php-official/8.5-alpine/Dockerfile.twig rename to docker/php/8.5-alpine/Dockerfile.twig diff --git a/docker/php-official/8.5-alpine/conf/VERSION b/docker/php/8.5-alpine/conf/VERSION similarity index 100% rename from docker/php-official/8.5-alpine/conf/VERSION rename to docker/php/8.5-alpine/conf/VERSION diff --git a/docker/php-official/8.5-alpine/conf/bin/bootstrap.sh b/docker/php/8.5-alpine/conf/bin/bootstrap.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/bootstrap.sh rename to docker/php/8.5-alpine/conf/bin/bootstrap.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/config.sh b/docker/php/8.5-alpine/conf/bin/config.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/config.sh rename to docker/php/8.5-alpine/conf/bin/config.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/control.sh b/docker/php/8.5-alpine/conf/bin/control.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/control.sh rename to docker/php/8.5-alpine/conf/bin/control.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/cli.sh b/docker/php/8.5-alpine/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/entrypoint.d/cli.sh rename to docker/php/8.5-alpine/conf/bin/entrypoint.d/cli.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/default.sh b/docker/php/8.5-alpine/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/entrypoint.d/default.sh rename to docker/php/8.5-alpine/conf/bin/entrypoint.d/default.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/noop.sh b/docker/php/8.5-alpine/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/entrypoint.d/noop.sh rename to docker/php/8.5-alpine/conf/bin/entrypoint.d/noop.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/root.sh b/docker/php/8.5-alpine/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/entrypoint.d/root.sh rename to docker/php/8.5-alpine/conf/bin/entrypoint.d/root.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/supervisord.sh b/docker/php/8.5-alpine/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/entrypoint.d/supervisord.sh rename to docker/php/8.5-alpine/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/entrypoint.sh b/docker/php/8.5-alpine/conf/bin/entrypoint.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/entrypoint.sh rename to docker/php/8.5-alpine/conf/bin/entrypoint.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/cron.d/10-init.sh b/docker/php/8.5-alpine/conf/bin/service.d/cron.d/10-init.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/service.d/cron.d/10-init.sh rename to docker/php/8.5-alpine/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/cron.sh b/docker/php/8.5-alpine/conf/bin/service.d/cron.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/service.d/cron.sh rename to docker/php/8.5-alpine/conf/bin/service.d/cron.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php/8.5-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/php/8.5-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/dnsmasq.sh b/docker/php/8.5-alpine/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/service.d/dnsmasq.sh rename to docker/php/8.5-alpine/conf/bin/service.d/dnsmasq.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/8.5-alpine/conf/bin/service.d/php-fpm.d/10-init.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php/8.5-alpine/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.sh b/docker/php/8.5-alpine/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.sh rename to docker/php/8.5-alpine/conf/bin/service.d/php-fpm.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/php/8.5-alpine/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/service.d/postfix.d/10-init.sh rename to docker/php/8.5-alpine/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/postfix.sh b/docker/php/8.5-alpine/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/service.d/postfix.sh rename to docker/php/8.5-alpine/conf/bin/service.d/postfix.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/ssh.d/10-init.sh b/docker/php/8.5-alpine/conf/bin/service.d/ssh.d/10-init.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/service.d/ssh.d/10-init.sh rename to docker/php/8.5-alpine/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/ssh.sh b/docker/php/8.5-alpine/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/service.d/ssh.sh rename to docker/php/8.5-alpine/conf/bin/service.d/ssh.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php/8.5-alpine/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php/8.5-alpine/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/supervisor.sh b/docker/php/8.5-alpine/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/service.d/supervisor.sh rename to docker/php/8.5-alpine/conf/bin/service.d/supervisor.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php/8.5-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/php/8.5-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/syslog-ng.sh b/docker/php/8.5-alpine/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/service.d/syslog-ng.sh rename to docker/php/8.5-alpine/conf/bin/service.d/syslog-ng.sh diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/container-file-auto-restore b/docker/php/8.5-alpine/conf/bin/usr-bin/container-file-auto-restore similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/usr-bin/container-file-auto-restore rename to docker/php/8.5-alpine/conf/bin/usr-bin/container-file-auto-restore diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-cronjob b/docker/php/8.5-alpine/conf/bin/usr-bin/docker-cronjob similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-cronjob rename to docker/php/8.5-alpine/conf/bin/usr-bin/docker-cronjob diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-php-setting b/docker/php/8.5-alpine/conf/bin/usr-bin/docker-php-setting similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-php-setting rename to docker/php/8.5-alpine/conf/bin/usr-bin/docker-php-setting diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service b/docker/php/8.5-alpine/conf/bin/usr-bin/docker-service similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service rename to docker/php/8.5-alpine/conf/bin/usr-bin/docker-service diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service-disable b/docker/php/8.5-alpine/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service-disable rename to docker/php/8.5-alpine/conf/bin/usr-bin/docker-service-disable diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service-enable b/docker/php/8.5-alpine/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service-enable rename to docker/php/8.5-alpine/conf/bin/usr-bin/docker-service-enable diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/service b/docker/php/8.5-alpine/conf/bin/usr-bin/service similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/usr-bin/service rename to docker/php/8.5-alpine/conf/bin/usr-bin/service diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/version-compare b/docker/php/8.5-alpine/conf/bin/usr-bin/version-compare similarity index 100% rename from docker/php-official/8.5-alpine/conf/bin/usr-bin/version-compare rename to docker/php/8.5-alpine/conf/bin/usr-bin/version-compare diff --git a/docker/php-official/8.5-alpine/conf/etc/cron/.gitkeep b/docker/php/8.5-alpine/conf/etc/cron/.gitkeep similarity index 100% rename from docker/php-official/8.5-alpine/conf/etc/cron/.gitkeep rename to docker/php/8.5-alpine/conf/etc/cron/.gitkeep diff --git a/docker/php-official/8.5-alpine/conf/etc/logrotate.d/syslog-ng b/docker/php/8.5-alpine/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/php-official/8.5-alpine/conf/etc/logrotate.d/syslog-ng rename to docker/php/8.5-alpine/conf/etc/logrotate.d/syslog-ng diff --git a/docker/php-official/8.5-alpine/conf/etc/php/conf.d/.gitkeep b/docker/php/8.5-alpine/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/php-official/8.5-alpine/conf/etc/php/conf.d/.gitkeep rename to docker/php/8.5-alpine/conf/etc/php/conf.d/.gitkeep diff --git a/docker/php-official/8.5-alpine/conf/etc/php/fpm/.gitkeep b/docker/php/8.5-alpine/conf/etc/php/fpm/.gitkeep similarity index 100% rename from docker/php-official/8.5-alpine/conf/etc/php/fpm/.gitkeep rename to docker/php/8.5-alpine/conf/etc/php/fpm/.gitkeep diff --git a/docker/php-official/8.5-alpine/conf/etc/php/php.ini b/docker/php/8.5-alpine/conf/etc/php/php.ini similarity index 100% rename from docker/php-official/8.5-alpine/conf/etc/php/php.ini rename to docker/php/8.5-alpine/conf/etc/php/php.ini diff --git a/docker/php-official/8.5-alpine/conf/etc/php/php.webdevops.ini b/docker/php/8.5-alpine/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php-official/8.5-alpine/conf/etc/php/php.webdevops.ini rename to docker/php/8.5-alpine/conf/etc/php/php.webdevops.ini diff --git a/docker/php-official/8.5-alpine/conf/etc/supervisor.conf b/docker/php/8.5-alpine/conf/etc/supervisor.conf similarity index 100% rename from docker/php-official/8.5-alpine/conf/etc/supervisor.conf rename to docker/php/8.5-alpine/conf/etc/supervisor.conf diff --git a/docker/php-official/8.5-alpine/conf/etc/supervisor.d/.gitkeep b/docker/php/8.5-alpine/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/php-official/8.5-alpine/conf/etc/supervisor.d/.gitkeep rename to docker/php/8.5-alpine/conf/etc/supervisor.d/.gitkeep diff --git a/docker/php-official/8.5-alpine/conf/etc/supervisor.d/cron.conf b/docker/php/8.5-alpine/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/php-official/8.5-alpine/conf/etc/supervisor.d/cron.conf rename to docker/php/8.5-alpine/conf/etc/supervisor.d/cron.conf diff --git a/docker/php-official/8.5-alpine/conf/etc/supervisor.d/dnsmasq.conf b/docker/php/8.5-alpine/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/php-official/8.5-alpine/conf/etc/supervisor.d/dnsmasq.conf rename to docker/php/8.5-alpine/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/php-official/8.5-alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php/8.5-alpine/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php-official/8.5-alpine/conf/etc/supervisor.d/php-fpm.conf rename to docker/php/8.5-alpine/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/php-official/8.5-alpine/conf/etc/supervisor.d/postfix.conf b/docker/php/8.5-alpine/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/php-official/8.5-alpine/conf/etc/supervisor.d/postfix.conf rename to docker/php/8.5-alpine/conf/etc/supervisor.d/postfix.conf diff --git a/docker/php-official/8.5-alpine/conf/etc/supervisor.d/ssh.conf b/docker/php/8.5-alpine/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/php-official/8.5-alpine/conf/etc/supervisor.d/ssh.conf rename to docker/php/8.5-alpine/conf/etc/supervisor.d/ssh.conf diff --git a/docker/php-official/8.5-alpine/conf/etc/supervisor.d/syslog.conf b/docker/php/8.5-alpine/conf/etc/supervisor.d/syslog.conf similarity index 100% rename from docker/php-official/8.5-alpine/conf/etc/supervisor.d/syslog.conf rename to docker/php/8.5-alpine/conf/etc/supervisor.d/syslog.conf diff --git a/docker/php-official/8.5-alpine/conf/etc/syslog-ng/syslog-ng.conf b/docker/php/8.5-alpine/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/php-official/8.5-alpine/conf/etc/syslog-ng/syslog-ng.conf rename to docker/php/8.5-alpine/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php/8.5-alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/bootstrap.d/.gitkeep rename to docker/php/8.5-alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php/8.5-alpine/conf/provision/bootstrap.d/10-entrypoint.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-entrypoint.sh rename to docker/php/8.5-alpine/conf/provision/bootstrap.d/10-entrypoint.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-permissions.sh b/docker/php/8.5-alpine/conf/provision/bootstrap.d/10-permissions.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-permissions.sh rename to docker/php/8.5-alpine/conf/provision/bootstrap.d/10-permissions.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/8.5-alpine/conf/provision/bootstrap.d/10-php-init.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-php-init.sh rename to docker/php/8.5-alpine/conf/provision/bootstrap.d/10-php-init.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php/8.5-alpine/conf/provision/bootstrap.d/10-supervisor.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-supervisor.sh rename to docker/php/8.5-alpine/conf/provision/bootstrap.d/10-supervisor.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php/8.5-alpine/conf/provision/bootstrap.d/10-user-application.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-user-application.sh rename to docker/php/8.5-alpine/conf/provision/bootstrap.d/10-user-application.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/8.5-alpine/conf/provision/bootstrap.d/11-php-conf.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/bootstrap.d/11-php-conf.sh rename to docker/php/8.5-alpine/conf/provision/bootstrap.d/11-php-conf.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-app.sh b/docker/php/8.5-alpine/conf/provision/bootstrap.d/20-app.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-app.sh rename to docker/php/8.5-alpine/conf/provision/bootstrap.d/20-app.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh rename to docker/php/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh rename to docker/php/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/8.5-alpine/conf/provision/bootstrap.d/20-setup-php.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php.sh rename to docker/php/8.5-alpine/conf/provision/bootstrap.d/20-setup-php.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/8.5-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh rename to docker/php/8.5-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php/8.5-alpine/conf/provision/bootstrap.d/90-cleanup.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/bootstrap.d/90-cleanup.sh rename to docker/php/8.5-alpine/conf/provision/bootstrap.d/90-cleanup.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/build.d/.gitkeep b/docker/php/8.5-alpine/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/build.d/.gitkeep rename to docker/php/8.5-alpine/conf/provision/build.d/.gitkeep diff --git a/docker/php-official/8.5-alpine/conf/provision/build.d/10-cleanup.sh b/docker/php/8.5-alpine/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/build.d/10-cleanup.sh rename to docker/php/8.5-alpine/conf/provision/build.d/10-cleanup.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php/8.5-alpine/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/entrypoint.d/.gitkeep rename to docker/php/8.5-alpine/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/05-permissions.sh b/docker/php/8.5-alpine/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/entrypoint.d/05-permissions.sh rename to docker/php/8.5-alpine/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/8.5-alpine/conf/provision/entrypoint.d/20-php-fpm.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/entrypoint.d/20-php-fpm.sh rename to docker/php/8.5-alpine/conf/provision/entrypoint.d/20-php-fpm.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php/8.5-alpine/conf/provision/entrypoint.d/20-php.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/entrypoint.d/20-php.sh rename to docker/php/8.5-alpine/conf/provision/entrypoint.d/20-php.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/service.d/.gitkeep b/docker/php/8.5-alpine/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/service.d/.gitkeep rename to docker/php/8.5-alpine/conf/provision/service.d/.gitkeep diff --git a/docker/php-official/8.5-alpine/conf/provision/service.d/cron.sh b/docker/php/8.5-alpine/conf/provision/service.d/cron.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/service.d/cron.sh rename to docker/php/8.5-alpine/conf/provision/service.d/cron.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/service.d/dnsmasq.sh b/docker/php/8.5-alpine/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/service.d/dnsmasq.sh rename to docker/php/8.5-alpine/conf/provision/service.d/dnsmasq.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/service.d/postfix.sh b/docker/php/8.5-alpine/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/service.d/postfix.sh rename to docker/php/8.5-alpine/conf/provision/service.d/postfix.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/service.d/ssh.sh b/docker/php/8.5-alpine/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/service.d/ssh.sh rename to docker/php/8.5-alpine/conf/provision/service.d/ssh.sh diff --git a/docker/php-official/8.5-alpine/conf/provision/service.d/syslog.sh b/docker/php/8.5-alpine/conf/provision/service.d/syslog.sh similarity index 100% rename from docker/php-official/8.5-alpine/conf/provision/service.d/syslog.sh rename to docker/php/8.5-alpine/conf/provision/service.d/syslog.sh diff --git a/docker/php-official/8.5/Dockerfile b/docker/php/8.5/Dockerfile similarity index 99% rename from docker/php-official/8.5/Dockerfile rename to docker/php/8.5/Dockerfile index e2f155154..3c9eb23db 100644 --- a/docker/php-official/8.5/Dockerfile +++ b/docker/php/8.5/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:8.5 +# Dockerfile for webdevops/php:8.5 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/php-official/8.5/Dockerfile.twig b/docker/php/8.5/Dockerfile.twig similarity index 100% rename from docker/php-official/8.5/Dockerfile.twig rename to docker/php/8.5/Dockerfile.twig diff --git a/docker/php-official/8.5/conf/VERSION b/docker/php/8.5/conf/VERSION similarity index 100% rename from docker/php-official/8.5/conf/VERSION rename to docker/php/8.5/conf/VERSION diff --git a/docker/php-official/8.5/conf/bin/bootstrap.sh b/docker/php/8.5/conf/bin/bootstrap.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/bootstrap.sh rename to docker/php/8.5/conf/bin/bootstrap.sh diff --git a/docker/php-official/8.5/conf/bin/config.sh b/docker/php/8.5/conf/bin/config.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/config.sh rename to docker/php/8.5/conf/bin/config.sh diff --git a/docker/php-official/8.5/conf/bin/control.sh b/docker/php/8.5/conf/bin/control.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/control.sh rename to docker/php/8.5/conf/bin/control.sh diff --git a/docker/php-official/8.5/conf/bin/entrypoint.d/cli.sh b/docker/php/8.5/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/entrypoint.d/cli.sh rename to docker/php/8.5/conf/bin/entrypoint.d/cli.sh diff --git a/docker/php-official/8.5/conf/bin/entrypoint.d/default.sh b/docker/php/8.5/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/entrypoint.d/default.sh rename to docker/php/8.5/conf/bin/entrypoint.d/default.sh diff --git a/docker/php-official/8.5/conf/bin/entrypoint.d/noop.sh b/docker/php/8.5/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/entrypoint.d/noop.sh rename to docker/php/8.5/conf/bin/entrypoint.d/noop.sh diff --git a/docker/php-official/8.5/conf/bin/entrypoint.d/root.sh b/docker/php/8.5/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/entrypoint.d/root.sh rename to docker/php/8.5/conf/bin/entrypoint.d/root.sh diff --git a/docker/php-official/8.5/conf/bin/entrypoint.d/supervisord.sh b/docker/php/8.5/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/entrypoint.d/supervisord.sh rename to docker/php/8.5/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/php-official/8.5/conf/bin/entrypoint.sh b/docker/php/8.5/conf/bin/entrypoint.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/entrypoint.sh rename to docker/php/8.5/conf/bin/entrypoint.sh diff --git a/docker/php-official/8.5/conf/bin/service.d/cron.d/10-init.sh b/docker/php/8.5/conf/bin/service.d/cron.d/10-init.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/service.d/cron.d/10-init.sh rename to docker/php/8.5/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/php-official/8.5/conf/bin/service.d/cron.sh b/docker/php/8.5/conf/bin/service.d/cron.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/service.d/cron.sh rename to docker/php/8.5/conf/bin/service.d/cron.sh diff --git a/docker/php-official/8.5/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php/8.5/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/php/8.5/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/php-official/8.5/conf/bin/service.d/dnsmasq.sh b/docker/php/8.5/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/service.d/dnsmasq.sh rename to docker/php/8.5/conf/bin/service.d/dnsmasq.sh diff --git a/docker/php-official/8.5/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/8.5/conf/bin/service.d/php-fpm.d/10-init.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php/8.5/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php-official/8.5/conf/bin/service.d/php-fpm.sh b/docker/php/8.5/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/service.d/php-fpm.sh rename to docker/php/8.5/conf/bin/service.d/php-fpm.sh diff --git a/docker/php-official/8.5/conf/bin/service.d/postfix.d/10-init.sh b/docker/php/8.5/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/service.d/postfix.d/10-init.sh rename to docker/php/8.5/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/php-official/8.5/conf/bin/service.d/postfix.sh b/docker/php/8.5/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/service.d/postfix.sh rename to docker/php/8.5/conf/bin/service.d/postfix.sh diff --git a/docker/php-official/8.5/conf/bin/service.d/ssh.d/10-init.sh b/docker/php/8.5/conf/bin/service.d/ssh.d/10-init.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/service.d/ssh.d/10-init.sh rename to docker/php/8.5/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/php-official/8.5/conf/bin/service.d/ssh.sh b/docker/php/8.5/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/service.d/ssh.sh rename to docker/php/8.5/conf/bin/service.d/ssh.sh diff --git a/docker/php-official/8.5/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php/8.5/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php/8.5/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/php-official/8.5/conf/bin/service.d/supervisor.sh b/docker/php/8.5/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/service.d/supervisor.sh rename to docker/php/8.5/conf/bin/service.d/supervisor.sh diff --git a/docker/php-official/8.5/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php/8.5/conf/bin/service.d/syslog-ng.d/10-init.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/php/8.5/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/php-official/8.5/conf/bin/service.d/syslog-ng.sh b/docker/php/8.5/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/php-official/8.5/conf/bin/service.d/syslog-ng.sh rename to docker/php/8.5/conf/bin/service.d/syslog-ng.sh diff --git a/docker/php-official/8.5/conf/bin/usr-bin/container-file-auto-restore b/docker/php/8.5/conf/bin/usr-bin/container-file-auto-restore similarity index 100% rename from docker/php-official/8.5/conf/bin/usr-bin/container-file-auto-restore rename to docker/php/8.5/conf/bin/usr-bin/container-file-auto-restore diff --git a/docker/php-official/8.5/conf/bin/usr-bin/docker-cronjob b/docker/php/8.5/conf/bin/usr-bin/docker-cronjob similarity index 100% rename from docker/php-official/8.5/conf/bin/usr-bin/docker-cronjob rename to docker/php/8.5/conf/bin/usr-bin/docker-cronjob diff --git a/docker/php-official/8.5/conf/bin/usr-bin/docker-php-setting b/docker/php/8.5/conf/bin/usr-bin/docker-php-setting similarity index 100% rename from docker/php-official/8.5/conf/bin/usr-bin/docker-php-setting rename to docker/php/8.5/conf/bin/usr-bin/docker-php-setting diff --git a/docker/php-official/8.5/conf/bin/usr-bin/docker-service b/docker/php/8.5/conf/bin/usr-bin/docker-service similarity index 100% rename from docker/php-official/8.5/conf/bin/usr-bin/docker-service rename to docker/php/8.5/conf/bin/usr-bin/docker-service diff --git a/docker/php-official/8.5/conf/bin/usr-bin/docker-service-disable b/docker/php/8.5/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/php-official/8.5/conf/bin/usr-bin/docker-service-disable rename to docker/php/8.5/conf/bin/usr-bin/docker-service-disable diff --git a/docker/php-official/8.5/conf/bin/usr-bin/docker-service-enable b/docker/php/8.5/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/php-official/8.5/conf/bin/usr-bin/docker-service-enable rename to docker/php/8.5/conf/bin/usr-bin/docker-service-enable diff --git a/docker/php-official/8.5/conf/bin/usr-bin/service b/docker/php/8.5/conf/bin/usr-bin/service similarity index 100% rename from docker/php-official/8.5/conf/bin/usr-bin/service rename to docker/php/8.5/conf/bin/usr-bin/service diff --git a/docker/php-official/8.5/conf/bin/usr-bin/version-compare b/docker/php/8.5/conf/bin/usr-bin/version-compare similarity index 100% rename from docker/php-official/8.5/conf/bin/usr-bin/version-compare rename to docker/php/8.5/conf/bin/usr-bin/version-compare diff --git a/docker/php-official/8.5/conf/etc/cron/.gitkeep b/docker/php/8.5/conf/etc/cron/.gitkeep similarity index 100% rename from docker/php-official/8.5/conf/etc/cron/.gitkeep rename to docker/php/8.5/conf/etc/cron/.gitkeep diff --git a/docker/php-official/8.5/conf/etc/logrotate.d/syslog-ng b/docker/php/8.5/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/php-official/8.5/conf/etc/logrotate.d/syslog-ng rename to docker/php/8.5/conf/etc/logrotate.d/syslog-ng diff --git a/docker/php-official/8.5/conf/etc/php/conf.d/.gitkeep b/docker/php/8.5/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/php-official/8.5/conf/etc/php/conf.d/.gitkeep rename to docker/php/8.5/conf/etc/php/conf.d/.gitkeep diff --git a/docker/php-official/8.5/conf/etc/php/fpm/.gitkeep b/docker/php/8.5/conf/etc/php/fpm/.gitkeep similarity index 100% rename from docker/php-official/8.5/conf/etc/php/fpm/.gitkeep rename to docker/php/8.5/conf/etc/php/fpm/.gitkeep diff --git a/docker/php-official/8.5/conf/etc/php/php.ini b/docker/php/8.5/conf/etc/php/php.ini similarity index 100% rename from docker/php-official/8.5/conf/etc/php/php.ini rename to docker/php/8.5/conf/etc/php/php.ini diff --git a/docker/php-official/8.5/conf/etc/php/php.webdevops.ini b/docker/php/8.5/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php-official/8.5/conf/etc/php/php.webdevops.ini rename to docker/php/8.5/conf/etc/php/php.webdevops.ini diff --git a/docker/php-official/8.5/conf/etc/supervisor.conf b/docker/php/8.5/conf/etc/supervisor.conf similarity index 100% rename from docker/php-official/8.5/conf/etc/supervisor.conf rename to docker/php/8.5/conf/etc/supervisor.conf diff --git a/docker/php-official/8.5/conf/etc/supervisor.d/.gitkeep b/docker/php/8.5/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/php-official/8.5/conf/etc/supervisor.d/.gitkeep rename to docker/php/8.5/conf/etc/supervisor.d/.gitkeep diff --git a/docker/php-official/8.5/conf/etc/supervisor.d/cron.conf b/docker/php/8.5/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/php-official/8.5/conf/etc/supervisor.d/cron.conf rename to docker/php/8.5/conf/etc/supervisor.d/cron.conf diff --git a/docker/php-official/8.5/conf/etc/supervisor.d/dnsmasq.conf b/docker/php/8.5/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/php-official/8.5/conf/etc/supervisor.d/dnsmasq.conf rename to docker/php/8.5/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/php-official/8.5/conf/etc/supervisor.d/php-fpm.conf b/docker/php/8.5/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php-official/8.5/conf/etc/supervisor.d/php-fpm.conf rename to docker/php/8.5/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/php-official/8.5/conf/etc/supervisor.d/postfix.conf b/docker/php/8.5/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/php-official/8.5/conf/etc/supervisor.d/postfix.conf rename to docker/php/8.5/conf/etc/supervisor.d/postfix.conf diff --git a/docker/php-official/8.5/conf/etc/supervisor.d/ssh.conf b/docker/php/8.5/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/php-official/8.5/conf/etc/supervisor.d/ssh.conf rename to docker/php/8.5/conf/etc/supervisor.d/ssh.conf diff --git a/docker/php-official/8.5/conf/etc/supervisor.d/syslog.conf b/docker/php/8.5/conf/etc/supervisor.d/syslog.conf similarity index 100% rename from docker/php-official/8.5/conf/etc/supervisor.d/syslog.conf rename to docker/php/8.5/conf/etc/supervisor.d/syslog.conf diff --git a/docker/php-official/8.5/conf/etc/syslog-ng/syslog-ng.conf b/docker/php/8.5/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/php-official/8.5/conf/etc/syslog-ng/syslog-ng.conf rename to docker/php/8.5/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/.gitkeep b/docker/php/8.5/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/php-official/8.5/conf/provision/bootstrap.d/.gitkeep rename to docker/php/8.5/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php/8.5/conf/provision/bootstrap.d/10-entrypoint.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/bootstrap.d/10-entrypoint.sh rename to docker/php/8.5/conf/provision/bootstrap.d/10-entrypoint.sh diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/10-permissions.sh b/docker/php/8.5/conf/provision/bootstrap.d/10-permissions.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/bootstrap.d/10-permissions.sh rename to docker/php/8.5/conf/provision/bootstrap.d/10-permissions.sh diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/8.5/conf/provision/bootstrap.d/10-php-init.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/bootstrap.d/10-php-init.sh rename to docker/php/8.5/conf/provision/bootstrap.d/10-php-init.sh diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php/8.5/conf/provision/bootstrap.d/10-supervisor.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/bootstrap.d/10-supervisor.sh rename to docker/php/8.5/conf/provision/bootstrap.d/10-supervisor.sh diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/10-user-application.sh b/docker/php/8.5/conf/provision/bootstrap.d/10-user-application.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/bootstrap.d/10-user-application.sh rename to docker/php/8.5/conf/provision/bootstrap.d/10-user-application.sh diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/8.5/conf/provision/bootstrap.d/11-php-conf.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/bootstrap.d/11-php-conf.sh rename to docker/php/8.5/conf/provision/bootstrap.d/11-php-conf.sh diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/20-app.sh b/docker/php/8.5/conf/provision/bootstrap.d/20-app.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/bootstrap.d/20-app.sh rename to docker/php/8.5/conf/provision/bootstrap.d/20-app.sh diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/8.5/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh rename to docker/php/8.5/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/8.5/conf/provision/bootstrap.d/20-setup-php-fpm.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php-fpm.sh rename to docker/php/8.5/conf/provision/bootstrap.d/20-setup-php-fpm.sh diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/8.5/conf/provision/bootstrap.d/20-setup-php.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php.sh rename to docker/php/8.5/conf/provision/bootstrap.d/20-setup-php.sh diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/8.5/conf/provision/bootstrap.d/30-setup-ioncube.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/bootstrap.d/30-setup-ioncube.sh rename to docker/php/8.5/conf/provision/bootstrap.d/30-setup-ioncube.sh diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php/8.5/conf/provision/bootstrap.d/90-cleanup.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/bootstrap.d/90-cleanup.sh rename to docker/php/8.5/conf/provision/bootstrap.d/90-cleanup.sh diff --git a/docker/php-official/8.5/conf/provision/build.d/.gitkeep b/docker/php/8.5/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/php-official/8.5/conf/provision/build.d/.gitkeep rename to docker/php/8.5/conf/provision/build.d/.gitkeep diff --git a/docker/php-official/8.5/conf/provision/build.d/10-cleanup.sh b/docker/php/8.5/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/build.d/10-cleanup.sh rename to docker/php/8.5/conf/provision/build.d/10-cleanup.sh diff --git a/docker/php-official/8.5/conf/provision/entrypoint.d/.gitkeep b/docker/php/8.5/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/php-official/8.5/conf/provision/entrypoint.d/.gitkeep rename to docker/php/8.5/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/php-official/8.5/conf/provision/entrypoint.d/05-permissions.sh b/docker/php/8.5/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/entrypoint.d/05-permissions.sh rename to docker/php/8.5/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/php-official/8.5/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/8.5/conf/provision/entrypoint.d/20-php-fpm.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/entrypoint.d/20-php-fpm.sh rename to docker/php/8.5/conf/provision/entrypoint.d/20-php-fpm.sh diff --git a/docker/php-official/8.5/conf/provision/entrypoint.d/20-php.sh b/docker/php/8.5/conf/provision/entrypoint.d/20-php.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/entrypoint.d/20-php.sh rename to docker/php/8.5/conf/provision/entrypoint.d/20-php.sh diff --git a/docker/php-official/8.5/conf/provision/service.d/.gitkeep b/docker/php/8.5/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/php-official/8.5/conf/provision/service.d/.gitkeep rename to docker/php/8.5/conf/provision/service.d/.gitkeep diff --git a/docker/php-official/8.5/conf/provision/service.d/cron.sh b/docker/php/8.5/conf/provision/service.d/cron.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/service.d/cron.sh rename to docker/php/8.5/conf/provision/service.d/cron.sh diff --git a/docker/php-official/8.5/conf/provision/service.d/dnsmasq.sh b/docker/php/8.5/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/service.d/dnsmasq.sh rename to docker/php/8.5/conf/provision/service.d/dnsmasq.sh diff --git a/docker/php-official/8.5/conf/provision/service.d/postfix.sh b/docker/php/8.5/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/service.d/postfix.sh rename to docker/php/8.5/conf/provision/service.d/postfix.sh diff --git a/docker/php-official/8.5/conf/provision/service.d/ssh.sh b/docker/php/8.5/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/service.d/ssh.sh rename to docker/php/8.5/conf/provision/service.d/ssh.sh diff --git a/docker/php-official/8.5/conf/provision/service.d/syslog.sh b/docker/php/8.5/conf/provision/service.d/syslog.sh similarity index 100% rename from docker/php-official/8.5/conf/provision/service.d/syslog.sh rename to docker/php/8.5/conf/provision/service.d/syslog.sh diff --git a/docs/README.md b/docs/README.md index ecc12a9d5..5dd8740ea 100644 --- a/docs/README.md +++ b/docs/README.md @@ -15,7 +15,7 @@ Documentation for the `webdevops/*` Docker images. It describes the images as th | `webdevops/toolbox` | Build helper, not meant to run. Stores the baselayout scripts (`apt-install`, `apk-install`, `docker-image-cleanup`, `docker-run-bootstrap`, `generate-locales` and more), `go-replace` and `gosu` under `/baselayout`. `bootstrap` and `php` copy them from there with `COPY --from=webdevops/toolbox`. In `toolbox` itself only `go-replace` is on the `PATH`. | | `webdevops/dockerfile-build-env` | Build environment for this repository, based on `base-app:ubuntu-22.04`. The CI builds and tests the images in it, see [Building in CI](../CONTRIBUTING.md#building-in-ci). | -`webdevops/storage`, `webdevops/vsftp` and `webdevops/ssh` are no longer built. [Replacing discontinued images](discontinued-images.md) shows what to use instead. +`webdevops/storage`, `webdevops/vsftp` and `webdevops/ssh` are no longer built, and `webdevops/php-official` is deprecated. [Replacing discontinued images](discontinued-images.md) shows what to use instead. ## Platforms and updates @@ -37,7 +37,7 @@ Documentation for the `webdevops/*` Docker images. It describes the images as th - [Customization](customization.md): commands, scripts at start and build time, tools for your Dockerfile, services, cron jobs, healthcheck, configuration files, locales, the application user - PHP images: [PHP extensions per tag](images/php.md#php-extensions), [Debian or Alpine](images/php.md#debian-or-alpine), [production](images/php.md#production), [installing more extensions](images/php.md#installing-more-extensions), [mail](images/php.md#mail), [Xdebug with an IDE](images/php.md#xdebug-with-an-ide) - [Known issues](known-issues.md): options that do not work, workarounds, migration from older images -- [Replacing discontinued images](discontinued-images.md): what to use instead of `storage`, `vsftp` and `ssh` +- [Replacing discontinued images](discontinued-images.md): what to use instead of `php-official`, `storage`, `vsftp` and `ssh` ## How the images build on each other diff --git a/docs/discontinued-images.md b/docs/discontinued-images.md index f7e3cd526..2f3f705a0 100644 --- a/docs/discontinued-images.md +++ b/docs/discontinued-images.md @@ -1,6 +1,17 @@ # Replacing discontinued images -`webdevops/storage`, `webdevops/vsftp` and `webdevops/ssh` are no longer built. Their last images stay on Docker Hub, but they get no updates, including security fixes. This page shows a replacement for each. The examples are a starting point, not a complete migration. They use the `latest` tag of other projects' images; for production, pin a version or digest, see [Platforms and updates](README.md#platforms-and-updates). +`webdevops/storage`, `webdevops/vsftp` and `webdevops/ssh` are no longer built. Their last images stay on Docker Hub, but they get no updates, including security fixes. `webdevops/php-official` is deprecated and gets no new tags. This page shows a replacement for each. The examples are a starting point, not a complete migration. They use the `latest` tag of other projects' images; for production, pin a version or digest, see [Platforms and updates](README.md#platforms-and-updates). + +## webdevops/php-official + +`webdevops/php-official` is the same image as `webdevops/php`: the CI builds it once and publishes it under both names, with the same digest. The second name is only published for the tags `8.2` to `8.5` and `8.2-alpine` to `8.5-alpine`; newer PHP versions, starting with 8.6, are only published as `webdevops/php`. Change the image name and keep the tag: + +```yaml +services: + app: + # before: webdevops/php-official:8.5 + image: webdevops/php:8.5 +``` ## webdevops/storage diff --git a/docs/images/php.md b/docs/images/php.md index fe6aeedc7..037ac1abd 100644 --- a/docs/images/php.md +++ b/docs/images/php.md @@ -2,7 +2,7 @@ PHP-FPM on top of the official PHP image, with the webdevops entrypoint, `supervisord`, cron, syslog-ng and the `application` user. The `-dev` variant adds Xdebug, the Blackfire extension, Postfix and an SSH server for local development. -`webdevops/php-official` is built from the same Dockerfiles as `webdevops/php`. +`webdevops/php-official` is deprecated: it is the same image as `webdevops/php` under a second name, published only for the tags `8.2` to `8.5` and their `-alpine` tags. Use `webdevops/php`, see [Replacing discontinued images](../discontinued-images.md#webdevopsphp-official). ## Tags From 22f888ac42beeeeca6a6a62f5e448e392dddd5d6 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Tue, 17 Nov 2026 07:23:29 +0000 Subject: [PATCH 2/4] [TASK] Guard the php-official alias list and resolve aliases in the image tests - generate:github-ci stops if a deprecated name is built as an image of its own (docker/php-official/), which would publish new tags under it. - The alias list rejects an empty name and a name equal to its image; it is read once per FileReader. - ImageTests maps a deprecated name to its image through the alias list instead of removing "-official" from the name. - docs/discontinued-images.md: no statement about unpublished tags; the migration keeps the tag only for 8.2 to 8.5, older php-official tags move to a PHP version that is still built. - Tests: removing a built tag that the list still names, a symbolic link as tag directory in the Provisioner, symbolic links in the fixture stay links. --- CONTRIBUTING.md | 2 +- ci/src/Commands/GenerateGithubCiCommand.php | 14 ++++++++++- ci/src/FileReader.php | 15 +++++++++++- ci/src/ImageTests.php | 6 ++--- .../Commands/GenerateGithubCiCommandTest.php | 24 ++++++++++++++++--- ci/tests/FileReaderTest.php | 4 +++- ci/tests/Provision/ProvisionerTest.php | 12 ++++++++++ ci/tests/TemporaryRepository.php | 7 +++++- docs/discontinued-images.md | 4 +++- 9 files changed, 76 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5be5f61da..e7f34c1d1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,7 +32,7 @@ It checks all of `conf/provision.yml` before it changes a file and stops if a so `generate:dockerfile` stops if a directory `docker//` has files but no `Dockerfile.twig`; it first removes the `.DS_Store` files of the macOS Finder under `docker`. To stop building a tag, remove its directory and those of the tags that build on it; `generate:github-ci` names any it finds. -`webdevops/php-official` is a deprecated name of `webdevops/php`. `generate:github-ci` publishes a `php` tag under that name too only if `docker: aliases` in `conf/console.yml` lists it; new PHP versions are not added there. When you stop building a `php` tag, remove it from that list as well: `generate:github-ci` stops while the list names a tag that is not built. +`webdevops/php-official` is a deprecated name of `webdevops/php`. `generate:github-ci` publishes a `php` tag under that name too only if `docker: aliases` in `conf/console.yml` lists it; new PHP versions are not added there. When you stop building a `php` tag, remove it from that list as well: `generate:github-ci` stops while the list names a tag without a Dockerfile in `docker/php`, or while a directory `docker/php-official` exists. ## Building in CI diff --git a/ci/src/Commands/GenerateGithubCiCommand.php b/ci/src/Commands/GenerateGithubCiCommand.php index 02938ce48..584c12d82 100644 --- a/ci/src/Commands/GenerateGithubCiCommand.php +++ b/ci/src/Commands/GenerateGithubCiCommand.php @@ -181,7 +181,8 @@ private function buildTree(): Tree } /** - * Every tag that "docker: aliases" in conf/console.yml publishes under a deprecated name has to be built here. + * Every tag that "docker: aliases" in conf/console.yml publishes under a deprecated name has to be built here, and a + * deprecated name must not be built as an image of its own: docker// would publish new tags under it. * * @param list> $nodes */ @@ -189,6 +190,17 @@ private function checkAliases(array $nodes): void { $built = array_column($nodes, 'id'); foreach ($this->fileReader->aliases() as $name => $alias) { + foreach ($nodes as $node) { + if ($node['image'] === $name) { + throw new RuntimeException(sprintf( + 'webdevops/%1$s is a deprecated name in "docker: aliases" of conf/console.yml, but %2$s builds it as an image of its own. Build the tag in docker/%3$s instead.', + $name, + dirname((string)$node['file']), + $alias['image'], + )); + } + } + foreach ($alias['tags'] as $tag) { $image = 'webdevops/' . $alias['image'] . ':' . $tag; if (!in_array($image, $built, true)) { diff --git a/ci/src/FileReader.php b/ci/src/FileReader.php index bf4cad8b0..0ee6e94cc 100644 --- a/ci/src/FileReader.php +++ b/ci/src/FileReader.php @@ -12,6 +12,11 @@ class FileReader */ private readonly array $settings; + /** + * @var ?array}> aliases(), read on first use + */ + private ?array $aliases = null; + /** * @param string $rootPath the repository root */ @@ -42,6 +47,14 @@ public function autoLatestTag(): string * @return array}> */ public function aliases(): array + { + return $this->aliases ??= $this->readAliases(); + } + + /** + * @return array}> + */ + private function readAliases(): array { $settings = $this->settings['docker']['aliases'] ?? []; $error = '"docker: aliases" in conf/console.yml has to map each deprecated name to the image it names and the tags in quotes, e.g. php-official: {image: php, tags: [\'8.5\']}.'; @@ -54,7 +67,7 @@ public function aliases(): array $image = is_array($alias) ? $alias['image'] ?? null : null; $tags = is_array($alias) ? $alias['tags'] ?? null : null; // an unquoted tag such as 8.10 is a number in YAML and would lose its trailing zero - if (!is_string($name) || !is_string($image) || $image === '' || !is_array($tags) || !array_is_list($tags) || array_any($tags, static fn (mixed $tag): bool => !is_string($tag) || $tag === '')) { + if (!is_string($name) || $name === '' || !is_string($image) || $image === '' || $name === $image || !is_array($tags) || !array_is_list($tags) || array_any($tags, static fn (mixed $tag): bool => !is_string($tag) || $tag === '')) { throw new RuntimeException($error); } diff --git a/ci/src/ImageTests.php b/ci/src/ImageTests.php index d0934f727..b8a22c191 100644 --- a/ci/src/ImageTests.php +++ b/ci/src/ImageTests.php @@ -47,12 +47,12 @@ public function __construct(private string $rootPath = __DIR__ . '/../..') /** * The test class of $image relative to the repository root, e.g. ci/image-tests/Images/PhpNginxTest.php for - * php-nginx; null if the image has no tests. php-official, a deprecated name of php (see "docker: aliases" in - * conf/console.yml), has the tests of php. + * php-nginx; null if the image has no tests. A deprecated name from "docker: aliases" in conf/console.yml, such as + * php-official, has the tests of the image it names. */ public function testFile(string $image): ?string { - $image = str_replace('-official', '', $image); + $image = new FileReader($this->rootPath)->aliases()[$image]['image'] ?? $image; $file = self::DIRECTORY . '/' . str_replace(' ', '', ucwords(str_replace('-', ' ', $image))) . 'Test.php'; return is_file($this->rootPath . '/' . $file) ? $file : null; } diff --git a/ci/tests/Commands/GenerateGithubCiCommandTest.php b/ci/tests/Commands/GenerateGithubCiCommandTest.php index 09871d1f5..6c51c6d9f 100644 --- a/ci/tests/Commands/GenerateGithubCiCommandTest.php +++ b/ci/tests/Commands/GenerateGithubCiCommandTest.php @@ -18,9 +18,11 @@ use function array_diff; use function array_keys; use function array_values; +use function rmdir; use function str_replace; use function strpos; use function substr; +use function unlink; #[CoversClass(GenerateGithubCiCommand::class)] final class GenerateGithubCiCommandTest extends TestCase @@ -133,11 +135,27 @@ public function testDeprecatedNameGetsNoNewTags(): void public function testAliasOfATagThatIsNotBuiltIsAnError(): void { - // e.g. docker/php/8.4 was removed, but not its tag in the list - $this->repository->write('conf/console.yml', str_replace("tags: ['8.4', '8.5-alpine', '8.5']", "tags: ['8.3', '8.4']", $this->repository->read('conf/console.yml'))); + // docker/php/8.4 was removed, but not its tag in the list + foreach (['Dockerfile', 'Dockerfile.twig'] as $file) { + unlink($this->repository->path . '/docker/php/8.4/' . $file); + } + + rmdir($this->repository->path . '/docker/php/8.4'); + + $this->expectException(RuntimeException::class); + $this->expectExceptionMessage('"docker: aliases" in conf/console.yml publishes webdevops/php:8.4 as webdevops/php-official:8.4, which is not built. Remove the tag from the list.'); + new CommandTester(new GenerateGithubCiCommand($this->repository->path))->execute([]); + } + + public function testDeprecatedNameBuiltAsAnImageIsAnError(): void + { + // e.g. a branch from before the deprecation adds docker/php-official/8.6 + foreach (['Dockerfile', 'Dockerfile.twig'] as $file) { + $this->repository->write('docker/php-official/8.6/' . $file, str_replace('webdevops/php:8.5', 'webdevops/php-official:8.6', $this->repository->read('docker/php/8.5/' . $file))); + } $this->expectException(RuntimeException::class); - $this->expectExceptionMessage('"docker: aliases" in conf/console.yml publishes webdevops/php:8.3 as webdevops/php-official:8.3, which is not built. Remove the tag from the list.'); + $this->expectExceptionMessage('webdevops/php-official is a deprecated name in "docker: aliases" of conf/console.yml, but docker/php-official/8.6 builds it as an image of its own. Build the tag in docker/php instead.'); new CommandTester(new GenerateGithubCiCommand($this->repository->path))->execute([]); } diff --git a/ci/tests/FileReaderTest.php b/ci/tests/FileReaderTest.php index fcd6e3f36..21639d480 100644 --- a/ci/tests/FileReaderTest.php +++ b/ci/tests/FileReaderTest.php @@ -111,10 +111,12 @@ public static function invalidAliases(): iterable yield 'tag without quotes' => [" tags: [8.4, '8.5-alpine', '8.5']"]; yield 'empty tag' => [" tags: ['', '8.5-alpine', '8.5']"]; yield 'no list' => [" tags: '8.4'"]; + yield 'name of the image itself' => [" tags: ['8.4']\n php:\n image: 'php'\n tags: ['8.5']"]; + yield 'empty name' => [" tags: ['8.4']\n '':\n image: 'php'\n tags: ['8.5']"]; } #[DataProvider('invalidAliases')] - public function testAliasTagsHaveToBeQuotedTags(string $line): void + public function testInvalidAliasListIsAnError(string $line): void { $repository = new TemporaryRepository(); $repository->write('conf/console.yml', str_replace(" tags: ['8.4', '8.5-alpine', '8.5']", $line, $repository->read('conf/console.yml'))); diff --git a/ci/tests/Provision/ProvisionerTest.php b/ci/tests/Provision/ProvisionerTest.php index 9f8ed6b50..e004ccec2 100644 --- a/ci/tests/Provision/ProvisionerTest.php +++ b/ci/tests/Provision/ProvisionerTest.php @@ -12,6 +12,7 @@ use Webdevops\Build\Tests\TemporaryRepository; use function fileperms; +use function symlink; #[CoversClass(Provisioner::class)] final class ProvisionerTest extends TestCase @@ -137,6 +138,17 @@ public function testChecksTheWholeConfigurationBeforeChangingFiles(): void } } + public function testSymbolicLinksAreNoTags(): void + { + // provisioning a link docker/php/8.6 to 8.5 would replace conf/ of 8.5 + symlink('8.5', $this->repository->path . '/docker/php/8.6'); + $this->configure("provision:\n php:\n configuration:\n php/general: '8.6'\n"); + + $this->expectException(RuntimeException::class); + $this->expectExceptionMessage('conf/provision.yml copies provisioning/php/general into webdevops/php:8.6, but webdevops/php has no such tag under docker/.'); + $this->provision(); + } + public function testLogsEachSource(): void { self::assertSame([ diff --git a/ci/tests/TemporaryRepository.php b/ci/tests/TemporaryRepository.php index fd9ded219..0e2e3ec5c 100644 --- a/ci/tests/TemporaryRepository.php +++ b/ci/tests/TemporaryRepository.php @@ -19,9 +19,11 @@ use function is_dir; use function mkdir; use function random_bytes; +use function readlink; use function rmdir; use function strlen; use function substr; +use function symlink; use function sys_get_temp_dir; use function unlink; @@ -50,7 +52,10 @@ public function __construct() } $target = $this->path . substr($file->getPathname(), strlen(self::FIXTURE)); - if ($file->isDir()) { + if ($file->isLink()) { + // a symbolic link in the fixture stays a link + symlink((string)readlink($file->getPathname()), $target); + } elseif ($file->isDir()) { mkdir($target); } else { copy($file->getPathname(), $target); diff --git a/docs/discontinued-images.md b/docs/discontinued-images.md index 2f3f705a0..4fe796c02 100644 --- a/docs/discontinued-images.md +++ b/docs/discontinued-images.md @@ -4,7 +4,7 @@ ## webdevops/php-official -`webdevops/php-official` is the same image as `webdevops/php`: the CI builds it once and publishes it under both names, with the same digest. The second name is only published for the tags `8.2` to `8.5` and `8.2-alpine` to `8.5-alpine`; newer PHP versions, starting with 8.6, are only published as `webdevops/php`. Change the image name and keep the tag: +`webdevops/php-official` is the same image as `webdevops/php`: the CI builds it once and publishes it under both names, with the same digest. The second name is only published for the tags `8.2` to `8.5` and `8.2-alpine` to `8.5-alpine`; tags of newer PHP versions are only published as `webdevops/php`. For these tags, change the image name and keep the tag: ```yaml services: @@ -13,6 +13,8 @@ services: image: webdevops/php:8.5 ``` +The older tags of `webdevops/php-official`, `5.6` to `8.1`, are no longer built under either name and get no updates. Move to a PHP version that is still built, see the [tags of `webdevops/php`](images/php.md#tags). + ## webdevops/storage The last builds were `alpine:latest` without changes. Older builds provided `/storage` as a volume for other containers. From 6990d7ae4bddf15fd9a75c83fe5b27e1b645f47d Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Tue, 17 Nov 2026 07:32:13 +0000 Subject: [PATCH 3/4] [TASK] Advise switching from php-official to php now docs/discontinued-images.md names PHP 8.6 as the first version that is only published as webdevops/php again, and both pages advise switching to webdevops/php now. --- docs/discontinued-images.md | 6 ++++-- docs/images/php.md | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/discontinued-images.md b/docs/discontinued-images.md index 4fe796c02..8a5488e72 100644 --- a/docs/discontinued-images.md +++ b/docs/discontinued-images.md @@ -4,7 +4,9 @@ ## webdevops/php-official -`webdevops/php-official` is the same image as `webdevops/php`: the CI builds it once and publishes it under both names, with the same digest. The second name is only published for the tags `8.2` to `8.5` and `8.2-alpine` to `8.5-alpine`; tags of newer PHP versions are only published as `webdevops/php`. For these tags, change the image name and keep the tag: +`webdevops/php-official` is the same image as `webdevops/php`: the CI builds it once and publishes it under both names, with the same digest. The second name is only published for the tags `8.2` to `8.5` and `8.2-alpine` to `8.5-alpine`; newer PHP versions, starting with 8.6, are only published as `webdevops/php`. + +Switch to `webdevops/php` now. For the tags `8.2` to `8.5`, change only the image name and keep the tag: ```yaml services: @@ -13,7 +15,7 @@ services: image: webdevops/php:8.5 ``` -The older tags of `webdevops/php-official`, `5.6` to `8.1`, are no longer built under either name and get no updates. Move to a PHP version that is still built, see the [tags of `webdevops/php`](images/php.md#tags). +The older tags of `webdevops/php-official`, `5.6` to `8.1`, are no longer built under either name and get no updates; switch to `webdevops/php` with a PHP version that is still built, see the [tags of `webdevops/php`](images/php.md#tags). ## webdevops/storage diff --git a/docs/images/php.md b/docs/images/php.md index 037ac1abd..134c3887d 100644 --- a/docs/images/php.md +++ b/docs/images/php.md @@ -2,7 +2,7 @@ PHP-FPM on top of the official PHP image, with the webdevops entrypoint, `supervisord`, cron, syslog-ng and the `application` user. The `-dev` variant adds Xdebug, the Blackfire extension, Postfix and an SSH server for local development. -`webdevops/php-official` is deprecated: it is the same image as `webdevops/php` under a second name, published only for the tags `8.2` to `8.5` and their `-alpine` tags. Use `webdevops/php`, see [Replacing discontinued images](../discontinued-images.md#webdevopsphp-official). +`webdevops/php-official` is deprecated: it is the same image as `webdevops/php` under a second name, published only for the tags `8.2` to `8.5` and their `-alpine` tags. Switch to `webdevops/php` now, see [Replacing discontinued images](../discontinued-images.md#webdevopsphp-official). ## Tags From 71f370f3ac976694789057ee139a51b48e9ffcc4 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Tue, 17 Nov 2026 09:03:58 +0000 Subject: [PATCH 4/4] [TASK] Validate the alias list and reject unpublished alias tags in test:image - "docker: aliases" in conf/console.yml: the deprecated name and the image have to be image names in lower case, a tag must not be listed twice, and each error names the entry and what is wrong with it. - ci/console test:image stops for a deprecated name with a tag that is not published under it, e.g. webdevops/php-official:8.6. - ImageTests reads the alias list once; GithubJobBuilder keeps one ImageTests. - Tests: DockerfileGenerator and FileReader leave out a symbolic link as tag directory; the redundant Provisioner case is gone. - CONTRIBUTING.md: generate:github-ci stops for a tag directory in docker/php-official with a Dockerfile, not for any such directory. --- CONTRIBUTING.md | 2 +- ci/src/Commands/TestImageCommand.php | 5 ++ ci/src/FileReader.php | 28 +++++++-- ci/src/GithubJobBuilder.php | 8 ++- ci/src/ImageTests.php | 22 ++++++- ci/tests/Commands/TestImageCommandTest.php | 4 ++ .../Dockerfile/DockerfileGeneratorTest.php | 10 ++++ ci/tests/FileReaderTest.php | 59 ++++++++++++++++--- ci/tests/ImageTestsTest.php | 9 +++ ci/tests/Provision/ProvisionerTest.php | 5 -- 10 files changed, 131 insertions(+), 21 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e7f34c1d1..684197a48 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,7 +32,7 @@ It checks all of `conf/provision.yml` before it changes a file and stops if a so `generate:dockerfile` stops if a directory `docker//` has files but no `Dockerfile.twig`; it first removes the `.DS_Store` files of the macOS Finder under `docker`. To stop building a tag, remove its directory and those of the tags that build on it; `generate:github-ci` names any it finds. -`webdevops/php-official` is a deprecated name of `webdevops/php`. `generate:github-ci` publishes a `php` tag under that name too only if `docker: aliases` in `conf/console.yml` lists it; new PHP versions are not added there. When you stop building a `php` tag, remove it from that list as well: `generate:github-ci` stops while the list names a tag without a Dockerfile in `docker/php`, or while a directory `docker/php-official` exists. +`webdevops/php-official` is a deprecated name of `webdevops/php`. `generate:github-ci` publishes a `php` tag under that name too only if `docker: aliases` in `conf/console.yml` lists it; new PHP versions are not added there. When you stop building a `php` tag, remove it from that list as well: `generate:github-ci` stops while the list names a tag without a Dockerfile in `docker/php`, or while a tag directory in `docker/php-official` has a Dockerfile. ## Building in CI diff --git a/ci/src/Commands/TestImageCommand.php b/ci/src/Commands/TestImageCommand.php index e714879fd..ec7c5a950 100644 --- a/ci/src/Commands/TestImageCommand.php +++ b/ci/src/Commands/TestImageCommand.php @@ -101,6 +101,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int } $imageTests = new ImageTests($this->rootPath); + $image = $imageTests->unpublishedAliasOf($matches[1], $matches[2]); + if ($image !== null) { + throw new InvalidArgumentException(sprintf('%1$s is not published: webdevops/%2$s is a deprecated name of webdevops/%3$s for some tags only. Test webdevops/%3$s:%4$s instead.', $name, $matches[1], $image, $matches[2])); + } + $testFile = $imageTests->testFile($matches[1]); if ($testFile === null) { throw new InvalidArgumentException(sprintf('webdevops/%s has no image tests in %s.', $matches[1], ImageTests::DIRECTORY)); diff --git a/ci/src/FileReader.php b/ci/src/FileReader.php index 0ee6e94cc..2af336657 100644 --- a/ci/src/FileReader.php +++ b/ci/src/FileReader.php @@ -57,20 +57,29 @@ public function aliases(): array private function readAliases(): array { $settings = $this->settings['docker']['aliases'] ?? []; - $error = '"docker: aliases" in conf/console.yml has to map each deprecated name to the image it names and the tags in quotes, e.g. php-official: {image: php, tags: [\'8.5\']}.'; if (!is_array($settings)) { - throw new RuntimeException($error); + throw new RuntimeException('"docker: aliases" in conf/console.yml has to map each deprecated name to the image it names and its tags, e.g. php-official: {image: php, tags: [\'8.5\']}.'); } $aliases = []; foreach ($settings as $name => $alias) { $image = is_array($alias) ? $alias['image'] ?? null : null; $tags = is_array($alias) ? $alias['tags'] ?? null : null; - // an unquoted tag such as 8.10 is a number in YAML and would lose its trailing zero - if (!is_string($name) || $name === '' || !is_string($image) || $image === '' || $name === $image || !is_array($tags) || !array_is_list($tags) || array_any($tags, static fn (mixed $tag): bool => !is_string($tag) || $tag === '')) { - throw new RuntimeException($error); + $problem = match (true) { + !is_string($name) || !$this->isImageName($name) => 'the deprecated name has to be an image name in lower case, e.g. php-official', + !is_string($image) || !$this->isImageName($image) => '"image" has to name the image in lower case, e.g. php', + $name === $image => 'the deprecated name has to differ from its image', + // an unquoted tag such as 8.10 is a number in YAML and would lose its trailing zero + !is_array($tags) || !array_is_list($tags) || array_any($tags, static fn (mixed $tag): bool => !is_string($tag) || $tag === '') => '"tags" has to be a list of tags in quotes, e.g. [\'8.5\']', + count(array_unique($tags)) !== count($tags) => '"tags" lists a tag twice', + default => null, + }; + if ($problem !== null) { + throw new RuntimeException(sprintf('"docker: aliases: %s" in conf/console.yml: %s.', $name, $problem)); } + /** @var string $name */ + /** @var string $image */ /** @var list $tags */ $aliases[$name] = ['image' => $image, 'tags' => $tags]; } @@ -78,6 +87,15 @@ private function readAliases(): array return $aliases; } + /** + * Whether $name can be the name of a webdevops image, e.g. php-official: lower case letters and digits, separated + * by single dots, dashes or underscores. + */ + private function isImageName(string $name): bool + { + return (bool)preg_match('/^[a-z0-9]+(?:[._-][a-z0-9]+)*$/', $name); + } + /** * The Dockerfile of every tag under docker/ (see TagDirectories), relative to the repository root and sorted, e.g. * docker/base/alpine/Dockerfile. Tags whose Dockerfile was not generated yet are left out. diff --git a/ci/src/GithubJobBuilder.php b/ci/src/GithubJobBuilder.php index 5b7a0f142..bac998482 100644 --- a/ci/src/GithubJobBuilder.php +++ b/ci/src/GithubJobBuilder.php @@ -70,6 +70,11 @@ class GithubJobBuilder ], ]; + /** + * The image tests, read on first use + */ + private ?ImageTests $imageTests = null; + /** * @param string $rootPath the repository root */ @@ -462,7 +467,8 @@ private function buildContexts(array $imageDependencies): string */ private function imageTests(array $node): ?string { - if (new ImageTests($this->rootPath)->testFile($node['image']) === null) { + $this->imageTests ??= new ImageTests($this->rootPath); + if ($this->imageTests->testFile($node['image']) === null) { return null; } diff --git a/ci/src/ImageTests.php b/ci/src/ImageTests.php index b8a22c191..92ef647fb 100644 --- a/ci/src/ImageTests.php +++ b/ci/src/ImageTests.php @@ -7,6 +7,7 @@ use RuntimeException; use Symfony\Component\Yaml\Yaml; +use function in_array; use function is_array; use function is_file; use function is_string; @@ -38,11 +39,20 @@ */ public const string CONTAINER_LABEL = 'webdevops.image-test'; + /** + * @param string $rootPath the repository root + */ + /** + * @var array}> "docker: aliases" in conf/console.yml + */ + private array $aliases; + /** * @param string $rootPath the repository root */ public function __construct(private string $rootPath = __DIR__ . '/../..') { + $this->aliases = new FileReader($rootPath)->aliases(); } /** @@ -52,11 +62,21 @@ public function __construct(private string $rootPath = __DIR__ . '/../..') */ public function testFile(string $image): ?string { - $image = new FileReader($this->rootPath)->aliases()[$image]['image'] ?? $image; + $image = $this->aliases[$image]['image'] ?? $image; $file = self::DIRECTORY . '/' . str_replace(' ', '', ucwords(str_replace('-', ' ', $image))) . 'Test.php'; return is_file($this->rootPath . '/' . $file) ? $file : null; } + /** + * The image that $image stands for if $image is a deprecated name from "docker: aliases" in conf/console.yml that + * is not published with $tag, e.g. php for php-official and 8.6; null otherwise. + */ + public function unpublishedAliasOf(string $image, string $tag): ?string + { + $alias = $this->aliases[$image] ?? null; + return $alias !== null && !in_array($tag, $alias['tags'], true) ? $alias['image'] : null; + } + /** * The settings of webdevops/: from "dockerTest" in conf/console.yml, e.g. * ['OS_FAMILY' => 'alpine', 'OS_VERSION' => '3', 'PHP_OFFICIAL' => '1']. OS_FAMILY and OS_VERSION come from the diff --git a/ci/tests/Commands/TestImageCommandTest.php b/ci/tests/Commands/TestImageCommandTest.php index a079b6438..663ee1cc2 100644 --- a/ci/tests/Commands/TestImageCommandTest.php +++ b/ci/tests/Commands/TestImageCommandTest.php @@ -135,6 +135,10 @@ public static function invalidImages(): iterable yield 'no namespace' => ['base:alpine', 'Name the image as webdevops/:']; yield 'no tag' => ['webdevops/base', 'Name the image as webdevops/:']; yield 'no tests' => ['webdevops/php-nginx:8.5', 'webdevops/php-nginx has no image tests in ci/image-tests/Images.']; + yield 'deprecated name without that tag' => [ + 'webdevops/php-official:8.6', + 'webdevops/php-official:8.6 is not published: webdevops/php-official is a deprecated name of webdevops/php for some tags only. Test webdevops/php:8.6 instead.', + ]; } #[DataProvider('invalidImages')] diff --git a/ci/tests/Dockerfile/DockerfileGeneratorTest.php b/ci/tests/Dockerfile/DockerfileGeneratorTest.php index 4ba7d1788..f44b03e0b 100644 --- a/ci/tests/Dockerfile/DockerfileGeneratorTest.php +++ b/ci/tests/Dockerfile/DockerfileGeneratorTest.php @@ -13,6 +13,8 @@ use Webdevops\Build\Tests\TemporaryRepository; use function file_get_contents; +use function is_link; +use function symlink; #[CoversClass(DockerfileGenerator::class)] final class DockerfileGeneratorTest extends TestCase @@ -126,6 +128,14 @@ public function testRemovesTheFilesOfTheFinder(): void self::assertFileDoesNotExist($this->repository->path . '/docker/toolbox/latest/conf/.DS_Store', 'it would get into a local build'); } + public function testLeavesOutSymbolicLinks(): void + { + symlink('8.5', $this->repository->path . '/docker/php/8.6'); + + self::assertNotContains('webdevops/php:8.6', $this->generate()); + self::assertTrue(is_link($this->repository->path . '/docker/php/8.6')); + } + public function testNewTagIsRendered(): void { $this->repository->write('docker/base/alpine-edge/Dockerfile.twig', $this->repository->read('docker/base/alpine/Dockerfile.twig')); diff --git a/ci/tests/FileReaderTest.php b/ci/tests/FileReaderTest.php index 21639d480..d45277ff4 100644 --- a/ci/tests/FileReaderTest.php +++ b/ci/tests/FileReaderTest.php @@ -11,6 +11,7 @@ use Webdevops\Build\FileReader; use function str_replace; +use function symlink; #[CoversClass(FileReader::class)] final class FileReaderTest extends TestCase @@ -32,6 +33,18 @@ public function testCollectsTheGeneratedDockerfilesSorted(): void ], new FileReader(self::ROOT)->collectDockerfiles()); } + public function testCollectsNoDockerfileThroughASymbolicLink(): void + { + $repository = new TemporaryRepository(); + symlink('8.5', $repository->path . '/docker/php/8.6'); + + try { + self::assertNotContains('docker/php/8.6/Dockerfile', new FileReader($repository->path)->collectDockerfiles()); + } finally { + $repository->remove(); + } + } + public function testCollectsOnlyTheDockerfilesOfTags(): void { $repository = new TemporaryRepository(); @@ -104,32 +117,62 @@ public function testDeprecatedNameGetsNoNewTags(): void } /** - * @return iterable + * @return iterable */ public static function invalidAliases(): iterable { - yield 'tag without quotes' => [" tags: [8.4, '8.5-alpine', '8.5']"]; - yield 'empty tag' => [" tags: ['', '8.5-alpine', '8.5']"]; - yield 'no list' => [" tags: '8.4'"]; - yield 'name of the image itself' => [" tags: ['8.4']\n php:\n image: 'php'\n tags: ['8.5']"]; - yield 'empty name' => [" tags: ['8.4']\n '':\n image: 'php'\n tags: ['8.5']"]; + $tags = '"docker: aliases: php-official" in conf/console.yml: "tags" has to be a list of tags in quotes, e.g. [\'8.5\'].'; + yield 'tag without quotes' => [" tags: [8.4, '8.5-alpine', '8.5']", $tags]; + yield 'empty tag' => [" tags: ['', '8.5-alpine', '8.5']", $tags]; + yield 'no list' => [" tags: '8.4'", $tags]; + yield 'tag listed twice' => [" tags: ['8.4', '8.5', '8.4']", '"docker: aliases: php-official" in conf/console.yml: "tags" lists a tag twice.']; + yield 'name of the image itself' => [ + " tags: ['8.4']\n php:\n image: 'php'\n tags: ['8.5']", + '"docker: aliases: php" in conf/console.yml: the deprecated name has to differ from its image.', + ]; + yield 'empty name' => [ + " tags: ['8.4']\n '':\n image: 'php'\n tags: ['8.5']", + '"docker: aliases: " in conf/console.yml: the deprecated name has to be an image name in lower case, e.g. php-official.', + ]; + yield 'name in upper case' => [ + " tags: ['8.4']\n PHP-Official:\n image: 'php'\n tags: ['8.5']", + '"docker: aliases: PHP-Official" in conf/console.yml: the deprecated name has to be an image name in lower case, e.g. php-official.', + ]; + yield 'image with its namespace' => [ + " tags: ['8.4']\n php-legacy:\n image: 'webdevops/php'\n tags: ['8.5']", + '"docker: aliases: php-legacy" in conf/console.yml: "image" has to name the image in lower case, e.g. php.', + ]; } #[DataProvider('invalidAliases')] - public function testInvalidAliasListIsAnError(string $line): void + public function testInvalidAliasListIsAnError(string $line, string $message): void { $repository = new TemporaryRepository(); $repository->write('conf/console.yml', str_replace(" tags: ['8.4', '8.5-alpine', '8.5']", $line, $repository->read('conf/console.yml'))); try { $this->expectException(RuntimeException::class); - $this->expectExceptionMessage('"docker: aliases" in conf/console.yml has to map each deprecated name to the image it names and the tags in quotes, e.g. php-official: {image: php, tags: [\'8.5\']}.'); + $this->expectExceptionMessage($message); new FileReader($repository->path)->getInfo('docker/php/8.5/Dockerfile'); } finally { $repository->remove(); } } + public function testAliasesThatAreNoMapAreAnError(): void + { + $repository = new TemporaryRepository(); + $repository->write('conf/console.yml', str_replace(" aliases:\n", " aliases: 'php-official'\n unused:\n", $repository->read('conf/console.yml'))); + + try { + $this->expectException(RuntimeException::class); + $this->expectExceptionMessage('"docker: aliases" in conf/console.yml has to map each deprecated name to the image it names and its tags, e.g. php-official: {image: php, tags: [\'8.5\']}.'); + new FileReader($repository->path)->aliases(); + } finally { + $repository->remove(); + } + } + public function testInternalParentImage(): void { $node = $this->info('php-nginx/8.5-alpine'); diff --git a/ci/tests/ImageTestsTest.php b/ci/tests/ImageTestsTest.php index a7778ebb2..746615e16 100644 --- a/ci/tests/ImageTestsTest.php +++ b/ci/tests/ImageTestsTest.php @@ -22,6 +22,15 @@ public function testTestFileOfAnImageIsItsNameInStudlyCaps(): void self::assertNull($imageTests->testFile('php-nginx'), 'the fixture has no PhpNginxTest.php'); } + public function testUnpublishedAliasOf(): void + { + $imageTests = new ImageTests(TemporaryRepository::FIXTURE); + + self::assertSame('php', $imageTests->unpublishedAliasOf('php-official', '8.6')); + self::assertNull($imageTests->unpublishedAliasOf('php-official', '8.5'), 'published'); + self::assertNull($imageTests->unpublishedAliasOf('php', '8.6'), 'no deprecated name'); + } + public function testEveryImageWithTestsInTheRepositoryHasAClass(): void { $imageTests = new ImageTests(__DIR__ . '/../..'); diff --git a/ci/tests/Provision/ProvisionerTest.php b/ci/tests/Provision/ProvisionerTest.php index e004ccec2..d7f2468f9 100644 --- a/ci/tests/Provision/ProvisionerTest.php +++ b/ci/tests/Provision/ProvisionerTest.php @@ -178,11 +178,6 @@ public static function invalidConfigurations(): iterable "provision:\n missing-image:\n configuration:\n base/general: '*'\n", 'conf/provision.yml copies provisioning/base/general into webdevops/missing-image:*, but webdevops/missing-image has no such tag under docker/.', ]; - yield 'deprecated name of an image' => [ - // webdevops/php-official is only published as webdevops/php, see "docker: aliases" in conf/console.yml - "provision:\n php-official:\n configuration:\n php/general: '*'\n", - 'conf/provision.yml copies provisioning/php/general into webdevops/php-official:*, but webdevops/php-official has no such tag under docker/.', - ]; yield 'empty tag list' => [ "provision:\n base:\n configuration:\n base/general: []\n", 'conf/provision.yml has no tag for provisioning/base/general in webdevops/base.',