Update drupal#20605
Merged
yosifkit merged 1 commit intodocker-library:masterfrom Jan 9, 2026
Merged
Conversation
Member
tianon
commented
Jan 8, 2026
tianon
commented
- Add PHP 8.5 variants drupal#299
Diff for 79bb211:diff --git a/_bashbrew-cat b/_bashbrew-cat
index a60c42b..d58d45c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -181,36 +181,6 @@ Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: a0d9b553e28d816166cd59f3971b6c6c6b11351b
Directory: 11.2/php8.4/fpm-trixie
-Tags: 11.3.2-php8.3-apache-bookworm, 11.3-php8.3-apache-bookworm, 11-php8.3-apache-bookworm, php8.3-apache-bookworm
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e8b27a2e8d52a3f7dc131fa382bb263bcdbcd21e
-Directory: 11.3/php8.3/apache-bookworm
-
-Tags: 11.3.2-php8.3-apache-trixie, 11.3-php8.3-apache-trixie, 11-php8.3-apache-trixie, php8.3-apache-trixie, 11.3.2-php8.3-apache, 11.3-php8.3-apache, 11-php8.3-apache, php8.3-apache, 11.3.2-php8.3, 11.3-php8.3, 11-php8.3, php8.3
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e8b27a2e8d52a3f7dc131fa382bb263bcdbcd21e
-Directory: 11.3/php8.3/apache-trixie
-
-Tags: 11.3.2-php8.3-fpm-alpine3.22, 11.3-php8.3-fpm-alpine3.22, 11-php8.3-fpm-alpine3.22, php8.3-fpm-alpine3.22
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e8b27a2e8d52a3f7dc131fa382bb263bcdbcd21e
-Directory: 11.3/php8.3/fpm-alpine3.22
-
-Tags: 11.3.2-php8.3-fpm-alpine3.23, 11.3-php8.3-fpm-alpine3.23, 11-php8.3-fpm-alpine3.23, php8.3-fpm-alpine3.23, 11.3.2-php8.3-fpm-alpine, 11.3-php8.3-fpm-alpine, 11-php8.3-fpm-alpine, php8.3-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e8b27a2e8d52a3f7dc131fa382bb263bcdbcd21e
-Directory: 11.3/php8.3/fpm-alpine3.23
-
-Tags: 11.3.2-php8.3-fpm-bookworm, 11.3-php8.3-fpm-bookworm, 11-php8.3-fpm-bookworm, php8.3-fpm-bookworm
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e8b27a2e8d52a3f7dc131fa382bb263bcdbcd21e
-Directory: 11.3/php8.3/fpm-bookworm
-
-Tags: 11.3.2-php8.3-fpm-trixie, 11.3-php8.3-fpm-trixie, 11-php8.3-fpm-trixie, php8.3-fpm-trixie, 11.3.2-php8.3-fpm, 11.3-php8.3-fpm, 11-php8.3-fpm, php8.3-fpm
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e8b27a2e8d52a3f7dc131fa382bb263bcdbcd21e
-Directory: 11.3/php8.3/fpm-trixie
-
Tags: 11.3.2-php8.4-apache-bookworm, 11.3-php8.4-apache-bookworm, 11-php8.4-apache-bookworm, php8.4-apache-bookworm, 11.3.2-apache-bookworm, 11.3-apache-bookworm, 11-apache-bookworm, apache-bookworm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: e8b27a2e8d52a3f7dc131fa382bb263bcdbcd21e
@@ -240,3 +210,33 @@ Tags: 11.3.2-php8.4-fpm-trixie, 11.3-php8.4-fpm-trixie, 11-php8.4-fpm-trixie, ph
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: e8b27a2e8d52a3f7dc131fa382bb263bcdbcd21e
Directory: 11.3/php8.4/fpm-trixie
+
+Tags: 11.3.2-php8.5-apache-bookworm, 11.3-php8.5-apache-bookworm, 11-php8.5-apache-bookworm, php8.5-apache-bookworm
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 8527ca0412b456cd3719cb8719bfb83da5d530a7
+Directory: 11.3/php8.5/apache-bookworm
+
+Tags: 11.3.2-php8.5-apache-trixie, 11.3-php8.5-apache-trixie, 11-php8.5-apache-trixie, php8.5-apache-trixie, 11.3.2-php8.5-apache, 11.3-php8.5-apache, 11-php8.5-apache, php8.5-apache, 11.3.2-php8.5, 11.3-php8.5, 11-php8.5, php8.5
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 8527ca0412b456cd3719cb8719bfb83da5d530a7
+Directory: 11.3/php8.5/apache-trixie
+
+Tags: 11.3.2-php8.5-fpm-alpine3.22, 11.3-php8.5-fpm-alpine3.22, 11-php8.5-fpm-alpine3.22, php8.5-fpm-alpine3.22
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 8527ca0412b456cd3719cb8719bfb83da5d530a7
+Directory: 11.3/php8.5/fpm-alpine3.22
+
+Tags: 11.3.2-php8.5-fpm-alpine3.23, 11.3-php8.5-fpm-alpine3.23, 11-php8.5-fpm-alpine3.23, php8.5-fpm-alpine3.23, 11.3.2-php8.5-fpm-alpine, 11.3-php8.5-fpm-alpine, 11-php8.5-fpm-alpine, php8.5-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 8527ca0412b456cd3719cb8719bfb83da5d530a7
+Directory: 11.3/php8.5/fpm-alpine3.23
+
+Tags: 11.3.2-php8.5-fpm-bookworm, 11.3-php8.5-fpm-bookworm, 11-php8.5-fpm-bookworm, php8.5-fpm-bookworm
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 8527ca0412b456cd3719cb8719bfb83da5d530a7
+Directory: 11.3/php8.5/fpm-bookworm
+
+Tags: 11.3.2-php8.5-fpm-trixie, 11.3-php8.5-fpm-trixie, 11-php8.5-fpm-trixie, php8.5-fpm-trixie, 11.3.2-php8.5-fpm, 11.3-php8.5-fpm, 11-php8.5-fpm, php8.5-fpm
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 8527ca0412b456cd3719cb8719bfb83da5d530a7
+Directory: 11.3/php8.5/fpm-trixie
diff --git a/_bashbrew-list b/_bashbrew-list
index d6afb22..bf2f745 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -158,16 +158,6 @@ drupal:11-fpm-alpine3.22
drupal:11-fpm-alpine3.23
drupal:11-fpm-bookworm
drupal:11-fpm-trixie
-drupal:11-php8.3
-drupal:11-php8.3-apache
-drupal:11-php8.3-apache-bookworm
-drupal:11-php8.3-apache-trixie
-drupal:11-php8.3-fpm
-drupal:11-php8.3-fpm-alpine
-drupal:11-php8.3-fpm-alpine3.22
-drupal:11-php8.3-fpm-alpine3.23
-drupal:11-php8.3-fpm-bookworm
-drupal:11-php8.3-fpm-trixie
drupal:11-php8.4
drupal:11-php8.4-apache
drupal:11-php8.4-apache-bookworm
@@ -178,6 +168,16 @@ drupal:11-php8.4-fpm-alpine3.22
drupal:11-php8.4-fpm-alpine3.23
drupal:11-php8.4-fpm-bookworm
drupal:11-php8.4-fpm-trixie
+drupal:11-php8.5
+drupal:11-php8.5-apache
+drupal:11-php8.5-apache-bookworm
+drupal:11-php8.5-apache-trixie
+drupal:11-php8.5-fpm
+drupal:11-php8.5-fpm-alpine
+drupal:11-php8.5-fpm-alpine3.22
+drupal:11-php8.5-fpm-alpine3.23
+drupal:11-php8.5-fpm-bookworm
+drupal:11-php8.5-fpm-trixie
drupal:11.2
drupal:11.2-apache
drupal:11.2-apache-bookworm
@@ -248,16 +248,6 @@ drupal:11.3-fpm-alpine3.22
drupal:11.3-fpm-alpine3.23
drupal:11.3-fpm-bookworm
drupal:11.3-fpm-trixie
-drupal:11.3-php8.3
-drupal:11.3-php8.3-apache
-drupal:11.3-php8.3-apache-bookworm
-drupal:11.3-php8.3-apache-trixie
-drupal:11.3-php8.3-fpm
-drupal:11.3-php8.3-fpm-alpine
-drupal:11.3-php8.3-fpm-alpine3.22
-drupal:11.3-php8.3-fpm-alpine3.23
-drupal:11.3-php8.3-fpm-bookworm
-drupal:11.3-php8.3-fpm-trixie
drupal:11.3-php8.4
drupal:11.3-php8.4-apache
drupal:11.3-php8.4-apache-bookworm
@@ -268,6 +258,16 @@ drupal:11.3-php8.4-fpm-alpine3.22
drupal:11.3-php8.4-fpm-alpine3.23
drupal:11.3-php8.4-fpm-bookworm
drupal:11.3-php8.4-fpm-trixie
+drupal:11.3-php8.5
+drupal:11.3-php8.5-apache
+drupal:11.3-php8.5-apache-bookworm
+drupal:11.3-php8.5-apache-trixie
+drupal:11.3-php8.5-fpm
+drupal:11.3-php8.5-fpm-alpine
+drupal:11.3-php8.5-fpm-alpine3.22
+drupal:11.3-php8.5-fpm-alpine3.23
+drupal:11.3-php8.5-fpm-bookworm
+drupal:11.3-php8.5-fpm-trixie
drupal:11.3.2
drupal:11.3.2-apache
drupal:11.3.2-apache-bookworm
@@ -278,16 +278,6 @@ drupal:11.3.2-fpm-alpine3.22
drupal:11.3.2-fpm-alpine3.23
drupal:11.3.2-fpm-bookworm
drupal:11.3.2-fpm-trixie
-drupal:11.3.2-php8.3
-drupal:11.3.2-php8.3-apache
-drupal:11.3.2-php8.3-apache-bookworm
-drupal:11.3.2-php8.3-apache-trixie
-drupal:11.3.2-php8.3-fpm
-drupal:11.3.2-php8.3-fpm-alpine
-drupal:11.3.2-php8.3-fpm-alpine3.22
-drupal:11.3.2-php8.3-fpm-alpine3.23
-drupal:11.3.2-php8.3-fpm-bookworm
-drupal:11.3.2-php8.3-fpm-trixie
drupal:11.3.2-php8.4
drupal:11.3.2-php8.4-apache
drupal:11.3.2-php8.4-apache-bookworm
@@ -298,6 +288,16 @@ drupal:11.3.2-php8.4-fpm-alpine3.22
drupal:11.3.2-php8.4-fpm-alpine3.23
drupal:11.3.2-php8.4-fpm-bookworm
drupal:11.3.2-php8.4-fpm-trixie
+drupal:11.3.2-php8.5
+drupal:11.3.2-php8.5-apache
+drupal:11.3.2-php8.5-apache-bookworm
+drupal:11.3.2-php8.5-apache-trixie
+drupal:11.3.2-php8.5-fpm
+drupal:11.3.2-php8.5-fpm-alpine
+drupal:11.3.2-php8.5-fpm-alpine3.22
+drupal:11.3.2-php8.5-fpm-alpine3.23
+drupal:11.3.2-php8.5-fpm-bookworm
+drupal:11.3.2-php8.5-fpm-trixie
drupal:apache
drupal:apache-bookworm
drupal:apache-trixie
@@ -308,16 +308,6 @@ drupal:fpm-alpine3.23
drupal:fpm-bookworm
drupal:fpm-trixie
drupal:latest
-drupal:php8.3
-drupal:php8.3-apache
-drupal:php8.3-apache-bookworm
-drupal:php8.3-apache-trixie
-drupal:php8.3-fpm
-drupal:php8.3-fpm-alpine
-drupal:php8.3-fpm-alpine3.22
-drupal:php8.3-fpm-alpine3.23
-drupal:php8.3-fpm-bookworm
-drupal:php8.3-fpm-trixie
drupal:php8.4
drupal:php8.4-apache
drupal:php8.4-apache-bookworm
@@ -328,3 +318,13 @@ drupal:php8.4-fpm-alpine3.22
drupal:php8.4-fpm-alpine3.23
drupal:php8.4-fpm-bookworm
drupal:php8.4-fpm-trixie
+drupal:php8.5
+drupal:php8.5-apache
+drupal:php8.5-apache-bookworm
+drupal:php8.5-apache-trixie
+drupal:php8.5-fpm
+drupal:php8.5-fpm-alpine
+drupal:php8.5-fpm-alpine3.22
+drupal:php8.5-fpm-alpine3.23
+drupal:php8.5-fpm-bookworm
+drupal:php8.5-fpm-trixie
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index c4f0075..5ba1093 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -40,9 +40,9 @@ drupal:fpm-alpine
drupal:fpm-alpine3.22
drupal:fpm-bookworm
drupal:latest
-drupal:php8.3
-drupal:php8.3-apache-bookworm
-drupal:php8.3-fpm
-drupal:php8.3-fpm-alpine
-drupal:php8.3-fpm-alpine3.22
-drupal:php8.3-fpm-bookworm
+drupal:php8.5
+drupal:php8.5-apache-bookworm
+drupal:php8.5-fpm
+drupal:php8.5-fpm-alpine
+drupal:php8.5-fpm-alpine3.22
+drupal:php8.5-fpm-bookworm
diff --git a/drupal_php8.3-apache-bookworm/Dockerfile b/drupal_php8.5-apache-bookworm/Dockerfile
similarity index 99%
rename from drupal_php8.3-apache-bookworm/Dockerfile
rename to drupal_php8.5-apache-bookworm/Dockerfile
index d3e7ea8..bc116d7 100644
--- a/drupal_php8.3-apache-bookworm/Dockerfile
+++ b/drupal_php8.5-apache-bookworm/Dockerfile
@@ -5,7 +5,7 @@
#
# https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.3-apache-bookworm
+FROM php:8.5-apache-bookworm
# install the PHP extensions we need
RUN set -eux; \
diff --git a/drupal_php8.3-fpm-alpine/Dockerfile b/drupal_php8.5-fpm-alpine/Dockerfile
similarity index 98%
rename from drupal_php8.3-fpm-alpine/Dockerfile
rename to drupal_php8.5-fpm-alpine/Dockerfile
index bb3025a..4d72572 100644
--- a/drupal_php8.3-fpm-alpine/Dockerfile
+++ b/drupal_php8.5-fpm-alpine/Dockerfile
@@ -5,7 +5,7 @@
#
# https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.3-fpm-alpine3.23
+FROM php:8.5-fpm-alpine3.23
# install the PHP extensions we need
RUN set -eux; \
diff --git a/drupal_php8.3-fpm-alpine3.22/Dockerfile b/drupal_php8.5-fpm-alpine3.22/Dockerfile
similarity index 98%
rename from drupal_php8.3-fpm-alpine3.22/Dockerfile
rename to drupal_php8.5-fpm-alpine3.22/Dockerfile
index a8fb007..013a789 100644
--- a/drupal_php8.3-fpm-alpine3.22/Dockerfile
+++ b/drupal_php8.5-fpm-alpine3.22/Dockerfile
@@ -5,7 +5,7 @@
#
# https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.3-fpm-alpine3.22
+FROM php:8.5-fpm-alpine3.22
# install the PHP extensions we need
RUN set -eux; \
diff --git a/drupal_php8.3-fpm-bookworm/Dockerfile b/drupal_php8.5-fpm-bookworm/Dockerfile
similarity index 99%
rename from drupal_php8.3-fpm-bookworm/Dockerfile
rename to drupal_php8.5-fpm-bookworm/Dockerfile
index 63ce592..b1b38a1 100644
--- a/drupal_php8.3-fpm-bookworm/Dockerfile
+++ b/drupal_php8.5-fpm-bookworm/Dockerfile
@@ -5,7 +5,7 @@
#
# https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.3-fpm-bookworm
+FROM php:8.5-fpm-bookworm
# install the PHP extensions we need
RUN set -eux; \
diff --git a/drupal_php8.3-fpm/Dockerfile b/drupal_php8.5-fpm/Dockerfile
similarity index 99%
rename from drupal_php8.3-fpm/Dockerfile
rename to drupal_php8.5-fpm/Dockerfile
index 60a256b..0152590 100644
--- a/drupal_php8.3-fpm/Dockerfile
+++ b/drupal_php8.5-fpm/Dockerfile
@@ -5,7 +5,7 @@
#
# https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.3-fpm-trixie
+FROM php:8.5-fpm-trixie
# install the PHP extensions we need
RUN set -eux; \
diff --git a/drupal_php8.3/Dockerfile b/drupal_php8.5/Dockerfile
similarity index 99%
rename from drupal_php8.3/Dockerfile
rename to drupal_php8.5/Dockerfile
index 7e34ac8..9e2fe8e 100644
--- a/drupal_php8.3/Dockerfile
+++ b/drupal_php8.5/Dockerfile
@@ -5,7 +5,7 @@
#
# https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.3-apache-trixie
+FROM php:8.5-apache-trixie
# install the PHP extensions we need
RUN set -eux; \Relevant Maintainers: |
yosifkit
approved these changes
Jan 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.