Skip to content

Conversation

@tianon
Copy link
Member

@tianon tianon commented Jun 23, 2025

Changes:

Changes:

- docker-library/drupal@040d3aa: Merge pull request docker-library/drupal#290 from infosiftr/cleanup
- docker-library/drupal@f9e60c2: Drop drupal 7 bits (non composer install)
- docker-library/drupal@7eb8d68: Update 11.2
- docker-library/drupal@a2a3d4f: Merge pull request docker-library/drupal#289 from infosiftr/recommended-settings
- docker-library/drupal@e519db2: Add upstream recommened setting for output_buffering
@tianon tianon requested a review from a team as a code owner June 23, 2025 21:33
@github-actions
Copy link

Diff for e1573aa:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7d24c29..7844ae0 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,12 +3,12 @@ GitRepo: https://github.com/docker-library/drupal.git
 
 Tags: 10.4.8-php8.3-apache-bookworm, 10.4-php8.3-apache-bookworm, 10.4.8-php8.3-apache, 10.4-php8.3-apache, 10.4.8-php8.3, 10.4-php8.3, 10.4.8-apache-bookworm, 10.4-apache-bookworm, 10.4.8-apache, 10.4-apache, 10.4.8, 10.4
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 63c7afc822b8fda0cae483894af5fd495e698144
+GitCommit: e519db2680ed80385869df7c3f1f1953ac613640
 Directory: 10.4/php8.3/apache-bookworm
 
 Tags: 10.4.8-php8.3-apache-bullseye, 10.4-php8.3-apache-bullseye, 10.4.8-apache-bullseye, 10.4-apache-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 63c7afc822b8fda0cae483894af5fd495e698144
+GitCommit: e519db2680ed80385869df7c3f1f1953ac613640
 Directory: 10.4/php8.3/apache-bullseye
 
 Tags: 10.4.8-php8.3-fpm-alpine3.21, 10.4-php8.3-fpm-alpine3.21, 10.4.8-fpm-alpine3.21, 10.4-fpm-alpine3.21
@@ -33,12 +33,12 @@ Directory: 10.4/php8.3/fpm-bullseye
 
 Tags: 10.4.8-php8.4-apache-bookworm, 10.4-php8.4-apache-bookworm, 10.4.8-php8.4-apache, 10.4-php8.4-apache, 10.4.8-php8.4, 10.4-php8.4
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 63c7afc822b8fda0cae483894af5fd495e698144
+GitCommit: e519db2680ed80385869df7c3f1f1953ac613640
 Directory: 10.4/php8.4/apache-bookworm
 
 Tags: 10.4.8-php8.4-apache-bullseye, 10.4-php8.4-apache-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 63c7afc822b8fda0cae483894af5fd495e698144
+GitCommit: e519db2680ed80385869df7c3f1f1953ac613640
 Directory: 10.4/php8.4/apache-bullseye
 
 Tags: 10.4.8-php8.4-fpm-alpine3.21, 10.4-php8.4-fpm-alpine3.21
@@ -63,12 +63,12 @@ Directory: 10.4/php8.4/fpm-bullseye
 
 Tags: 10.5.0-php8.3-apache-bookworm, 10.5-php8.3-apache-bookworm, 10-php8.3-apache-bookworm, 10.5.0-php8.3-apache, 10.5-php8.3-apache, 10-php8.3-apache, 10.5.0-php8.3, 10.5-php8.3, 10-php8.3
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: af2f38b80e7ce01570341323d166dba5785f7cc6
+GitCommit: e519db2680ed80385869df7c3f1f1953ac613640
 Directory: 10.5/php8.3/apache-bookworm
 
 Tags: 10.5.0-php8.3-apache-bullseye, 10.5-php8.3-apache-bullseye, 10-php8.3-apache-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: af2f38b80e7ce01570341323d166dba5785f7cc6
+GitCommit: e519db2680ed80385869df7c3f1f1953ac613640
 Directory: 10.5/php8.3/apache-bullseye
 
 Tags: 10.5.0-php8.3-fpm-alpine3.21, 10.5-php8.3-fpm-alpine3.21, 10-php8.3-fpm-alpine3.21
@@ -93,12 +93,12 @@ Directory: 10.5/php8.3/fpm-bullseye
 
 Tags: 10.5.0-php8.4-apache-bookworm, 10.5-php8.4-apache-bookworm, 10-php8.4-apache-bookworm, 10.5.0-php8.4-apache, 10.5-php8.4-apache, 10-php8.4-apache, 10.5.0-php8.4, 10.5-php8.4, 10-php8.4, 10.5.0-apache-bookworm, 10.5-apache-bookworm, 10-apache-bookworm, 10.5.0-apache, 10.5-apache, 10-apache, 10.5.0, 10.5, 10
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: af2f38b80e7ce01570341323d166dba5785f7cc6
+GitCommit: e519db2680ed80385869df7c3f1f1953ac613640
 Directory: 10.5/php8.4/apache-bookworm
 
 Tags: 10.5.0-php8.4-apache-bullseye, 10.5-php8.4-apache-bullseye, 10-php8.4-apache-bullseye, 10.5.0-apache-bullseye, 10.5-apache-bullseye, 10-apache-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: af2f38b80e7ce01570341323d166dba5785f7cc6
+GitCommit: e519db2680ed80385869df7c3f1f1953ac613640
 Directory: 10.5/php8.4/apache-bullseye
 
 Tags: 10.5.0-php8.4-fpm-alpine3.21, 10.5-php8.4-fpm-alpine3.21, 10-php8.4-fpm-alpine3.21, 10.5.0-fpm-alpine3.21, 10.5-fpm-alpine3.21, 10-fpm-alpine3.21
@@ -123,12 +123,12 @@ Directory: 10.5/php8.4/fpm-bullseye
 
 Tags: 11.1.8-php8.3-apache-bookworm, 11.1-php8.3-apache-bookworm, 11.1.8-php8.3-apache, 11.1-php8.3-apache, 11.1.8-php8.3, 11.1-php8.3, 11.1.8-apache-bookworm, 11.1-apache-bookworm, 11.1.8-apache, 11.1-apache, 11.1.8, 11.1
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: fc8bb8678a97dd7100c472b8d91ca80d8b898ebf
+GitCommit: e519db2680ed80385869df7c3f1f1953ac613640
 Directory: 11.1/php8.3/apache-bookworm
 
 Tags: 11.1.8-php8.3-apache-bullseye, 11.1-php8.3-apache-bullseye, 11.1.8-apache-bullseye, 11.1-apache-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: fc8bb8678a97dd7100c472b8d91ca80d8b898ebf
+GitCommit: e519db2680ed80385869df7c3f1f1953ac613640
 Directory: 11.1/php8.3/apache-bullseye
 
 Tags: 11.1.8-php8.3-fpm-alpine3.21, 11.1-php8.3-fpm-alpine3.21, 11.1.8-fpm-alpine3.21, 11.1-fpm-alpine3.21
@@ -153,12 +153,12 @@ Directory: 11.1/php8.3/fpm-bullseye
 
 Tags: 11.1.8-php8.4-apache-bookworm, 11.1-php8.4-apache-bookworm, 11.1.8-php8.4-apache, 11.1-php8.4-apache, 11.1.8-php8.4, 11.1-php8.4
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: fc8bb8678a97dd7100c472b8d91ca80d8b898ebf
+GitCommit: e519db2680ed80385869df7c3f1f1953ac613640
 Directory: 11.1/php8.4/apache-bookworm
 
 Tags: 11.1.8-php8.4-apache-bullseye, 11.1-php8.4-apache-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: fc8bb8678a97dd7100c472b8d91ca80d8b898ebf
+GitCommit: e519db2680ed80385869df7c3f1f1953ac613640
 Directory: 11.1/php8.4/apache-bullseye
 
 Tags: 11.1.8-php8.4-fpm-alpine3.21, 11.1-php8.4-fpm-alpine3.21
@@ -183,60 +183,60 @@ Directory: 11.1/php8.4/fpm-bullseye
 
 Tags: 11.2.0-php8.3-apache-bookworm, 11.2-php8.3-apache-bookworm, 11-php8.3-apache-bookworm, php8.3-apache-bookworm, 11.2.0-php8.3-apache, 11.2-php8.3-apache, 11-php8.3-apache, php8.3-apache, 11.2.0-php8.3, 11.2-php8.3, 11-php8.3, php8.3
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 3743e63f51c38309cf6b870c93517d66acbfcfd3
+GitCommit: 7eb8d68a4df0cd6315c107f5263fe791ebe31f72
 Directory: 11.2/php8.3/apache-bookworm
 
 Tags: 11.2.0-php8.3-apache-bullseye, 11.2-php8.3-apache-bullseye, 11-php8.3-apache-bullseye, php8.3-apache-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 3743e63f51c38309cf6b870c93517d66acbfcfd3
+GitCommit: 7eb8d68a4df0cd6315c107f5263fe791ebe31f72
 Directory: 11.2/php8.3/apache-bullseye
 
 Tags: 11.2.0-php8.3-fpm-alpine3.21, 11.2-php8.3-fpm-alpine3.21, 11-php8.3-fpm-alpine3.21, php8.3-fpm-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 3743e63f51c38309cf6b870c93517d66acbfcfd3
+GitCommit: 7eb8d68a4df0cd6315c107f5263fe791ebe31f72
 Directory: 11.2/php8.3/fpm-alpine3.21
 
 Tags: 11.2.0-php8.3-fpm-alpine3.22, 11.2-php8.3-fpm-alpine3.22, 11-php8.3-fpm-alpine3.22, php8.3-fpm-alpine3.22, 11.2.0-php8.3-fpm-alpine, 11.2-php8.3-fpm-alpine, 11-php8.3-fpm-alpine, php8.3-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 3743e63f51c38309cf6b870c93517d66acbfcfd3
+GitCommit: 7eb8d68a4df0cd6315c107f5263fe791ebe31f72
 Directory: 11.2/php8.3/fpm-alpine3.22
 
 Tags: 11.2.0-php8.3-fpm-bookworm, 11.2-php8.3-fpm-bookworm, 11-php8.3-fpm-bookworm, php8.3-fpm-bookworm, 11.2.0-php8.3-fpm, 11.2-php8.3-fpm, 11-php8.3-fpm, php8.3-fpm
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 3743e63f51c38309cf6b870c93517d66acbfcfd3
+GitCommit: 7eb8d68a4df0cd6315c107f5263fe791ebe31f72
 Directory: 11.2/php8.3/fpm-bookworm
 
 Tags: 11.2.0-php8.3-fpm-bullseye, 11.2-php8.3-fpm-bullseye, 11-php8.3-fpm-bullseye, php8.3-fpm-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 3743e63f51c38309cf6b870c93517d66acbfcfd3
+GitCommit: 7eb8d68a4df0cd6315c107f5263fe791ebe31f72
 Directory: 11.2/php8.3/fpm-bullseye
 
 Tags: 11.2.0-php8.4-apache-bookworm, 11.2-php8.4-apache-bookworm, 11-php8.4-apache-bookworm, php8.4-apache-bookworm, 11.2.0-php8.4-apache, 11.2-php8.4-apache, 11-php8.4-apache, php8.4-apache, 11.2.0-php8.4, 11.2-php8.4, 11-php8.4, php8.4, 11.2.0-apache-bookworm, 11.2-apache-bookworm, 11-apache-bookworm, apache-bookworm, 11.2.0-apache, 11.2-apache, 11-apache, apache, 11.2.0, 11.2, 11, latest
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 3743e63f51c38309cf6b870c93517d66acbfcfd3
+GitCommit: 7eb8d68a4df0cd6315c107f5263fe791ebe31f72
 Directory: 11.2/php8.4/apache-bookworm
 
 Tags: 11.2.0-php8.4-apache-bullseye, 11.2-php8.4-apache-bullseye, 11-php8.4-apache-bullseye, php8.4-apache-bullseye, 11.2.0-apache-bullseye, 11.2-apache-bullseye, 11-apache-bullseye, apache-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 3743e63f51c38309cf6b870c93517d66acbfcfd3
+GitCommit: 7eb8d68a4df0cd6315c107f5263fe791ebe31f72
 Directory: 11.2/php8.4/apache-bullseye
 
 Tags: 11.2.0-php8.4-fpm-alpine3.21, 11.2-php8.4-fpm-alpine3.21, 11-php8.4-fpm-alpine3.21, php8.4-fpm-alpine3.21, 11.2.0-fpm-alpine3.21, 11.2-fpm-alpine3.21, 11-fpm-alpine3.21, fpm-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 3743e63f51c38309cf6b870c93517d66acbfcfd3
+GitCommit: 7eb8d68a4df0cd6315c107f5263fe791ebe31f72
 Directory: 11.2/php8.4/fpm-alpine3.21
 
 Tags: 11.2.0-php8.4-fpm-alpine3.22, 11.2-php8.4-fpm-alpine3.22, 11-php8.4-fpm-alpine3.22, php8.4-fpm-alpine3.22, 11.2.0-php8.4-fpm-alpine, 11.2-php8.4-fpm-alpine, 11-php8.4-fpm-alpine, php8.4-fpm-alpine, 11.2.0-fpm-alpine3.22, 11.2-fpm-alpine3.22, 11-fpm-alpine3.22, fpm-alpine3.22, 11.2.0-fpm-alpine, 11.2-fpm-alpine, 11-fpm-alpine, fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 3743e63f51c38309cf6b870c93517d66acbfcfd3
+GitCommit: 7eb8d68a4df0cd6315c107f5263fe791ebe31f72
 Directory: 11.2/php8.4/fpm-alpine3.22
 
 Tags: 11.2.0-php8.4-fpm-bookworm, 11.2-php8.4-fpm-bookworm, 11-php8.4-fpm-bookworm, php8.4-fpm-bookworm, 11.2.0-php8.4-fpm, 11.2-php8.4-fpm, 11-php8.4-fpm, php8.4-fpm, 11.2.0-fpm-bookworm, 11.2-fpm-bookworm, 11-fpm-bookworm, fpm-bookworm, 11.2.0-fpm, 11.2-fpm, 11-fpm, fpm
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 3743e63f51c38309cf6b870c93517d66acbfcfd3
+GitCommit: 7eb8d68a4df0cd6315c107f5263fe791ebe31f72
 Directory: 11.2/php8.4/fpm-bookworm
 
 Tags: 11.2.0-php8.4-fpm-bullseye, 11.2-php8.4-fpm-bullseye, 11-php8.4-fpm-bullseye, php8.4-fpm-bullseye, 11.2.0-fpm-bullseye, 11.2-fpm-bullseye, 11-fpm-bullseye, fpm-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 3743e63f51c38309cf6b870c93517d66acbfcfd3
+GitCommit: 7eb8d68a4df0cd6315c107f5263fe791ebe31f72
 Directory: 11.2/php8.4/fpm-bullseye
diff --git a/drupal_10-apache-bullseye/Dockerfile b/drupal_10-apache-bullseye/Dockerfile
index 8e5ff28..97637a9 100644
--- a/drupal_10-apache-bullseye/Dockerfile
+++ b/drupal_10-apache-bullseye/Dockerfile
@@ -64,6 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
 # 2025-06-19: https://www.drupal.org/project/drupal/releases/10.5.0
diff --git a/drupal_10-php8.3-apache-bullseye/Dockerfile b/drupal_10-php8.3-apache-bullseye/Dockerfile
index 4560bba..37c37f9 100644
--- a/drupal_10-php8.3-apache-bullseye/Dockerfile
+++ b/drupal_10-php8.3-apache-bullseye/Dockerfile
@@ -64,6 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
 # 2025-06-19: https://www.drupal.org/project/drupal/releases/10.5.0
diff --git a/drupal_10-php8.3/Dockerfile b/drupal_10-php8.3/Dockerfile
index b708d7b..fb9b6ba 100644
--- a/drupal_10-php8.3/Dockerfile
+++ b/drupal_10-php8.3/Dockerfile
@@ -64,6 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
 # 2025-06-19: https://www.drupal.org/project/drupal/releases/10.5.0
diff --git a/drupal_10.4-apache-bullseye/Dockerfile b/drupal_10.4-apache-bullseye/Dockerfile
index b3b1f49..98c08d1 100644
--- a/drupal_10.4-apache-bullseye/Dockerfile
+++ b/drupal_10.4-apache-bullseye/Dockerfile
@@ -64,6 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
 # 2025-06-06: https://www.drupal.org/project/drupal/releases/10.4.8
diff --git a/drupal_10.4-php8.4-apache-bullseye/Dockerfile b/drupal_10.4-php8.4-apache-bullseye/Dockerfile
index 1ff0627..d5504ff 100644
--- a/drupal_10.4-php8.4-apache-bullseye/Dockerfile
+++ b/drupal_10.4-php8.4-apache-bullseye/Dockerfile
@@ -64,6 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
 # 2025-06-06: https://www.drupal.org/project/drupal/releases/10.4.8
diff --git a/drupal_10.4-php8.4/Dockerfile b/drupal_10.4-php8.4/Dockerfile
index 100034b..866c661 100644
--- a/drupal_10.4-php8.4/Dockerfile
+++ b/drupal_10.4-php8.4/Dockerfile
@@ -64,6 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
 # 2025-06-06: https://www.drupal.org/project/drupal/releases/10.4.8
diff --git a/drupal_10.4/Dockerfile b/drupal_10.4/Dockerfile
index 3866818..ddd7f7f 100644
--- a/drupal_10.4/Dockerfile
+++ b/drupal_10.4/Dockerfile
@@ -64,6 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
 # 2025-06-06: https://www.drupal.org/project/drupal/releases/10.4.8
diff --git a/drupal_10/Dockerfile b/drupal_10/Dockerfile
index 5eb0516..59bcb0d 100644
--- a/drupal_10/Dockerfile
+++ b/drupal_10/Dockerfile
@@ -64,6 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
 # 2025-06-19: https://www.drupal.org/project/drupal/releases/10.5.0
diff --git a/drupal_11.1-apache-bullseye/Dockerfile b/drupal_11.1-apache-bullseye/Dockerfile
index 594d6d6..ea625fd 100644
--- a/drupal_11.1-apache-bullseye/Dockerfile
+++ b/drupal_11.1-apache-bullseye/Dockerfile
@@ -64,6 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
 # 2025-06-05: https://www.drupal.org/project/drupal/releases/11.1.8
diff --git a/drupal_11.1-php8.4-apache-bullseye/Dockerfile b/drupal_11.1-php8.4-apache-bullseye/Dockerfile
index 4e1e3c3..0c6f3ab 100644
--- a/drupal_11.1-php8.4-apache-bullseye/Dockerfile
+++ b/drupal_11.1-php8.4-apache-bullseye/Dockerfile
@@ -64,6 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
 # 2025-06-05: https://www.drupal.org/project/drupal/releases/11.1.8
diff --git a/drupal_11.1-php8.4/Dockerfile b/drupal_11.1-php8.4/Dockerfile
index 87111f8..b6f8ca9 100644
--- a/drupal_11.1-php8.4/Dockerfile
+++ b/drupal_11.1-php8.4/Dockerfile
@@ -64,6 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
 # 2025-06-05: https://www.drupal.org/project/drupal/releases/11.1.8
diff --git a/drupal_11.1/Dockerfile b/drupal_11.1/Dockerfile
index 15b9be0..790297e 100644
--- a/drupal_11.1/Dockerfile
+++ b/drupal_11.1/Dockerfile
@@ -64,6 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
 # 2025-06-05: https://www.drupal.org/project/drupal/releases/11.1.8
diff --git a/drupal_apache-bullseye/Dockerfile b/drupal_apache-bullseye/Dockerfile
index 65a6f09..ad3122f 100644
--- a/drupal_apache-bullseye/Dockerfile
+++ b/drupal_apache-bullseye/Dockerfile
@@ -64,9 +64,16 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0
+# 2025-06-23: https://www.drupal.org/project/drupal/releases/11.2.0
 ENV DRUPAL_VERSION 11.2.0
 
 # https://github.com/docker-library/drupal/pull/259
diff --git a/drupal_fpm-alpine/Dockerfile b/drupal_fpm-alpine/Dockerfile
index d01252f..ba7d6d7 100644
--- a/drupal_fpm-alpine/Dockerfile
+++ b/drupal_fpm-alpine/Dockerfile
@@ -55,7 +55,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0
+# 2025-06-23: https://www.drupal.org/project/drupal/releases/11.2.0
 ENV DRUPAL_VERSION 11.2.0
 
 # https://github.com/docker-library/drupal/pull/259
diff --git a/drupal_fpm-alpine3.21/Dockerfile b/drupal_fpm-alpine3.21/Dockerfile
index af040ca..ad9c3c1 100644
--- a/drupal_fpm-alpine3.21/Dockerfile
+++ b/drupal_fpm-alpine3.21/Dockerfile
@@ -55,7 +55,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0
+# 2025-06-23: https://www.drupal.org/project/drupal/releases/11.2.0
 ENV DRUPAL_VERSION 11.2.0
 
 # https://github.com/docker-library/drupal/pull/259
diff --git a/drupal_fpm-bullseye/Dockerfile b/drupal_fpm-bullseye/Dockerfile
index 24028c7..d92f341 100644
--- a/drupal_fpm-bullseye/Dockerfile
+++ b/drupal_fpm-bullseye/Dockerfile
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0
+# 2025-06-23: https://www.drupal.org/project/drupal/releases/11.2.0
 ENV DRUPAL_VERSION 11.2.0
 
 # https://github.com/docker-library/drupal/pull/259
diff --git a/drupal_fpm/Dockerfile b/drupal_fpm/Dockerfile
index 2186fab..d95519c 100644
--- a/drupal_fpm/Dockerfile
+++ b/drupal_fpm/Dockerfile
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0
+# 2025-06-23: https://www.drupal.org/project/drupal/releases/11.2.0
 ENV DRUPAL_VERSION 11.2.0
 
 # https://github.com/docker-library/drupal/pull/259
diff --git a/drupal_latest/Dockerfile b/drupal_latest/Dockerfile
index 4f9b422..f8f0037 100644
--- a/drupal_latest/Dockerfile
+++ b/drupal_latest/Dockerfile
@@ -64,9 +64,16 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0
+# 2025-06-23: https://www.drupal.org/project/drupal/releases/11.2.0
 ENV DRUPAL_VERSION 11.2.0
 
 # https://github.com/docker-library/drupal/pull/259
diff --git a/drupal_php8.3-apache-bullseye/Dockerfile b/drupal_php8.3-apache-bullseye/Dockerfile
index 9d887fb..e700ba4 100644
--- a/drupal_php8.3-apache-bullseye/Dockerfile
+++ b/drupal_php8.3-apache-bullseye/Dockerfile
@@ -64,9 +64,16 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0
+# 2025-06-23: https://www.drupal.org/project/drupal/releases/11.2.0
 ENV DRUPAL_VERSION 11.2.0
 
 # https://github.com/docker-library/drupal/pull/259
diff --git a/drupal_php8.3-fpm-alpine/Dockerfile b/drupal_php8.3-fpm-alpine/Dockerfile
index ac37579..409c10e 100644
--- a/drupal_php8.3-fpm-alpine/Dockerfile
+++ b/drupal_php8.3-fpm-alpine/Dockerfile
@@ -55,7 +55,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0
+# 2025-06-23: https://www.drupal.org/project/drupal/releases/11.2.0
 ENV DRUPAL_VERSION 11.2.0
 
 # https://github.com/docker-library/drupal/pull/259
diff --git a/drupal_php8.3-fpm-alpine3.21/Dockerfile b/drupal_php8.3-fpm-alpine3.21/Dockerfile
index 959029a..23c9ac4 100644
--- a/drupal_php8.3-fpm-alpine3.21/Dockerfile
+++ b/drupal_php8.3-fpm-alpine3.21/Dockerfile
@@ -55,7 +55,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0
+# 2025-06-23: https://www.drupal.org/project/drupal/releases/11.2.0
 ENV DRUPAL_VERSION 11.2.0
 
 # https://github.com/docker-library/drupal/pull/259
diff --git a/drupal_php8.3-fpm-bullseye/Dockerfile b/drupal_php8.3-fpm-bullseye/Dockerfile
index e14f06a..98d7140 100644
--- a/drupal_php8.3-fpm-bullseye/Dockerfile
+++ b/drupal_php8.3-fpm-bullseye/Dockerfile
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0
+# 2025-06-23: https://www.drupal.org/project/drupal/releases/11.2.0
 ENV DRUPAL_VERSION 11.2.0
 
 # https://github.com/docker-library/drupal/pull/259
diff --git a/drupal_php8.3-fpm/Dockerfile b/drupal_php8.3-fpm/Dockerfile
index 963f5f0..86fc5c4 100644
--- a/drupal_php8.3-fpm/Dockerfile
+++ b/drupal_php8.3-fpm/Dockerfile
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0
+# 2025-06-23: https://www.drupal.org/project/drupal/releases/11.2.0
 ENV DRUPAL_VERSION 11.2.0
 
 # https://github.com/docker-library/drupal/pull/259
diff --git a/drupal_php8.3/Dockerfile b/drupal_php8.3/Dockerfile
index 34083c7..117ab2f 100644
--- a/drupal_php8.3/Dockerfile
+++ b/drupal_php8.3/Dockerfile
@@ -64,9 +64,16 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0
+# 2025-06-23: https://www.drupal.org/project/drupal/releases/11.2.0
 ENV DRUPAL_VERSION 11.2.0
 
 # https://github.com/docker-library/drupal/pull/259

Relevant Maintainers:

@yosifkit yosifkit merged commit 9e07193 into docker-library:master Jun 23, 2025
53 checks passed
@yosifkit yosifkit deleted the drupal branch June 23, 2025 22:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants