Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion 8.2/alpine3.21/zts/Dockerfile → 8.2/alpine3.23/zts/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 16 additions & 16 deletions versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
"bookworm/apache",
"bookworm/fpm",
"bookworm/zts",
"alpine3.23/cli",
"alpine3.23/fpm",
"alpine3.23/zts",
"alpine3.22/cli",
"alpine3.22/fpm",
"alpine3.22/zts",
"alpine3.21/cli",
"alpine3.21/fpm",
"alpine3.21/zts"
"alpine3.22/zts"
]
},
"8.2-rc": null,
Expand All @@ -59,12 +59,12 @@
"bookworm/apache",
"bookworm/fpm",
"bookworm/zts",
"alpine3.23/cli",
"alpine3.23/fpm",
"alpine3.23/zts",
"alpine3.22/cli",
"alpine3.22/fpm",
"alpine3.22/zts",
"alpine3.21/cli",
"alpine3.21/fpm",
"alpine3.21/zts"
"alpine3.22/zts"
]
},
"8.3-rc": null,
Expand All @@ -82,12 +82,12 @@
"bookworm/apache",
"bookworm/fpm",
"bookworm/zts",
"alpine3.23/cli",
"alpine3.23/fpm",
"alpine3.23/zts",
"alpine3.22/cli",
"alpine3.22/fpm",
"alpine3.22/zts",
"alpine3.21/cli",
"alpine3.21/fpm",
"alpine3.21/zts"
"alpine3.22/zts"
]
},
"8.4-rc": null,
Expand All @@ -105,12 +105,12 @@
"bookworm/apache",
"bookworm/fpm",
"bookworm/zts",
"alpine3.23/cli",
"alpine3.23/fpm",
"alpine3.23/zts",
"alpine3.22/cli",
"alpine3.22/fpm",
"alpine3.22/zts",
"alpine3.21/cli",
"alpine3.21/fpm",
"alpine3.21/zts"
"alpine3.22/zts"
]
},
"8.5-rc": null
Expand Down
9 changes: 9 additions & 0 deletions versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ for version in "${versions[@]}"; do
for suite in \
trixie \
bookworm \
alpine3.23 \
alpine3.22 \
alpine3.21 \
; do
Expand All @@ -90,6 +91,14 @@ for version in "${versions[@]}"; do
if [ "$variant" = 'apache' ]; then
continue
fi
if [[ "$rcVersion" = '8.1' ]] && [[ "$suite" = 'alpine3.23' ]]; then
# Keep PHP 8.1 with Alpine 3.21 default until end of year; see also https://github.com/docker-library/php/blob/9ab2e4b37addffaa10f06d9e5f54f7bd1f5ef18f/generate-stackbrew-library.sh#L120
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While reviewing, I got confused by this wording because I had forgotten about

# intl will not compile on Alpine 3.22 causing build failures for downstream images (joomla, mediawiki, wordpress): https://github.com/docker-library/php/issues/1585
# since PHP 8.1 is EOL at the end of the year and wont likely get fixes, keep the default Alpine at 3.21
| if env.version == "8.1" then
"alpine3.21"

(leaving a link here so it's obvious to others too 😂)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah it was a bit of a quick hack and wording, but with the link it should suffice for code that will only be around for a handful of weeks 😉

continue
fi
if [[ "$rcVersion" != '8.1' ]] && [[ "$suite" = 'alpine3.21' ]]; then
# Keep Alpine 3.21 just for 8.1
continue
fi
fi
export suite variant
variants="$(jq <<<"$variants" -c '. + [ env.suite + "/" + env.variant ]')"
Expand Down
Loading