Skip to content

Add PHP 8.5 variants #299

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
tianon merged 3 commits into from
Jan 8, 2026
Merged

Add PHP 8.5 variants #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc7e15b
Add PHP 8.5 variant (for 11.3 only)
jnoordsij Jan 6, 2026
7527e80
Drop PHP 8.4 for 10.6/11.3
jnoordsij Jan 6, 2026
1eb8aca
Restore Drupal 10.6 + PHP 8.3 variant
jnoordsij Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 11.3/php8.3/apache-bookworm/Dockerfile → 11.3/php8.5/apache-bookworm/Dockerfile
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion 11.3/php8.3/apache-trixie/Dockerfile → 11.3/php8.5/apache-trixie/Dockerfile
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion 11.3/php8.3/fpm-alpine3.22/Dockerfile → 11.3/php8.5/fpm-alpine3.22/Dockerfile
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion 11.3/php8.3/fpm-alpine3.23/Dockerfile → 11.3/php8.5/fpm-alpine3.23/Dockerfile
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion 11.3/php8.3/fpm-bookworm/Dockerfile → 11.3/php8.5/fpm-bookworm/Dockerfile
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion 11.3/php8.3/fpm-trixie/Dockerfile → 11.3/php8.5/fpm-trixie/Dockerfile
View file
Open in desktop

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

10 changes: 6 additions & 4 deletions generate-stackbrew-library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ declare -A debianSuites=(
#[11.2]='bookworm'
)

defaultPhpVersion='php8.4'
defaultPhpVersion='php8.5'
declare -A defaultPhpVersions=(
# releases older than 11 will conservatively stay on 8.2 by default
[11.1]='php8.3'
[10.4]='php8.3'
# releases up to 11.3 will conservatively stay on 8.4 by default
[11.3]='php8.4'
[11.2]='php8.4'
[10.6]='php8.4'
[10.5]='php8.4'
# https://www.drupal.org/docs/system-requirements/php-requirements
)

Expand Down
10 changes: 3 additions & 7 deletions versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{
"11.3-rc": null,
"11.3": {
"version": "11.3.2",
"url": "https://ftp.drupal.org/files/projects/drupal-11.3.2.tar.gz",
"md5": "06363f2e20e3fea361d99f1ad8b47579",
"date": 1767865697,
"notes": "https://www.drupal.org/project/drupal/releases/11.3.2",
"phpVersions": [
"8.4",
"8.3"
"8.5",
"8.4"
],
"variants": [
"apache-trixie",
Expand Down Expand Up @@ -44,8 +43,6 @@
"version": "2"
}
},
"11.1": null,
"10.6-rc": null,
"10.6": {
"version": "10.6.2",
"url": "https://ftp.drupal.org/files/projects/drupal-10.6.2.tar.gz",
Expand Down Expand Up @@ -89,6 +86,5 @@
"composer": {
"version": "2"
}
},
"10.4": null
}
}
16 changes: 11 additions & 5 deletions versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,19 @@ for version in "${versions[@]}"; do
phpVersions: (
# https://www.drupal.org/docs/system-requirements/php-requirements
[
# Drupal 11.3+ supports PHP 8.5
if env.version | IN("10.5", "10.6", "11.2") then empty else
"8.5"
end,
# Drupal 11.1+ and 10.4+ support PHP 8.4
"8.4",
Copy link
Member

@tianon tianon Jan 6, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

Do you think we should pre-emptively limit this to just versions less than 12, given that the 8.5+ requirement in 12+ looks pretty serious? I guess there's not really any harm in waiting to do that until we add our first 12+ version? (I'm mostly worried we'll forget 😂)

edit: putting an explicit link to https://www.drupal.org/project/drupal/issues/3537713, which is where things are looking pretty serious for 8.5+ in 12+

Copy link
Contributor Author

@jnoordsij jnoordsij Jan 6, 2026

Choose a reason for hiding this comment

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

If 12+ properly requires 8.5+ in their dependencies then composer should fail somewhere here, so that should be easy enough to spot:

drupal/Dockerfile.template

Lines 111 to 113 in 9dd7b9f

composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526
composer check-platform-reqs; \

It could be worth considering to already allow 8.4 only on current 11.x minor builds and not any future ones, to preemptively limit the offered versions on any new minors and only offer them on reasonable request (or if you happen to remember and are in a particular good mood ;) ).

# https://www.drupal.org/project/drupal/releases/10.2.0-rc1#php-deps
# Drupal supports PHP 8.3 and recommends at least PHP 8.2.
"8.3",
# https://www.drupal.org/docs/system-requirements/php-requirements
empty
# Drupal 11.3+ and 10.6+ recommend PHP 8.4; keep 8.3 for 'existing' builds
# https://github.com/docker-library/drupal/pull/299
# https://www.drupal.org/project/drupal/releases/10.6.0#platform
# https://www.drupal.org/project/drupal/releases/11.3.0#platform
if env.version | IN("10.5", "10.6", "11.2") then
"8.3"
else empty end
]
),
variants: [
Expand Down
Loading