Skip to content

[TASK] Deprecate webdevops/php-official and build php from docker/php - #628

Draft
Kanti wants to merge 4 commits into
webdevops:masterfrom
andersundsehr:chore/deprecate-php-official
Draft

Kanti wants to merge 4 commits into
webdevops:masterfrom
andersundsehr:chore/deprecate-php-official

Conversation

@Kanti

@Kanti Kanti commented Nov 17, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

webdevops/php-official is deprecated: it is the same image as webdevops/php, published under a second name. This PR keeps that name for the existing tags 8.2–8.5 (Debian and Alpine) and stops it from getting new tags, so PHP 8.6 (#594) is only published as webdevops/php.

The source layout now follows the published name: the Dockerfiles live in docker/php/<tag> instead of docker/php-official/<tag>, and the symbolic links between the two directories are gone.

Changes

  • docker/php-official/<tag> moves to docker/php/<tag> (renames, contents unchanged; the generated header now says webdevops/php:<tag>). conf/provision.yml: php-official becomes php.
  • conf/console.yml: new docker: aliases with the deprecated name, the image it names and the tags it is still published for (8.2 to 8.5 and their -alpine tags).
  • FileReader adds the alias from that list instead of renaming *-official images. generate:github-ci stops if the list names a tag that is not built, so dropping a PHP version also removes it from the list, and if a deprecated name is built as an image of its own (for example a docker/php-official/8.6 from an older branch), so the name cannot get new tags by accident.
  • ImageTests resolves a deprecated name to its image through the same list: ci/console test:image webdevops/php-official:8.5 runs the tests of php.
  • ImageLinks and its test are removed; TagDirectories still leaves symbolic links out (now with a test of its own).
  • Tests: the fixture moves to docker/php; new tests for the alias list (listed tags only, no new tags, invalid list, alias of a removed tag, deprecated name built as an image of its own) and for symbolic links in TagDirectories and the Provisioner.
  • Docs: docs/discontinued-images.md (new section: switch to webdevops/php now, keeping the tag for 8.2–8.5; the older tags 5.6 to 8.1 move to a PHP version that is still built), docs/images/php.md, docs/README.md, CONTRIBUTING.md, AGENTS.md.

Effect on the published images

None for the existing tags. The generated workflow has the same 119 jobs; only the build context of the 8 php_* jobs changes from docker/php-official/<tag> to docker/php/<tag>. The pushed tags (-t lines) are identical, including the 16 php-official tags (Docker Hub and ghcr.io). The Dockerfiles and conf/ files are unchanged apart from the header comment.

Verification

Statement Check
php-official is the same image as php webdevops/php:8.5 and webdevops/php-official:8.5 have the same digest on Docker Hub (sha256:9e539622…), as do the 8.5-alpine tags (sha256:42ef0822…)
Older php-official tags Docker Hub lists 5.6 to 8.1 for php-official; the workflow builds none of them under either name
No php-official tag after 8.5 docker manifest inspect webdevops/php-official:8.6 finds nothing; the workflow publishes php-official only for 8.2–8.5
Published tags unchanged Generated workflow compared job by job with master: identical apart from the context path of the 8 php_* jobs; the same 138 -t tags
Generated files make generate produces no further diff; Dockerfiles and conf/ are renames with only the header changed
CI code make check passes

After merging

docker/php/<tag> 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/<tag> to docker/php/<tag>.
- docs/discontinued-images.md describes the deprecation and the migration.
…mage tests

- generate:github-ci stops if a deprecated name is built as an image of its
  own (docker/php-official/<tag>), 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.
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.
…est: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.
@Kanti
Kanti force-pushed the chore/deprecate-php-official branch from 6523239 to 71f370f Compare November 17, 2026 12:54
@sonarqubecloud

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant