Update drupal #15824
Merged
Update drupal #15824
Conversation
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
This comment has been minimized.
This comment has been minimized.
Changes: - docker-library/drupal@927f080: Merge pull request docker-library/drupal#252 from infosiftr/eol-and-new - docker-library/drupal@9df694c: Add 10.2-rc - docker-library/drupal@decc26f: Drop eol 9 series - docker-library/drupal@ee9db81: Merge pull request docker-library/drupal#247 from jonathanthiry/patch-1 - docker-library/drupal@02cf2c3: Enable Apache mod_expires - docker-library/drupal@b2ba48a: Merge pull request docker-library/drupal#250 from infosiftr/php8.0-eol - docker-library/drupal@7d8447c: Remove php8.0 variants as it has reached end of life
docker-library-bot
force-pushed
the
drupal
branch
from
609aa93 to
dad1472
Compare
Diff for dad1472:diff --git a/_bashbrew-cat b/_bashbrew-cat
index e0f4b97..c26ba11 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,69 +1,44 @@
Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/drupal.git
-Tags: 7.98-php8.0-apache-bullseye, 7-php8.0-apache-bullseye, 7.98-apache-bullseye, 7-apache-bullseye
+Tags: 7.98-php8.1-apache-bookworm, 7-php8.1-apache-bookworm, 7.98-php8.1-apache, 7-php8.1-apache, 7.98-php8.1, 7-php8.1, 7.98-apache-bookworm, 7-apache-bookworm, 7.98-apache, 7-apache, 7.98, 7
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
-Directory: 7/php8.0/apache-bullseye
-
-Tags: 7.98-php8.0-apache-buster, 7-php8.0-apache-buster, 7.98-apache-buster, 7-apache-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
-Directory: 7/php8.0/apache-buster
-
-Tags: 7.98-php8.0-fpm-alpine3.16, 7-php8.0-fpm-alpine3.16, 7.98-fpm-alpine3.16, 7-fpm-alpine3.16
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: ebd9f36e6468515c9e5d469651ffb244094770b7
-Directory: 7/php8.0/fpm-alpine3.16
-
-Tags: 7.98-php8.0-fpm-bullseye, 7-php8.0-fpm-bullseye, 7.98-fpm-bullseye, 7-fpm-bullseye
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
-Directory: 7/php8.0/fpm-bullseye
-
-Tags: 7.98-php8.0-fpm-buster, 7-php8.0-fpm-buster, 7.98-fpm-buster, 7-fpm-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
-Directory: 7/php8.0/fpm-buster
-
-Tags: 7.98-php8.1-apache-bookworm, 7-php8.1-apache-bookworm, 7.98-php8.1-apache, 7-php8.1-apache, 7.98-php8.1, 7-php8.1
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 7/php8.1/apache-bookworm
-Tags: 7.98-php8.1-apache-bullseye, 7-php8.1-apache-bullseye
+Tags: 7.98-php8.1-apache-bullseye, 7-php8.1-apache-bullseye, 7.98-apache-bullseye, 7-apache-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 7/php8.1/apache-bullseye
-Tags: 7.98-php8.1-fpm-alpine3.17, 7-php8.1-fpm-alpine3.17
+Tags: 7.98-php8.1-fpm-alpine3.17, 7-php8.1-fpm-alpine3.17, 7.98-fpm-alpine3.17, 7-fpm-alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
Directory: 7/php8.1/fpm-alpine3.17
-Tags: 7.98-php8.1-fpm-alpine3.18, 7-php8.1-fpm-alpine3.18, 7.98-php8.1-fpm-alpine, 7-php8.1-fpm-alpine
+Tags: 7.98-php8.1-fpm-alpine3.18, 7-php8.1-fpm-alpine3.18, 7.98-php8.1-fpm-alpine, 7-php8.1-fpm-alpine, 7.98-fpm-alpine3.18, 7-fpm-alpine3.18, 7.98-fpm-alpine, 7-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
Directory: 7/php8.1/fpm-alpine3.18
-Tags: 7.98-php8.1-fpm-bookworm, 7-php8.1-fpm-bookworm, 7.98-php8.1-fpm, 7-php8.1-fpm
+Tags: 7.98-php8.1-fpm-bookworm, 7-php8.1-fpm-bookworm, 7.98-php8.1-fpm, 7-php8.1-fpm, 7.98-fpm-bookworm, 7-fpm-bookworm, 7.98-fpm, 7-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 7/php8.1/fpm-bookworm
-Tags: 7.98-php8.1-fpm-bullseye, 7-php8.1-fpm-bullseye
+Tags: 7.98-php8.1-fpm-bullseye, 7-php8.1-fpm-bullseye, 7.98-fpm-bullseye, 7-fpm-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 7/php8.1/fpm-bullseye
Tags: 7.98-php8.2-apache-bookworm, 7-php8.2-apache-bookworm, 7.98-php8.2-apache, 7-php8.2-apache, 7.98-php8.2, 7-php8.2
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 7/php8.2/apache-bookworm
Tags: 7.98-php8.2-apache-bullseye, 7-php8.2-apache-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 7/php8.2/apache-bullseye
Tags: 7.98-php8.2-fpm-alpine3.17, 7-php8.2-fpm-alpine3.17
@@ -78,107 +53,22 @@ Directory: 7/php8.2/fpm-alpine3.18
Tags: 7.98-php8.2-fpm-bookworm, 7-php8.2-fpm-bookworm, 7.98-php8.2-fpm, 7-php8.2-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 7/php8.2/fpm-bookworm
Tags: 7.98-php8.2-fpm-bullseye, 7-php8.2-fpm-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 7/php8.2/fpm-bullseye
-Tags: 9.5.11-php8.0-apache-bullseye, 9.5-php8.0-apache-bullseye, 9-php8.0-apache-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.0/apache-bullseye
-
-Tags: 9.5.11-php8.0-apache-buster, 9.5-php8.0-apache-buster, 9-php8.0-apache-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.0/apache-buster
-
-Tags: 9.5.11-php8.0-fpm-alpine3.16, 9.5-php8.0-fpm-alpine3.16, 9-php8.0-fpm-alpine3.16
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.0/fpm-alpine3.16
-
-Tags: 9.5.11-php8.0-fpm-bullseye, 9.5-php8.0-fpm-bullseye, 9-php8.0-fpm-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.0/fpm-bullseye
-
-Tags: 9.5.11-php8.0-fpm-buster, 9.5-php8.0-fpm-buster, 9-php8.0-fpm-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.0/fpm-buster
-
-Tags: 9.5.11-php8.1-apache-bookworm, 9.5-php8.1-apache-bookworm, 9-php8.1-apache-bookworm, 9.5.11-php8.1-apache, 9.5-php8.1-apache, 9-php8.1-apache, 9.5.11-php8.1, 9.5-php8.1, 9-php8.1, 9.5.11-apache-bookworm, 9.5-apache-bookworm, 9-apache-bookworm, 9.5.11-apache, 9.5-apache, 9-apache, 9.5.11, 9.5, 9
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.1/apache-bookworm
-
-Tags: 9.5.11-php8.1-apache-bullseye, 9.5-php8.1-apache-bullseye, 9-php8.1-apache-bullseye, 9.5.11-apache-bullseye, 9.5-apache-bullseye, 9-apache-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.1/apache-bullseye
-
-Tags: 9.5.11-php8.1-fpm-alpine3.17, 9.5-php8.1-fpm-alpine3.17, 9-php8.1-fpm-alpine3.17, 9.5.11-fpm-alpine3.17, 9.5-fpm-alpine3.17, 9-fpm-alpine3.17
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.1/fpm-alpine3.17
-
-Tags: 9.5.11-php8.1-fpm-alpine3.18, 9.5-php8.1-fpm-alpine3.18, 9-php8.1-fpm-alpine3.18, 9.5.11-php8.1-fpm-alpine, 9.5-php8.1-fpm-alpine, 9-php8.1-fpm-alpine, 9.5.11-fpm-alpine3.18, 9.5-fpm-alpine3.18, 9-fpm-alpine3.18, 9.5.11-fpm-alpine, 9.5-fpm-alpine, 9-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.1/fpm-alpine3.18
-
-Tags: 9.5.11-php8.1-fpm-bookworm, 9.5-php8.1-fpm-bookworm, 9-php8.1-fpm-bookworm, 9.5.11-php8.1-fpm, 9.5-php8.1-fpm, 9-php8.1-fpm, 9.5.11-fpm-bookworm, 9.5-fpm-bookworm, 9-fpm-bookworm, 9.5.11-fpm, 9.5-fpm, 9-fpm
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.1/fpm-bookworm
-
-Tags: 9.5.11-php8.1-fpm-bullseye, 9.5-php8.1-fpm-bullseye, 9-php8.1-fpm-bullseye, 9.5.11-fpm-bullseye, 9.5-fpm-bullseye, 9-fpm-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.1/fpm-bullseye
-
-Tags: 9.5.11-php8.2-apache-bookworm, 9.5-php8.2-apache-bookworm, 9-php8.2-apache-bookworm, 9.5.11-php8.2-apache, 9.5-php8.2-apache, 9-php8.2-apache, 9.5.11-php8.2, 9.5-php8.2, 9-php8.2
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.2/apache-bookworm
-
-Tags: 9.5.11-php8.2-apache-bullseye, 9.5-php8.2-apache-bullseye, 9-php8.2-apache-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.2/apache-bullseye
-
-Tags: 9.5.11-php8.2-fpm-alpine3.17, 9.5-php8.2-fpm-alpine3.17, 9-php8.2-fpm-alpine3.17
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.2/fpm-alpine3.17
-
-Tags: 9.5.11-php8.2-fpm-alpine3.18, 9.5-php8.2-fpm-alpine3.18, 9-php8.2-fpm-alpine3.18, 9.5.11-php8.2-fpm-alpine, 9.5-php8.2-fpm-alpine, 9-php8.2-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.2/fpm-alpine3.18
-
-Tags: 9.5.11-php8.2-fpm-bookworm, 9.5-php8.2-fpm-bookworm, 9-php8.2-fpm-bookworm, 9.5.11-php8.2-fpm, 9.5-php8.2-fpm, 9-php8.2-fpm
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.2/fpm-bookworm
-
-Tags: 9.5.11-php8.2-fpm-bullseye, 9.5-php8.2-fpm-bullseye, 9-php8.2-fpm-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: addca2cc5377c9607cb441c37aecfebfc6554a11
-Directory: 9.5/php8.2/fpm-bullseye
-
Tags: 10.0.11-php8.1-apache-bookworm, 10.0-php8.1-apache-bookworm, 10.0.11-php8.1-apache, 10.0-php8.1-apache, 10.0.11-php8.1, 10.0-php8.1
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8c04f5ce4313f395be9c5d1c37841d17c121068e
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 10.0/php8.1/apache-bookworm
Tags: 10.0.11-php8.1-apache-bullseye, 10.0-php8.1-apache-bullseye
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8c04f5ce4313f395be9c5d1c37841d17c121068e
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 10.0/php8.1/apache-bullseye
Tags: 10.0.11-php8.1-fpm-alpine3.17, 10.0-php8.1-fpm-alpine3.17
@@ -193,22 +83,22 @@ Directory: 10.0/php8.1/fpm-alpine3.18
Tags: 10.0.11-php8.1-fpm-bookworm, 10.0-php8.1-fpm-bookworm, 10.0.11-php8.1-fpm, 10.0-php8.1-fpm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8c04f5ce4313f395be9c5d1c37841d17c121068e
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 10.0/php8.1/fpm-bookworm
Tags: 10.0.11-php8.1-fpm-bullseye, 10.0-php8.1-fpm-bullseye
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8c04f5ce4313f395be9c5d1c37841d17c121068e
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 10.0/php8.1/fpm-bullseye
Tags: 10.0.11-php8.2-apache-bookworm, 10.0-php8.2-apache-bookworm, 10.0.11-php8.2-apache, 10.0-php8.2-apache, 10.0.11-php8.2, 10.0-php8.2, 10.0.11-apache-bookworm, 10.0-apache-bookworm, 10.0.11-apache, 10.0-apache, 10.0.11, 10.0
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8c04f5ce4313f395be9c5d1c37841d17c121068e
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 10.0/php8.2/apache-bookworm
Tags: 10.0.11-php8.2-apache-bullseye, 10.0-php8.2-apache-bullseye, 10.0.11-apache-bullseye, 10.0-apache-bullseye
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8c04f5ce4313f395be9c5d1c37841d17c121068e
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 10.0/php8.2/apache-bullseye
Tags: 10.0.11-php8.2-fpm-alpine3.17, 10.0-php8.2-fpm-alpine3.17, 10.0.11-fpm-alpine3.17, 10.0-fpm-alpine3.17
@@ -223,22 +113,22 @@ Directory: 10.0/php8.2/fpm-alpine3.18
Tags: 10.0.11-php8.2-fpm-bookworm, 10.0-php8.2-fpm-bookworm, 10.0.11-php8.2-fpm, 10.0-php8.2-fpm, 10.0.11-fpm-bookworm, 10.0-fpm-bookworm, 10.0.11-fpm, 10.0-fpm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8c04f5ce4313f395be9c5d1c37841d17c121068e
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 10.0/php8.2/fpm-bookworm
Tags: 10.0.11-php8.2-fpm-bullseye, 10.0-php8.2-fpm-bullseye, 10.0.11-fpm-bullseye, 10.0-fpm-bullseye
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8c04f5ce4313f395be9c5d1c37841d17c121068e
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 10.0/php8.2/fpm-bullseye
Tags: 10.1.6-php8.1-apache-bookworm, 10.1-php8.1-apache-bookworm, 10-php8.1-apache-bookworm, php8.1-apache-bookworm, 10.1.6-php8.1-apache, 10.1-php8.1-apache, 10-php8.1-apache, php8.1-apache, 10.1.6-php8.1, 10.1-php8.1, 10-php8.1, php8.1
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 96f915e1503663db2bc6f7cff28774e62aeac4ca
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 10.1/php8.1/apache-bookworm
Tags: 10.1.6-php8.1-apache-bullseye, 10.1-php8.1-apache-bullseye, 10-php8.1-apache-bullseye, php8.1-apache-bullseye
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 96f915e1503663db2bc6f7cff28774e62aeac4ca
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 10.1/php8.1/apache-bullseye
Tags: 10.1.6-php8.1-fpm-alpine3.17, 10.1-php8.1-fpm-alpine3.17, 10-php8.1-fpm-alpine3.17, php8.1-fpm-alpine3.17
@@ -253,22 +143,22 @@ Directory: 10.1/php8.1/fpm-alpine3.18
Tags: 10.1.6-php8.1-fpm-bookworm, 10.1-php8.1-fpm-bookworm, 10-php8.1-fpm-bookworm, php8.1-fpm-bookworm, 10.1.6-php8.1-fpm, 10.1-php8.1-fpm, 10-php8.1-fpm, php8.1-fpm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 96f915e1503663db2bc6f7cff28774e62aeac4ca
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 10.1/php8.1/fpm-bookworm
Tags: 10.1.6-php8.1-fpm-bullseye, 10.1-php8.1-fpm-bullseye, 10-php8.1-fpm-bullseye, php8.1-fpm-bullseye
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 96f915e1503663db2bc6f7cff28774e62aeac4ca
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 10.1/php8.1/fpm-bullseye
Tags: 10.1.6-php8.2-apache-bookworm, 10.1-php8.2-apache-bookworm, 10-php8.2-apache-bookworm, php8.2-apache-bookworm, 10.1.6-php8.2-apache, 10.1-php8.2-apache, 10-php8.2-apache, php8.2-apache, 10.1.6-php8.2, 10.1-php8.2, 10-php8.2, php8.2, 10.1.6-apache-bookworm, 10.1-apache-bookworm, 10-apache-bookworm, apache-bookworm, 10.1.6-apache, 10.1-apache, 10-apache, apache, 10.1.6, 10.1, 10, latest
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 96f915e1503663db2bc6f7cff28774e62aeac4ca
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 10.1/php8.2/apache-bookworm
Tags: 10.1.6-php8.2-apache-bullseye, 10.1-php8.2-apache-bullseye, 10-php8.2-apache-bullseye, php8.2-apache-bullseye, 10.1.6-apache-bullseye, 10.1-apache-bullseye, 10-apache-bullseye, apache-bullseye
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 96f915e1503663db2bc6f7cff28774e62aeac4ca
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 10.1/php8.2/apache-bullseye
Tags: 10.1.6-php8.2-fpm-alpine3.17, 10.1-php8.2-fpm-alpine3.17, 10-php8.2-fpm-alpine3.17, php8.2-fpm-alpine3.17, 10.1.6-fpm-alpine3.17, 10.1-fpm-alpine3.17, 10-fpm-alpine3.17, fpm-alpine3.17
@@ -283,10 +173,70 @@ Directory: 10.1/php8.2/fpm-alpine3.18
Tags: 10.1.6-php8.2-fpm-bookworm, 10.1-php8.2-fpm-bookworm, 10-php8.2-fpm-bookworm, php8.2-fpm-bookworm, 10.1.6-php8.2-fpm, 10.1-php8.2-fpm, 10-php8.2-fpm, php8.2-fpm, 10.1.6-fpm-bookworm, 10.1-fpm-bookworm, 10-fpm-bookworm, fpm-bookworm, 10.1.6-fpm, 10.1-fpm, 10-fpm, fpm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 96f915e1503663db2bc6f7cff28774e62aeac4ca
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 10.1/php8.2/fpm-bookworm
Tags: 10.1.6-php8.2-fpm-bullseye, 10.1-php8.2-fpm-bullseye, 10-php8.2-fpm-bullseye, php8.2-fpm-bullseye, 10.1.6-fpm-bullseye, 10.1-fpm-bullseye, 10-fpm-bullseye, fpm-bullseye
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 96f915e1503663db2bc6f7cff28774e62aeac4ca
+GitCommit: 02cf2c3f47b50105c8e72711725ba5b5eb0b0620
Directory: 10.1/php8.2/fpm-bullseye
+
+Tags: 10.2.0-rc1-php8.2-apache-bookworm, 10.2-rc-php8.2-apache-bookworm, rc-php8.2-apache-bookworm, 10.2.0-rc1-php8.2-apache, 10.2-rc-php8.2-apache, rc-php8.2-apache, 10.2.0-rc1-php8.2, 10.2-rc-php8.2, rc-php8.2, 10.2.0-rc1-apache-bookworm, 10.2-rc-apache-bookworm, rc-apache-bookworm, 10.2.0-rc1-apache, 10.2-rc-apache, rc-apache, 10.2.0-rc1, 10.2-rc, rc
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 9df694cb38d4ed1e62cd3b5738f7e48bdf589ca8
+Directory: 10.2-rc/php8.2/apache-bookworm
+
+Tags: 10.2.0-rc1-php8.2-apache-bullseye, 10.2-rc-php8.2-apache-bullseye, rc-php8.2-apache-bullseye, 10.2.0-rc1-apache-bullseye, 10.2-rc-apache-bullseye, rc-apache-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 9df694cb38d4ed1e62cd3b5738f7e48bdf589ca8
+Directory: 10.2-rc/php8.2/apache-bullseye
+
+Tags: 10.2.0-rc1-php8.2-fpm-alpine3.17, 10.2-rc-php8.2-fpm-alpine3.17, rc-php8.2-fpm-alpine3.17, 10.2.0-rc1-fpm-alpine3.17, 10.2-rc-fpm-alpine3.17, rc-fpm-alpine3.17
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 9df694cb38d4ed1e62cd3b5738f7e48bdf589ca8
+Directory: 10.2-rc/php8.2/fpm-alpine3.17
+
+Tags: 10.2.0-rc1-php8.2-fpm-alpine3.18, 10.2-rc-php8.2-fpm-alpine3.18, rc-php8.2-fpm-alpine3.18, 10.2.0-rc1-php8.2-fpm-alpine, 10.2-rc-php8.2-fpm-alpine, rc-php8.2-fpm-alpine, 10.2.0-rc1-fpm-alpine3.18, 10.2-rc-fpm-alpine3.18, rc-fpm-alpine3.18, 10.2.0-rc1-fpm-alpine, 10.2-rc-fpm-alpine, rc-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 9df694cb38d4ed1e62cd3b5738f7e48bdf589ca8
+Directory: 10.2-rc/php8.2/fpm-alpine3.18
+
+Tags: 10.2.0-rc1-php8.2-fpm-bookworm, 10.2-rc-php8.2-fpm-bookworm, rc-php8.2-fpm-bookworm, 10.2.0-rc1-php8.2-fpm, 10.2-rc-php8.2-fpm, rc-php8.2-fpm, 10.2.0-rc1-fpm-bookworm, 10.2-rc-fpm-bookworm, rc-fpm-bookworm, 10.2.0-rc1-fpm, 10.2-rc-fpm, rc-fpm
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 9df694cb38d4ed1e62cd3b5738f7e48bdf589ca8
+Directory: 10.2-rc/php8.2/fpm-bookworm
+
+Tags: 10.2.0-rc1-php8.2-fpm-bullseye, 10.2-rc-php8.2-fpm-bullseye, rc-php8.2-fpm-bullseye, 10.2.0-rc1-fpm-bullseye, 10.2-rc-fpm-bullseye, rc-fpm-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 9df694cb38d4ed1e62cd3b5738f7e48bdf589ca8
+Directory: 10.2-rc/php8.2/fpm-bullseye
+
+Tags: 10.2.0-rc1-php8.3-apache-bookworm, 10.2-rc-php8.3-apache-bookworm, rc-php8.3-apache-bookworm, 10.2.0-rc1-php8.3-apache, 10.2-rc-php8.3-apache, rc-php8.3-apache, 10.2.0-rc1-php8.3, 10.2-rc-php8.3, rc-php8.3
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 9df694cb38d4ed1e62cd3b5738f7e48bdf589ca8
+Directory: 10.2-rc/php8.3/apache-bookworm
+
+Tags: 10.2.0-rc1-php8.3-apache-bullseye, 10.2-rc-php8.3-apache-bullseye, rc-php8.3-apache-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 9df694cb38d4ed1e62cd3b5738f7e48bdf589ca8
+Directory: 10.2-rc/php8.3/apache-bullseye
+
+Tags: 10.2.0-rc1-php8.3-fpm-alpine3.17, 10.2-rc-php8.3-fpm-alpine3.17, rc-php8.3-fpm-alpine3.17
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 9df694cb38d4ed1e62cd3b5738f7e48bdf589ca8
+Directory: 10.2-rc/php8.3/fpm-alpine3.17
+
+Tags: 10.2.0-rc1-php8.3-fpm-alpine3.18, 10.2-rc-php8.3-fpm-alpine3.18, rc-php8.3-fpm-alpine3.18, 10.2.0-rc1-php8.3-fpm-alpine, 10.2-rc-php8.3-fpm-alpine, rc-php8.3-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 9df694cb38d4ed1e62cd3b5738f7e48bdf589ca8
+Directory: 10.2-rc/php8.3/fpm-alpine3.18
+
+Tags: 10.2.0-rc1-php8.3-fpm-bookworm, 10.2-rc-php8.3-fpm-bookworm, rc-php8.3-fpm-bookworm, 10.2.0-rc1-php8.3-fpm, 10.2-rc-php8.3-fpm, rc-php8.3-fpm
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 9df694cb38d4ed1e62cd3b5738f7e48bdf589ca8
+Directory: 10.2-rc/php8.3/fpm-bookworm
+
+Tags: 10.2.0-rc1-php8.3-fpm-bullseye, 10.2-rc-php8.3-fpm-bullseye, rc-php8.3-fpm-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 9df694cb38d4ed1e62cd3b5738f7e48bdf589ca8
+Directory: 10.2-rc/php8.3/fpm-bullseye
diff --git a/_bashbrew-list b/_bashbrew-list
index 123201c..c0412cc 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,13 +1,13 @@
+drupal:7
+drupal:7-apache
+drupal:7-apache-bookworm
drupal:7-apache-bullseye
-drupal:7-apache-buster
-drupal:7-fpm-alpine3.16
+drupal:7-fpm
+drupal:7-fpm-alpine
+drupal:7-fpm-alpine3.17
+drupal:7-fpm-alpine3.18
+drupal:7-fpm-bookworm
drupal:7-fpm-bullseye
-drupal:7-fpm-buster
-drupal:7-php8.0-apache-bullseye
-drupal:7-php8.0-apache-buster
-drupal:7-php8.0-fpm-alpine3.16
-drupal:7-php8.0-fpm-bullseye
-drupal:7-php8.0-fpm-buster
drupal:7-php8.1
drupal:7-php8.1-apache
drupal:7-php8.1-apache-bookworm
@@ -28,16 +28,16 @@ drupal:7-php8.2-fpm-alpine3.17
drupal:7-php8.2-fpm-alpine3.18
drupal:7-php8.2-fpm-bookworm
drupal:7-php8.2-fpm-bullseye
+drupal:7.98
+drupal:7.98-apache
+drupal:7.98-apache-bookworm
drupal:7.98-apache-bullseye
-drupal:7.98-apache-buster
-drupal:7.98-fpm-alpine3.16
+drupal:7.98-fpm
+drupal:7.98-fpm-alpine
+drupal:7.98-fpm-alpine3.17
+drupal:7.98-fpm-alpine3.18
+drupal:7.98-fpm-bookworm
drupal:7.98-fpm-bullseye
-drupal:7.98-fpm-buster
-drupal:7.98-php8.0-apache-bullseye
-drupal:7.98-php8.0-apache-buster
-drupal:7.98-php8.0-fpm-alpine3.16
-drupal:7.98-php8.0-fpm-bullseye
-drupal:7.98-php8.0-fpm-buster
drupal:7.98-php8.1
drupal:7.98-php8.1-apache
drupal:7.98-php8.1-apache-bookworm
@@ -58,111 +58,6 @@ drupal:7.98-php8.2-fpm-alpine3.17
drupal:7.98-php8.2-fpm-alpine3.18
drupal:7.98-php8.2-fpm-bookworm
drupal:7.98-php8.2-fpm-bullseye
-drupal:9
-drupal:9-apache
-drupal:9-apache-bookworm
-drupal:9-apache-bullseye
-drupal:9-fpm
-drupal:9-fpm-alpine
-drupal:9-fpm-alpine3.17
-drupal:9-fpm-alpine3.18
-drupal:9-fpm-bookworm
-drupal:9-fpm-bullseye
-drupal:9-php8.0-apache-bullseye
-drupal:9-php8.0-apache-buster
-drupal:9-php8.0-fpm-alpine3.16
-drupal:9-php8.0-fpm-bullseye
-drupal:9-php8.0-fpm-buster
-drupal:9-php8.1
-drupal:9-php8.1-apache
-drupal:9-php8.1-apache-bookworm
-drupal:9-php8.1-apache-bullseye
-drupal:9-php8.1-fpm
-drupal:9-php8.1-fpm-alpine
-drupal:9-php8.1-fpm-alpine3.17
-drupal:9-php8.1-fpm-alpine3.18
-drupal:9-php8.1-fpm-bookworm
-drupal:9-php8.1-fpm-bullseye
-drupal:9-php8.2
-drupal:9-php8.2-apache
-drupal:9-php8.2-apache-bookworm
-drupal:9-php8.2-apache-bullseye
-drupal:9-php8.2-fpm
-drupal:9-php8.2-fpm-alpine
-drupal:9-php8.2-fpm-alpine3.17
-drupal:9-php8.2-fpm-alpine3.18
-drupal:9-php8.2-fpm-bookworm
-drupal:9-php8.2-fpm-bullseye
-drupal:9.5
-drupal:9.5-apache
-drupal:9.5-apache-bookworm
-drupal:9.5-apache-bullseye
-drupal:9.5-fpm
-drupal:9.5-fpm-alpine
-drupal:9.5-fpm-alpine3.17
-drupal:9.5-fpm-alpine3.18
-drupal:9.5-fpm-bookworm
-drupal:9.5-fpm-bullseye
-drupal:9.5-php8.0-apache-bullseye
-drupal:9.5-php8.0-apache-buster
-drupal:9.5-php8.0-fpm-alpine3.16
-drupal:9.5-php8.0-fpm-bullseye
-drupal:9.5-php8.0-fpm-buster
-drupal:9.5-php8.1
-drupal:9.5-php8.1-apache
-drupal:9.5-php8.1-apache-bookworm
-drupal:9.5-php8.1-apache-bullseye
-drupal:9.5-php8.1-fpm
-drupal:9.5-php8.1-fpm-alpine
-drupal:9.5-php8.1-fpm-alpine3.17
-drupal:9.5-php8.1-fpm-alpine3.18
-drupal:9.5-php8.1-fpm-bookworm
-drupal:9.5-php8.1-fpm-bullseye
-drupal:9.5-php8.2
-drupal:9.5-php8.2-apache
-drupal:9.5-php8.2-apache-bookworm
-drupal:9.5-php8.2-apache-bullseye
-drupal:9.5-php8.2-fpm
-drupal:9.5-php8.2-fpm-alpine
-drupal:9.5-php8.2-fpm-alpine3.17
-drupal:9.5-php8.2-fpm-alpine3.18
-drupal:9.5-php8.2-fpm-bookworm
-drupal:9.5-php8.2-fpm-bullseye
-drupal:9.5.11
-drupal:9.5.11-apache
-drupal:9.5.11-apache-bookworm
-drupal:9.5.11-apache-bullseye
-drupal:9.5.11-fpm
-drupal:9.5.11-fpm-alpine
-drupal:9.5.11-fpm-alpine3.17
-drupal:9.5.11-fpm-alpine3.18
-drupal:9.5.11-fpm-bookworm
-drupal:9.5.11-fpm-bullseye
-drupal:9.5.11-php8.0-apache-bullseye
-drupal:9.5.11-php8.0-apache-buster
-drupal:9.5.11-php8.0-fpm-alpine3.16
-drupal:9.5.11-php8.0-fpm-bullseye
-drupal:9.5.11-php8.0-fpm-buster
-drupal:9.5.11-php8.1
-drupal:9.5.11-php8.1-apache
-drupal:9.5.11-php8.1-apache-bookworm
-drupal:9.5.11-php8.1-apache-bullseye
-drupal:9.5.11-php8.1-fpm
-drupal:9.5.11-php8.1-fpm-alpine
-drupal:9.5.11-php8.1-fpm-alpine3.17
-drupal:9.5.11-php8.1-fpm-alpine3.18
-drupal:9.5.11-php8.1-fpm-bookworm
-drupal:9.5.11-php8.1-fpm-bullseye
-drupal:9.5.11-php8.2
-drupal:9.5.11-php8.2-apache
-drupal:9.5.11-php8.2-apache-bookworm
-drupal:9.5.11-php8.2-apache-bullseye
-drupal:9.5.11-php8.2-fpm
-drupal:9.5.11-php8.2-fpm-alpine
-drupal:9.5.11-php8.2-fpm-alpine3.17
-drupal:9.5.11-php8.2-fpm-alpine3.18
-drupal:9.5.11-php8.2-fpm-bookworm
-drupal:9.5.11-php8.2-fpm-bullseye
drupal:10
drupal:10-apache
drupal:10-apache-bookworm
@@ -313,6 +208,66 @@ drupal:10.1.6-php8.2-fpm-alpine3.17
drupal:10.1.6-php8.2-fpm-alpine3.18
drupal:10.1.6-php8.2-fpm-bookworm
drupal:10.1.6-php8.2-fpm-bullseye
+drupal:10.2-rc
+drupal:10.2-rc-apache
+drupal:10.2-rc-apache-bookworm
+drupal:10.2-rc-apache-bullseye
+drupal:10.2-rc-fpm
+drupal:10.2-rc-fpm-alpine
+drupal:10.2-rc-fpm-alpine3.17
+drupal:10.2-rc-fpm-alpine3.18
+drupal:10.2-rc-fpm-bookworm
+drupal:10.2-rc-fpm-bullseye
+drupal:10.2-rc-php8.2
+drupal:10.2-rc-php8.2-apache
+drupal:10.2-rc-php8.2-apache-bookworm
+drupal:10.2-rc-php8.2-apache-bullseye
+drupal:10.2-rc-php8.2-fpm
+drupal:10.2-rc-php8.2-fpm-alpine
+drupal:10.2-rc-php8.2-fpm-alpine3.17
+drupal:10.2-rc-php8.2-fpm-alpine3.18
+drupal:10.2-rc-php8.2-fpm-bookworm
+drupal:10.2-rc-php8.2-fpm-bullseye
+drupal:10.2-rc-php8.3
+drupal:10.2-rc-php8.3-apache
+drupal:10.2-rc-php8.3-apache-bookworm
+drupal:10.2-rc-php8.3-apache-bullseye
+drupal:10.2-rc-php8.3-fpm
+drupal:10.2-rc-php8.3-fpm-alpine
+drupal:10.2-rc-php8.3-fpm-alpine3.17
+drupal:10.2-rc-php8.3-fpm-alpine3.18
+drupal:10.2-rc-php8.3-fpm-bookworm
+drupal:10.2-rc-php8.3-fpm-bullseye
+drupal:10.2.0-rc1
+drupal:10.2.0-rc1-apache
+drupal:10.2.0-rc1-apache-bookworm
+drupal:10.2.0-rc1-apache-bullseye
+drupal:10.2.0-rc1-fpm
+drupal:10.2.0-rc1-fpm-alpine
+drupal:10.2.0-rc1-fpm-alpine3.17
+drupal:10.2.0-rc1-fpm-alpine3.18
+drupal:10.2.0-rc1-fpm-bookworm
+drupal:10.2.0-rc1-fpm-bullseye
+drupal:10.2.0-rc1-php8.2
+drupal:10.2.0-rc1-php8.2-apache
+drupal:10.2.0-rc1-php8.2-apache-bookworm
+drupal:10.2.0-rc1-php8.2-apache-bullseye
+drupal:10.2.0-rc1-php8.2-fpm
+drupal:10.2.0-rc1-php8.2-fpm-alpine
+drupal:10.2.0-rc1-php8.2-fpm-alpine3.17
+drupal:10.2.0-rc1-php8.2-fpm-alpine3.18
+drupal:10.2.0-rc1-php8.2-fpm-bookworm
+drupal:10.2.0-rc1-php8.2-fpm-bullseye
+drupal:10.2.0-rc1-php8.3
+drupal:10.2.0-rc1-php8.3-apache
+drupal:10.2.0-rc1-php8.3-apache-bookworm
+drupal:10.2.0-rc1-php8.3-apache-bullseye
+drupal:10.2.0-rc1-php8.3-fpm
+drupal:10.2.0-rc1-php8.3-fpm-alpine
+drupal:10.2.0-rc1-php8.3-fpm-alpine3.17
+drupal:10.2.0-rc1-php8.3-fpm-alpine3.18
+drupal:10.2.0-rc1-php8.3-fpm-bookworm
+drupal:10.2.0-rc1-php8.3-fpm-bullseye
drupal:apache
drupal:apache-bookworm
drupal:apache-bullseye
@@ -343,3 +298,33 @@ drupal:php8.2-fpm-alpine3.17
drupal:php8.2-fpm-alpine3.18
drupal:php8.2-fpm-bookworm
drupal:php8.2-fpm-bullseye
+drupal:rc
+drupal:rc-apache
+drupal:rc-apache-bookworm
+drupal:rc-apache-bullseye
+drupal:rc-fpm
+drupal:rc-fpm-alpine
+drupal:rc-fpm-alpine3.17
+drupal:rc-fpm-alpine3.18
+drupal:rc-fpm-bookworm
+drupal:rc-fpm-bullseye
+drupal:rc-php8.2
+drupal:rc-php8.2-apache
+drupal:rc-php8.2-apache-bookworm
+drupal:rc-php8.2-apache-bullseye
+drupal:rc-php8.2-fpm
+drupal:rc-php8.2-fpm-alpine
+drupal:rc-php8.2-fpm-alpine3.17
+drupal:rc-php8.2-fpm-alpine3.18
+drupal:rc-php8.2-fpm-bookworm
+drupal:rc-php8.2-fpm-bullseye
+drupal:rc-php8.3
+drupal:rc-php8.3-apache
+drupal:rc-php8.3-apache-bookworm
+drupal:rc-php8.3-apache-bullseye
+drupal:rc-php8.3-fpm
+drupal:rc-php8.3-fpm-alpine
+drupal:rc-php8.3-fpm-alpine3.17
+drupal:rc-php8.3-fpm-alpine3.18
+drupal:rc-php8.3-fpm-bookworm
+drupal:rc-php8.3-fpm-bullseye
diff --git a/drupal_10.0-apache-bullseye/Dockerfile b/drupal_10.0-apache-bullseye/Dockerfile
index 436c6f9..b505ffa 100644
--- a/drupal_10.0-apache-bullseye/Dockerfile
+++ b/drupal_10.0-apache-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-apache-bullseye
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_10.0-fpm-bullseye/Dockerfile b/drupal_10.0-fpm-bullseye/Dockerfile
index 69da7ae..b4e68c1 100644
--- a/drupal_10.0-fpm-bullseye/Dockerfile
+++ b/drupal_10.0-fpm-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-fpm-bullseye
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_10.0-fpm/Dockerfile b/drupal_10.0-fpm/Dockerfile
index dbd587d..7a8cc3c 100644
--- a/drupal_10.0-fpm/Dockerfile
+++ b/drupal_10.0-fpm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-fpm-bookworm
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_10.0-php8.1-apache-bullseye/Dockerfile b/drupal_10.0-php8.1-apache-bullseye/Dockerfile
index 93ea22f..042138b 100644
--- a/drupal_10.0-php8.1-apache-bullseye/Dockerfile
+++ b/drupal_10.0-php8.1-apache-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-apache-bullseye
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_10.0-php8.1-fpm-bullseye/Dockerfile b/drupal_10.0-php8.1-fpm-bullseye/Dockerfile
index fd74472..f7cfc2d 100644
--- a/drupal_10.0-php8.1-fpm-bullseye/Dockerfile
+++ b/drupal_10.0-php8.1-fpm-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-fpm-bullseye
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_10.0-php8.1-fpm/Dockerfile b/drupal_10.0-php8.1-fpm/Dockerfile
index e7f758c..dde8caf 100644
--- a/drupal_10.0-php8.1-fpm/Dockerfile
+++ b/drupal_10.0-php8.1-fpm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-fpm-bookworm
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_10.0-php8.1/Dockerfile b/drupal_10.0-php8.1/Dockerfile
index ef10e30..3c1ea03 100644
--- a/drupal_10.0-php8.1/Dockerfile
+++ b/drupal_10.0-php8.1/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-apache-bookworm
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_10.0/Dockerfile b/drupal_10.0/Dockerfile
index 33da995..f5fc06f 100644
--- a/drupal_10.0/Dockerfile
+++ b/drupal_10.0/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-apache-bookworm
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_7-apache-bullseye/Dockerfile b/drupal_7-apache-bullseye/Dockerfile
index b15d1b9..f164cfe 100644
--- a/drupal_7-apache-bullseye/Dockerfile
+++ b/drupal_7-apache-bullseye/Dockerfile
@@ -5,13 +5,14 @@
#
# from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-apache-bullseye
+FROM php:8.1-apache-bullseye
# install the PHP extensions we need
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_7-apache-buster/Dockerfile b/drupal_7-apache-buster/Dockerfile
deleted file mode 100644
index eebd123..0000000
diff --git a/drupal_7-php8.1-fpm-alpine/Dockerfile b/drupal_7-fpm-alpine/Dockerfile
similarity index 100%
rename from drupal_7-php8.1-fpm-alpine/Dockerfile
rename to drupal_7-fpm-alpine/Dockerfile
diff --git a/drupal_7-fpm-alpine3.16/Dockerfile b/drupal_7-fpm-alpine3.16/Dockerfile
deleted file mode 100644
index 017c515..0000000
diff --git a/drupal_7-php8.1-fpm-alpine3.17/Dockerfile b/drupal_7-fpm-alpine3.17/Dockerfile
similarity index 100%
rename from drupal_7-php8.1-fpm-alpine3.17/Dockerfile
rename to drupal_7-fpm-alpine3.17/Dockerfile
diff --git a/drupal_7-fpm-bullseye/Dockerfile b/drupal_7-fpm-bullseye/Dockerfile
index 1ba214e..edab3ec 100644
--- a/drupal_7-fpm-bullseye/Dockerfile
+++ b/drupal_7-fpm-bullseye/Dockerfile
@@ -5,13 +5,14 @@
#
# from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-fpm-bullseye
+FROM php:8.1-fpm-bullseye
# install the PHP extensions we need
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_7-fpm-buster/Dockerfile b/drupal_7-fpm-buster/Dockerfile
deleted file mode 100644
index d898a39..0000000
diff --git a/drupal_7-php8.1-fpm/Dockerfile b/drupal_7-fpm/Dockerfile
similarity index 92%
rename from drupal_7-php8.1-fpm/Dockerfile
rename to drupal_7-fpm/Dockerfile
index e6e43b6..51158da 100644
--- a/drupal_7-php8.1-fpm/Dockerfile
+++ b/drupal_7-fpm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-fpm-bookworm
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_7-php8.1-apache-bullseye/Dockerfile b/drupal_7-php8.1-apache-bullseye/Dockerfile
deleted file mode 100644
index 56dcae1..0000000
diff --git a/drupal_7-php8.1-fpm-bullseye/Dockerfile b/drupal_7-php8.1-fpm-bullseye/Dockerfile
deleted file mode 100644
index a16c2b3..0000000
diff --git a/drupal_7-php8.2-apache-bullseye/Dockerfile b/drupal_7-php8.2-apache-bullseye/Dockerfile
index eb28d43..70d6c93 100644
--- a/drupal_7-php8.2-apache-bullseye/Dockerfile
+++ b/drupal_7-php8.2-apache-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-apache-bullseye
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_7-php8.2-fpm-bullseye/Dockerfile b/drupal_7-php8.2-fpm-bullseye/Dockerfile
index 0e0d6e8..f7f1a24 100644
--- a/drupal_7-php8.2-fpm-bullseye/Dockerfile
+++ b/drupal_7-php8.2-fpm-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-fpm-bullseye
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_7-php8.2-fpm/Dockerfile b/drupal_7-php8.2-fpm/Dockerfile
index 1e14236..c8e11a7 100644
--- a/drupal_7-php8.2-fpm/Dockerfile
+++ b/drupal_7-php8.2-fpm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-fpm-bookworm
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_7-php8.2/Dockerfile b/drupal_7-php8.2/Dockerfile
index 1c28f88..4c5828c 100644
--- a/drupal_7-php8.2/Dockerfile
+++ b/drupal_7-php8.2/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-apache-bookworm
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_7-php8.1/Dockerfile b/drupal_7/Dockerfile
similarity index 92%
rename from drupal_7-php8.1/Dockerfile
rename to drupal_7/Dockerfile
index 2b68d2f..93cbf43 100644
--- a/drupal_7-php8.1/Dockerfile
+++ b/drupal_7/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-apache-bookworm
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_9-apache-bullseye/Dockerfile b/drupal_9-apache-bullseye/Dockerfile
deleted file mode 100644
index b2cd8e1..0000000
diff --git a/drupal_9-fpm-alpine/Dockerfile b/drupal_9-fpm-alpine/Dockerfile
deleted file mode 100644
index 41f076b..0000000
diff --git a/drupal_9-fpm-alpine3.17/Dockerfile b/drupal_9-fpm-alpine3.17/Dockerfile
deleted file mode 100644
index d7e8bf5..0000000
diff --git a/drupal_9-fpm-bullseye/Dockerfile b/drupal_9-fpm-bullseye/Dockerfile
deleted file mode 100644
index 941b895..0000000
diff --git a/drupal_9-fpm/Dockerfile b/drupal_9-fpm/Dockerfile
deleted file mode 100644
index 7ea389d..0000000
diff --git a/drupal_9-php8.0-apache-bullseye/Dockerfile b/drupal_9-php8.0-apache-bullseye/Dockerfile
deleted file mode 100644
index 65084e3..0000000
diff --git a/drupal_9-php8.0-apache-buster/Dockerfile b/drupal_9-php8.0-apache-buster/Dockerfile
deleted file mode 100644
index 6a0df03..0000000
diff --git a/drupal_9-php8.0-fpm-alpine3.16/Dockerfile b/drupal_9-php8.0-fpm-alpine3.16/Dockerfile
deleted file mode 100644
index 835caec..0000000
diff --git a/drupal_9-php8.0-fpm-bullseye/Dockerfile b/drupal_9-php8.0-fpm-bullseye/Dockerfile
deleted file mode 100644
index 653ea33..0000000
diff --git a/drupal_9-php8.0-fpm-buster/Dockerfile b/drupal_9-php8.0-fpm-buster/Dockerfile
deleted file mode 100644
index c270981..0000000
diff --git a/drupal_9/Dockerfile b/drupal_9/Dockerfile
deleted file mode 100644
index 7096b3e..0000000
diff --git a/drupal_apache-bullseye/Dockerfile b/drupal_apache-bullseye/Dockerfile
index 887b944..c2c243c 100644
--- a/drupal_apache-bullseye/Dockerfile
+++ b/drupal_apache-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-apache-bullseye
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_fpm-bullseye/Dockerfile b/drupal_fpm-bullseye/Dockerfile
index 8937db3..dfa2d83 100644
--- a/drupal_fpm-bullseye/Dockerfile
+++ b/drupal_fpm-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-fpm-bullseye
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_fpm/Dockerfile b/drupal_fpm/Dockerfile
index cc7ae38..e9b118b 100644
--- a/drupal_fpm/Dockerfile
+++ b/drupal_fpm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-fpm-bookworm
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_latest/Dockerfile b/drupal_latest/Dockerfile
index 2033035..695fb64 100644
--- a/drupal_latest/Dockerfile
+++ b/drupal_latest/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-apache-bookworm
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_php8.1-apache-bullseye/Dockerfile b/drupal_php8.1-apache-bullseye/Dockerfile
index d3e6c15..70c541a 100644
--- a/drupal_php8.1-apache-bullseye/Dockerfile
+++ b/drupal_php8.1-apache-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-apache-bullseye
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_php8.1-fpm-bullseye/Dockerfile b/drupal_php8.1-fpm-bullseye/Dockerfile
index bcb5c3d..f5dd855 100644
--- a/drupal_php8.1-fpm-bullseye/Dockerfile
+++ b/drupal_php8.1-fpm-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-fpm-bullseye
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_php8.1-fpm/Dockerfile b/drupal_php8.1-fpm/Dockerfile
index e87ee93..284b693 100644
--- a/drupal_php8.1-fpm/Dockerfile
+++ b/drupal_php8.1-fpm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-fpm-bookworm
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_php8.1/Dockerfile b/drupal_php8.1/Dockerfile
index a183b5d..93f096a 100644
--- a/drupal_php8.1/Dockerfile
+++ b/drupal_php8.1/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-apache-bookworm
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
diff --git a/drupal_9-php8.2-apache-bullseye/Dockerfile b/drupal_rc-apache-bullseye/Dockerfile
similarity index 91%
rename from drupal_9-php8.2-apache-bullseye/Dockerfile
rename to drupal_rc-apache-bullseye/Dockerfile
index be34a36..27d9afe 100644
--- a/drupal_9-php8.2-apache-bullseye/Dockerfile
+++ b/drupal_rc-apache-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-apache-bullseye
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
@@ -66,7 +67,7 @@ RUN { \
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 9.5.11
+ENV DRUPAL_VERSION 10.2.0-rc1
WORKDIR /opt/drupal
RUN set -eux; \
diff --git a/drupal_9-php8.2-fpm-alpine/Dockerfile b/drupal_rc-fpm-alpine/Dockerfile
similarity index 98%
rename from drupal_9-php8.2-fpm-alpine/Dockerfile
rename to drupal_rc-fpm-alpine/Dockerfile
index 4ec4c0c..337352c 100644
--- a/drupal_9-php8.2-fpm-alpine/Dockerfile
+++ b/drupal_rc-fpm-alpine/Dockerfile
@@ -56,7 +56,7 @@ RUN { \
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 9.5.11
+ENV DRUPAL_VERSION 10.2.0-rc1
WORKDIR /opt/drupal
RUN set -eux; \
diff --git a/drupal_9-php8.2-fpm-alpine3.17/Dockerfile b/drupal_rc-fpm-alpine3.17/Dockerfile
similarity index 98%
rename from drupal_9-php8.2-fpm-alpine3.17/Dockerfile
rename to drupal_rc-fpm-alpine3.17/Dockerfile
index 746e503..f8af340 100644
--- a/drupal_9-php8.2-fpm-alpine3.17/Dockerfile
+++ b/drupal_rc-fpm-alpine3.17/Dockerfile
@@ -56,7 +56,7 @@ RUN { \
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 9.5.11
+ENV DRUPAL_VERSION 10.2.0-rc1
WORKDIR /opt/drupal
RUN set -eux; \
diff --git a/drupal_9-php8.2-fpm-bullseye/Dockerfile b/drupal_rc-fpm-bullseye/Dockerfile
similarity index 91%
rename from drupal_9-php8.2-fpm-bullseye/Dockerfile
rename to drupal_rc-fpm-bullseye/Dockerfile
index 6c20ae2..7f8306c 100644
--- a/drupal_9-php8.2-fpm-bullseye/Dockerfile
+++ b/drupal_rc-fpm-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-fpm-bullseye
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
@@ -66,7 +67,7 @@ RUN { \
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 9.5.11
+ENV DRUPAL_VERSION 10.2.0-rc1
WORKDIR /opt/drupal
RUN set -eux; \
diff --git a/drupal_9-php8.2-fpm/Dockerfile b/drupal_rc-fpm/Dockerfile
similarity index 91%
rename from drupal_9-php8.2-fpm/Dockerfile
rename to drupal_rc-fpm/Dockerfile
index 725c0cc..1b68f78 100644
--- a/drupal_9-php8.2-fpm/Dockerfile
+++ b/drupal_rc-fpm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-fpm-bookworm
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
@@ -66,7 +67,7 @@ RUN { \
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 9.5.11
+ENV DRUPAL_VERSION 10.2.0-rc1
WORKDIR /opt/drupal
RUN set -eux; \
diff --git a/drupal_10.0-apache-bullseye/Dockerfile b/drupal_rc-php8.3-apache-bullseye/Dockerfile
similarity index 89%
copy from drupal_10.0-apache-bullseye/Dockerfile
copy to drupal_rc-php8.3-apache-bullseye/Dockerfile
index 436c6f9..e8f95f2 100644
--- a/drupal_10.0-apache-bullseye/Dockerfile
+++ b/drupal_rc-php8.3-apache-bullseye/Dockerfile
@@ -5,13 +5,14 @@
#
# from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.2-apache-bullseye
+FROM php:8.3-apache-bullseye
# install the PHP extensions we need
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
@@ -66,7 +67,7 @@ RUN { \
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.0.11
+ENV DRUPAL_VERSION 10.2.0-rc1
WORKDIR /opt/drupal
RUN set -eux; \
diff --git a/drupal_10.0-php8.1-fpm-alpine/Dockerfile b/drupal_rc-php8.3-fpm-alpine/Dockerfile
similarity index 96%
copy from drupal_10.0-php8.1-fpm-alpine/Dockerfile
copy to drupal_rc-php8.3-fpm-alpine/Dockerfile
index e453813..8ad8652 100644
--- a/drupal_10.0-php8.1-fpm-alpine/Dockerfile
+++ b/drupal_rc-php8.3-fpm-alpine/Dockerfile
@@ -5,7 +5,7 @@
#
# from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-fpm-alpine3.18
+FROM php:8.3-fpm-alpine3.18
# install the PHP extensions we need
RUN set -eux; \
@@ -56,7 +56,7 @@ RUN { \
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.0.11
+ENV DRUPAL_VERSION 10.2.0-rc1
WORKDIR /opt/drupal
RUN set -eux; \
diff --git a/drupal_10.0-php8.1-fpm-alpine/Dockerfile b/drupal_rc-php8.3-fpm-alpine3.17/Dockerfile
similarity index 96%
copy from drupal_10.0-php8.1-fpm-alpine/Dockerfile
copy to drupal_rc-php8.3-fpm-alpine3.17/Dockerfile
index e453813..beb5a50 100644
--- a/drupal_10.0-php8.1-fpm-alpine/Dockerfile
+++ b/drupal_rc-php8.3-fpm-alpine3.17/Dockerfile
@@ -5,7 +5,7 @@
#
# from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-fpm-alpine3.18
+FROM php:8.3-fpm-alpine3.17
# install the PHP extensions we need
RUN set -eux; \
@@ -56,7 +56,7 @@ RUN { \
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.0.11
+ENV DRUPAL_VERSION 10.2.0-rc1
WORKDIR /opt/drupal
RUN set -eux; \
diff --git a/drupal_10.0-apache-bullseye/Dockerfile b/drupal_rc-php8.3-fpm-bullseye/Dockerfile
similarity index 90%
copy from drupal_10.0-apache-bullseye/Dockerfile
copy to drupal_rc-php8.3-fpm-bullseye/Dockerfile
index 436c6f9..02ea684 100644
--- a/drupal_10.0-apache-bullseye/Dockerfile
+++ b/drupal_rc-php8.3-fpm-bullseye/Dockerfile
@@ -5,13 +5,14 @@
#
# from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.2-apache-bullseye
+FROM php:8.3-fpm-bullseye
# install the PHP extensions we need
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
@@ -66,7 +67,7 @@ RUN { \
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.0.11
+ENV DRUPAL_VERSION 10.2.0-rc1
WORKDIR /opt/drupal
RUN set -eux; \
diff --git a/drupal_10.0-apache-bullseye/Dockerfile b/drupal_rc-php8.3-fpm/Dockerfile
similarity index 90%
copy from drupal_10.0-apache-bullseye/Dockerfile
copy to drupal_rc-php8.3-fpm/Dockerfile
index 436c6f9..370c681 100644
--- a/drupal_10.0-apache-bullseye/Dockerfile
+++ b/drupal_rc-php8.3-fpm/Dockerfile
@@ -5,13 +5,14 @@
#
# from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.2-apache-bullseye
+FROM php:8.3-fpm-bookworm
# install the PHP extensions we need
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
@@ -66,7 +67,7 @@ RUN { \
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.0.11
+ENV DRUPAL_VERSION 10.2.0-rc1
WORKDIR /opt/drupal
RUN set -eux; \
diff --git a/drupal_10.0-apache-bullseye/Dockerfile b/drupal_rc-php8.3/Dockerfile
similarity index 89%
copy from drupal_10.0-apache-bullseye/Dockerfile
copy to drupal_rc-php8.3/Dockerfile
index 436c6f9..7ea0d7b 100644
--- a/drupal_10.0-apache-bullseye/Dockerfile
+++ b/drupal_rc-php8.3/Dockerfile
@@ -5,13 +5,14 @@
#
# from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.2-apache-bullseye
+FROM php:8.3-apache-bookworm
# install the PHP extensions we need
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
@@ -66,7 +67,7 @@ RUN { \
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.0.11
+ENV DRUPAL_VERSION 10.2.0-rc1
WORKDIR /opt/drupal
RUN set -eux; \
diff --git a/drupal_9-php8.2/Dockerfile b/drupal_rc/Dockerfile
similarity index 91%
rename from drupal_9-php8.2/Dockerfile
rename to drupal_rc/Dockerfile
index 55ed08a..7a7689a 100644
--- a/drupal_9-php8.2/Dockerfile
+++ b/drupal_rc/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-apache-bookworm
RUN set -eux; \
\
if command -v a2enmod; then \
- a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+ a2enmod expires rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
@@ -66,7 +67,7 @@ RUN { \
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 9.5.11
+ENV DRUPAL_VERSION 10.2.0-rc1
WORKDIR /opt/drupal
RUN set -eux; \Relevant Maintainers: |
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.
Changes: