Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Update drupal #14863

Merged
merged 1 commit into from
Jun 22, 2023
Merged

Update drupal #14863

merged 1 commit into from
Jun 22, 2023

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 14, 2023

Changes:

@github-actions

This comment has been minimized.

@yosifkit
Copy link
Member

Waiting for docker-library/drupal#242

Changes:

- docker-library/drupal@89c8a2c: Merge pull request docker-library/drupal#242 from infosiftr/oops-bookworm
- docker-library/drupal@d38c31a: Move default from bullseye to bookworm
- docker-library/drupal@4bb3921: Merge pull request docker-library/drupal#241 from infosiftr/bookworm
- docker-library/drupal@427357a: Add more PHP versions
- docker-library/drupal@4224e1a: Add Debian bookworm, drop buster
@github-actions
Copy link

Diff for 0a2add9:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index d6bebe7..ad3fca3 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,14 +1,14 @@
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 GitRepo: https://github.com/docker-library/drupal.git
 
-Tags: 7.98-php8.0-apache-bullseye, 7-php8.0-apache-bullseye, 7.98-php8.0-apache, 7-php8.0-apache, 7.98-php8.0, 7-php8.0, 7.98-apache-bullseye, 7-apache-bullseye, 7.98-apache, 7-apache, 7.98, 7
+Tags: 7.98-php8.0-apache-bullseye, 7-php8.0-apache-bullseye, 7.98-apache-bullseye, 7-apache-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ebd9f36e6468515c9e5d469651ffb244094770b7
+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: ebd9f36e6468515c9e5d469651ffb244094770b7
+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
@@ -16,24 +16,84 @@ 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-php8.0-fpm, 7-php8.0-fpm, 7.98-fpm-bullseye, 7-fpm-bullseye, 7.98-fpm, 7-fpm
+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: ebd9f36e6468515c9e5d469651ffb244094770b7
+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: ebd9f36e6468515c9e5d469651ffb244094770b7
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
 Directory: 7/php8.0/fpm-buster
 
-Tags: 9.4.15-php8.0-apache-bullseye, 9.4-php8.0-apache-bullseye, 9.4.15-php8.0-apache, 9.4-php8.0-apache, 9.4.15-php8.0, 9.4-php8.0
+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
+Directory: 7/php8.1/apache-bookworm
+
+Tags: 7.98-php8.1-apache-bullseye, 7-php8.1-apache-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+Directory: 7/php8.1/apache-bullseye
+
+Tags: 7.98-php8.1-fpm-alpine3.17, 7-php8.1-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
+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
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+Directory: 7/php8.1/fpm-bookworm
+
+Tags: 7.98-php8.1-fpm-bullseye, 7-php8.1-fpm-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+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
+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
+Directory: 7/php8.2/apache-bullseye
+
+Tags: 7.98-php8.2-fpm-alpine3.17, 7-php8.2-fpm-alpine3.17
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+Directory: 7/php8.2/fpm-alpine3.17
+
+Tags: 7.98-php8.2-fpm-alpine3.18, 7-php8.2-fpm-alpine3.18, 7.98-php8.2-fpm-alpine, 7-php8.2-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+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
+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
+Directory: 7/php8.2/fpm-bullseye
+
+Tags: 9.4.15-php8.0-apache-bullseye, 9.4-php8.0-apache-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0ff59ea0f3f7ec36e5728818dd7621676824aedb
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
 Directory: 9.4/php8.0/apache-bullseye
 
 Tags: 9.4.15-php8.0-apache-buster, 9.4-php8.0-apache-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 0ff59ea0f3f7ec36e5728818dd7621676824aedb
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
 Directory: 9.4/php8.0/apache-buster
 
 Tags: 9.4.15-php8.0-fpm-alpine3.16, 9.4-php8.0-fpm-alpine3.16
@@ -41,25 +101,25 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 0ff59ea0f3f7ec36e5728818dd7621676824aedb
 Directory: 9.4/php8.0/fpm-alpine3.16
 
-Tags: 9.4.15-php8.0-fpm-bullseye, 9.4-php8.0-fpm-bullseye, 9.4.15-php8.0-fpm, 9.4-php8.0-fpm
+Tags: 9.4.15-php8.0-fpm-bullseye, 9.4-php8.0-fpm-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0ff59ea0f3f7ec36e5728818dd7621676824aedb
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
 Directory: 9.4/php8.0/fpm-bullseye
 
 Tags: 9.4.15-php8.0-fpm-buster, 9.4-php8.0-fpm-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 0ff59ea0f3f7ec36e5728818dd7621676824aedb
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
 Directory: 9.4/php8.0/fpm-buster
 
-Tags: 9.4.15-php8.1-apache-bullseye, 9.4-php8.1-apache-bullseye, 9.4.15-php8.1-apache, 9.4-php8.1-apache, 9.4.15-php8.1, 9.4-php8.1, 9.4.15-apache-bullseye, 9.4-apache-bullseye, 9.4.15-apache, 9.4-apache, 9.4.15, 9.4
+Tags: 9.4.15-php8.1-apache-bookworm, 9.4-php8.1-apache-bookworm, 9.4.15-php8.1-apache, 9.4-php8.1-apache, 9.4.15-php8.1, 9.4-php8.1, 9.4.15-apache-bookworm, 9.4-apache-bookworm, 9.4.15-apache, 9.4-apache, 9.4.15, 9.4
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0ff59ea0f3f7ec36e5728818dd7621676824aedb
-Directory: 9.4/php8.1/apache-bullseye
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
+Directory: 9.4/php8.1/apache-bookworm
 
-Tags: 9.4.15-php8.1-apache-buster, 9.4-php8.1-apache-buster, 9.4.15-apache-buster, 9.4-apache-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 0ff59ea0f3f7ec36e5728818dd7621676824aedb
-Directory: 9.4/php8.1/apache-buster
+Tags: 9.4.15-php8.1-apache-bullseye, 9.4-php8.1-apache-bullseye, 9.4.15-apache-bullseye, 9.4-apache-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
+Directory: 9.4/php8.1/apache-bullseye
 
 Tags: 9.4.15-php8.1-fpm-alpine3.17, 9.4-php8.1-fpm-alpine3.17, 9.4.15-fpm-alpine3.17, 9.4-fpm-alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -71,24 +131,54 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 746a68f3e21d1775f23701011503ca98ac900721
 Directory: 9.4/php8.1/fpm-alpine3.18
 
-Tags: 9.4.15-php8.1-fpm-bullseye, 9.4-php8.1-fpm-bullseye, 9.4.15-php8.1-fpm, 9.4-php8.1-fpm, 9.4.15-fpm-bullseye, 9.4-fpm-bullseye, 9.4.15-fpm, 9.4-fpm
+Tags: 9.4.15-php8.1-fpm-bookworm, 9.4-php8.1-fpm-bookworm, 9.4.15-php8.1-fpm, 9.4-php8.1-fpm, 9.4.15-fpm-bookworm, 9.4-fpm-bookworm, 9.4.15-fpm, 9.4-fpm
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0ff59ea0f3f7ec36e5728818dd7621676824aedb
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
+Directory: 9.4/php8.1/fpm-bookworm
+
+Tags: 9.4.15-php8.1-fpm-bullseye, 9.4-php8.1-fpm-bullseye, 9.4.15-fpm-bullseye, 9.4-fpm-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
 Directory: 9.4/php8.1/fpm-bullseye
 
-Tags: 9.4.15-php8.1-fpm-buster, 9.4-php8.1-fpm-buster, 9.4.15-fpm-buster, 9.4-fpm-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 0ff59ea0f3f7ec36e5728818dd7621676824aedb
-Directory: 9.4/php8.1/fpm-buster
+Tags: 9.4.15-php8.2-apache-bookworm, 9.4-php8.2-apache-bookworm, 9.4.15-php8.2-apache, 9.4-php8.2-apache, 9.4.15-php8.2, 9.4-php8.2
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+Directory: 9.4/php8.2/apache-bookworm
 
-Tags: 9.5.9-php8.0-apache-bullseye, 9.5-php8.0-apache-bullseye, 9-php8.0-apache-bullseye, 9.5.9-php8.0-apache, 9.5-php8.0-apache, 9-php8.0-apache, 9.5.9-php8.0, 9.5-php8.0, 9-php8.0
+Tags: 9.4.15-php8.2-apache-bullseye, 9.4-php8.2-apache-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 23b02e8143858e0ed63e3f22bfa834f6d7263224
+GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+Directory: 9.4/php8.2/apache-bullseye
+
+Tags: 9.4.15-php8.2-fpm-alpine3.17, 9.4-php8.2-fpm-alpine3.17
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+Directory: 9.4/php8.2/fpm-alpine3.17
+
+Tags: 9.4.15-php8.2-fpm-alpine3.18, 9.4-php8.2-fpm-alpine3.18, 9.4.15-php8.2-fpm-alpine, 9.4-php8.2-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+Directory: 9.4/php8.2/fpm-alpine3.18
+
+Tags: 9.4.15-php8.2-fpm-bookworm, 9.4-php8.2-fpm-bookworm, 9.4.15-php8.2-fpm, 9.4-php8.2-fpm
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+Directory: 9.4/php8.2/fpm-bookworm
+
+Tags: 9.4.15-php8.2-fpm-bullseye, 9.4-php8.2-fpm-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+Directory: 9.4/php8.2/fpm-bullseye
+
+Tags: 9.5.9-php8.0-apache-bullseye, 9.5-php8.0-apache-bullseye, 9-php8.0-apache-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
 Directory: 9.5/php8.0/apache-bullseye
 
 Tags: 9.5.9-php8.0-apache-buster, 9.5-php8.0-apache-buster, 9-php8.0-apache-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 23b02e8143858e0ed63e3f22bfa834f6d7263224
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
 Directory: 9.5/php8.0/apache-buster
 
 Tags: 9.5.9-php8.0-fpm-alpine3.16, 9.5-php8.0-fpm-alpine3.16, 9-php8.0-fpm-alpine3.16
@@ -96,25 +186,25 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 23b02e8143858e0ed63e3f22bfa834f6d7263224
 Directory: 9.5/php8.0/fpm-alpine3.16
 
-Tags: 9.5.9-php8.0-fpm-bullseye, 9.5-php8.0-fpm-bullseye, 9-php8.0-fpm-bullseye, 9.5.9-php8.0-fpm, 9.5-php8.0-fpm, 9-php8.0-fpm
+Tags: 9.5.9-php8.0-fpm-bullseye, 9.5-php8.0-fpm-bullseye, 9-php8.0-fpm-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 23b02e8143858e0ed63e3f22bfa834f6d7263224
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
 Directory: 9.5/php8.0/fpm-bullseye
 
 Tags: 9.5.9-php8.0-fpm-buster, 9.5-php8.0-fpm-buster, 9-php8.0-fpm-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 23b02e8143858e0ed63e3f22bfa834f6d7263224
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
 Directory: 9.5/php8.0/fpm-buster
 
-Tags: 9.5.9-php8.1-apache-bullseye, 9.5-php8.1-apache-bullseye, 9-php8.1-apache-bullseye, 9.5.9-php8.1-apache, 9.5-php8.1-apache, 9-php8.1-apache, 9.5.9-php8.1, 9.5-php8.1, 9-php8.1, 9.5.9-apache-bullseye, 9.5-apache-bullseye, 9-apache-bullseye, 9.5.9-apache, 9.5-apache, 9-apache, 9.5.9, 9.5, 9
+Tags: 9.5.9-php8.1-apache-bookworm, 9.5-php8.1-apache-bookworm, 9-php8.1-apache-bookworm, 9.5.9-php8.1-apache, 9.5-php8.1-apache, 9-php8.1-apache, 9.5.9-php8.1, 9.5-php8.1, 9-php8.1, 9.5.9-apache-bookworm, 9.5-apache-bookworm, 9-apache-bookworm, 9.5.9-apache, 9.5-apache, 9-apache, 9.5.9, 9.5, 9
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 23b02e8143858e0ed63e3f22bfa834f6d7263224
-Directory: 9.5/php8.1/apache-bullseye
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
+Directory: 9.5/php8.1/apache-bookworm
 
-Tags: 9.5.9-php8.1-apache-buster, 9.5-php8.1-apache-buster, 9-php8.1-apache-buster, 9.5.9-apache-buster, 9.5-apache-buster, 9-apache-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 23b02e8143858e0ed63e3f22bfa834f6d7263224
-Directory: 9.5/php8.1/apache-buster
+Tags: 9.5.9-php8.1-apache-bullseye, 9.5-php8.1-apache-bullseye, 9-php8.1-apache-bullseye, 9.5.9-apache-bullseye, 9.5-apache-bullseye, 9-apache-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
+Directory: 9.5/php8.1/apache-bullseye
 
 Tags: 9.5.9-php8.1-fpm-alpine3.17, 9.5-php8.1-fpm-alpine3.17, 9-php8.1-fpm-alpine3.17, 9.5.9-fpm-alpine3.17, 9.5-fpm-alpine3.17, 9-fpm-alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -126,25 +216,55 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 746a68f3e21d1775f23701011503ca98ac900721
 Directory: 9.5/php8.1/fpm-alpine3.18
 
-Tags: 9.5.9-php8.1-fpm-bullseye, 9.5-php8.1-fpm-bullseye, 9-php8.1-fpm-bullseye, 9.5.9-php8.1-fpm, 9.5-php8.1-fpm, 9-php8.1-fpm, 9.5.9-fpm-bullseye, 9.5-fpm-bullseye, 9-fpm-bullseye, 9.5.9-fpm, 9.5-fpm, 9-fpm
+Tags: 9.5.9-php8.1-fpm-bookworm, 9.5-php8.1-fpm-bookworm, 9-php8.1-fpm-bookworm, 9.5.9-php8.1-fpm, 9.5-php8.1-fpm, 9-php8.1-fpm, 9.5.9-fpm-bookworm, 9.5-fpm-bookworm, 9-fpm-bookworm, 9.5.9-fpm, 9.5-fpm, 9-fpm
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 23b02e8143858e0ed63e3f22bfa834f6d7263224
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
+Directory: 9.5/php8.1/fpm-bookworm
+
+Tags: 9.5.9-php8.1-fpm-bullseye, 9.5-php8.1-fpm-bullseye, 9-php8.1-fpm-bullseye, 9.5.9-fpm-bullseye, 9.5-fpm-bullseye, 9-fpm-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
 Directory: 9.5/php8.1/fpm-bullseye
 
-Tags: 9.5.9-php8.1-fpm-buster, 9.5-php8.1-fpm-buster, 9-php8.1-fpm-buster, 9.5.9-fpm-buster, 9.5-fpm-buster, 9-fpm-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 23b02e8143858e0ed63e3f22bfa834f6d7263224
-Directory: 9.5/php8.1/fpm-buster
+Tags: 9.5.9-php8.2-apache-bookworm, 9.5-php8.2-apache-bookworm, 9-php8.2-apache-bookworm, 9.5.9-php8.2-apache, 9.5-php8.2-apache, 9-php8.2-apache, 9.5.9-php8.2, 9.5-php8.2, 9-php8.2
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+Directory: 9.5/php8.2/apache-bookworm
 
-Tags: 10.0.9-php8.1-apache-bullseye, 10.0-php8.1-apache-bullseye, 10-php8.1-apache-bullseye, php8.1-apache-bullseye, 10.0.9-php8.1-apache, 10.0-php8.1-apache, 10-php8.1-apache, php8.1-apache, 10.0.9-php8.1, 10.0-php8.1, 10-php8.1, php8.1
+Tags: 9.5.9-php8.2-apache-bullseye, 9.5-php8.2-apache-bullseye, 9-php8.2-apache-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 38b11a5adac057ace72c1c90a6b86cbae17beff2
-Directory: 10.0/php8.1/apache-bullseye
+GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+Directory: 9.5/php8.2/apache-bullseye
 
-Tags: 10.0.9-php8.1-apache-buster, 10.0-php8.1-apache-buster, 10-php8.1-apache-buster, php8.1-apache-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 38b11a5adac057ace72c1c90a6b86cbae17beff2
-Directory: 10.0/php8.1/apache-buster
+Tags: 9.5.9-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: 427357a0d6f362f462fffc89090bf172e4743c43
+Directory: 9.5/php8.2/fpm-alpine3.17
+
+Tags: 9.5.9-php8.2-fpm-alpine3.18, 9.5-php8.2-fpm-alpine3.18, 9-php8.2-fpm-alpine3.18, 9.5.9-php8.2-fpm-alpine, 9.5-php8.2-fpm-alpine, 9-php8.2-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+Directory: 9.5/php8.2/fpm-alpine3.18
+
+Tags: 9.5.9-php8.2-fpm-bookworm, 9.5-php8.2-fpm-bookworm, 9-php8.2-fpm-bookworm, 9.5.9-php8.2-fpm, 9.5-php8.2-fpm, 9-php8.2-fpm
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+Directory: 9.5/php8.2/fpm-bookworm
+
+Tags: 9.5.9-php8.2-fpm-bullseye, 9.5-php8.2-fpm-bullseye, 9-php8.2-fpm-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 427357a0d6f362f462fffc89090bf172e4743c43
+Directory: 9.5/php8.2/fpm-bullseye
+
+Tags: 10.0.9-php8.1-apache-bookworm, 10.0-php8.1-apache-bookworm, 10-php8.1-apache-bookworm, php8.1-apache-bookworm, 10.0.9-php8.1-apache, 10.0-php8.1-apache, 10-php8.1-apache, php8.1-apache, 10.0.9-php8.1, 10.0-php8.1, 10-php8.1, php8.1
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
+Directory: 10.0/php8.1/apache-bookworm
+
+Tags: 10.0.9-php8.1-apache-bullseye, 10.0-php8.1-apache-bullseye, 10-php8.1-apache-bullseye, php8.1-apache-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
+Directory: 10.0/php8.1/apache-bullseye
 
 Tags: 10.0.9-php8.1-fpm-alpine3.17, 10.0-php8.1-fpm-alpine3.17, 10-php8.1-fpm-alpine3.17, php8.1-fpm-alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -156,26 +276,26 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 746a68f3e21d1775f23701011503ca98ac900721
 Directory: 10.0/php8.1/fpm-alpine3.18
 
-Tags: 10.0.9-php8.1-fpm-bullseye, 10.0-php8.1-fpm-bullseye, 10-php8.1-fpm-bullseye, php8.1-fpm-bullseye, 10.0.9-php8.1-fpm, 10.0-php8.1-fpm, 10-php8.1-fpm, php8.1-fpm
+Tags: 10.0.9-php8.1-fpm-bookworm, 10.0-php8.1-fpm-bookworm, 10-php8.1-fpm-bookworm, php8.1-fpm-bookworm, 10.0.9-php8.1-fpm, 10.0-php8.1-fpm, 10-php8.1-fpm, php8.1-fpm
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 38b11a5adac057ace72c1c90a6b86cbae17beff2
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
+Directory: 10.0/php8.1/fpm-bookworm
+
+Tags: 10.0.9-php8.1-fpm-bullseye, 10.0-php8.1-fpm-bullseye, 10-php8.1-fpm-bullseye, php8.1-fpm-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
 Directory: 10.0/php8.1/fpm-bullseye
 
-Tags: 10.0.9-php8.1-fpm-buster, 10.0-php8.1-fpm-buster, 10-php8.1-fpm-buster, php8.1-fpm-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 38b11a5adac057ace72c1c90a6b86cbae17beff2
-Directory: 10.0/php8.1/fpm-buster
+Tags: 10.0.9-php8.2-apache-bookworm, 10.0-php8.2-apache-bookworm, 10-php8.2-apache-bookworm, php8.2-apache-bookworm, 10.0.9-php8.2-apache, 10.0-php8.2-apache, 10-php8.2-apache, php8.2-apache, 10.0.9-php8.2, 10.0-php8.2, 10-php8.2, php8.2, 10.0.9-apache-bookworm, 10.0-apache-bookworm, 10-apache-bookworm, apache-bookworm, 10.0.9-apache, 10.0-apache, 10-apache, apache, 10.0.9, 10.0, 10, latest
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
+Directory: 10.0/php8.2/apache-bookworm
 
-Tags: 10.0.9-php8.2-apache-bullseye, 10.0-php8.2-apache-bullseye, 10-php8.2-apache-bullseye, php8.2-apache-bullseye, 10.0.9-php8.2-apache, 10.0-php8.2-apache, 10-php8.2-apache, php8.2-apache, 10.0.9-php8.2, 10.0-php8.2, 10-php8.2, php8.2, 10.0.9-apache-bullseye, 10.0-apache-bullseye, 10-apache-bullseye, apache-bullseye, 10.0.9-apache, 10.0-apache, 10-apache, apache, 10.0.9, 10.0, 10, latest
+Tags: 10.0.9-php8.2-apache-bullseye, 10.0-php8.2-apache-bullseye, 10-php8.2-apache-bullseye, php8.2-apache-bullseye, 10.0.9-apache-bullseye, 10.0-apache-bullseye, 10-apache-bullseye, apache-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 38b11a5adac057ace72c1c90a6b86cbae17beff2
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
 Directory: 10.0/php8.2/apache-bullseye
 
-Tags: 10.0.9-php8.2-apache-buster, 10.0-php8.2-apache-buster, 10-php8.2-apache-buster, php8.2-apache-buster, 10.0.9-apache-buster, 10.0-apache-buster, 10-apache-buster, apache-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 38b11a5adac057ace72c1c90a6b86cbae17beff2
-Directory: 10.0/php8.2/apache-buster
-
 Tags: 10.0.9-php8.2-fpm-alpine3.17, 10.0-php8.2-fpm-alpine3.17, 10-php8.2-fpm-alpine3.17, php8.2-fpm-alpine3.17, 10.0.9-fpm-alpine3.17, 10.0-fpm-alpine3.17, 10-fpm-alpine3.17, fpm-alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 38b11a5adac057ace72c1c90a6b86cbae17beff2
@@ -186,12 +306,12 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 746a68f3e21d1775f23701011503ca98ac900721
 Directory: 10.0/php8.2/fpm-alpine3.18
 
-Tags: 10.0.9-php8.2-fpm-bullseye, 10.0-php8.2-fpm-bullseye, 10-php8.2-fpm-bullseye, php8.2-fpm-bullseye, 10.0.9-php8.2-fpm, 10.0-php8.2-fpm, 10-php8.2-fpm, php8.2-fpm, 10.0.9-fpm-bullseye, 10.0-fpm-bullseye, 10-fpm-bullseye, fpm-bullseye, 10.0.9-fpm, 10.0-fpm, 10-fpm, fpm
+Tags: 10.0.9-php8.2-fpm-bookworm, 10.0-php8.2-fpm-bookworm, 10-php8.2-fpm-bookworm, php8.2-fpm-bookworm, 10.0.9-php8.2-fpm, 10.0-php8.2-fpm, 10-php8.2-fpm, php8.2-fpm, 10.0.9-fpm-bookworm, 10.0-fpm-bookworm, 10-fpm-bookworm, fpm-bookworm, 10.0.9-fpm, 10.0-fpm, 10-fpm, fpm
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 38b11a5adac057ace72c1c90a6b86cbae17beff2
-Directory: 10.0/php8.2/fpm-bullseye
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
+Directory: 10.0/php8.2/fpm-bookworm
 
-Tags: 10.0.9-php8.2-fpm-buster, 10.0-php8.2-fpm-buster, 10-php8.2-fpm-buster, php8.2-fpm-buster, 10.0.9-fpm-buster, 10.0-fpm-buster, 10-fpm-buster, fpm-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 38b11a5adac057ace72c1c90a6b86cbae17beff2
-Directory: 10.0/php8.2/fpm-buster
+Tags: 10.0.9-php8.2-fpm-bullseye, 10.0-php8.2-fpm-bullseye, 10-php8.2-fpm-bullseye, php8.2-fpm-bullseye, 10.0.9-fpm-bullseye, 10.0-fpm-bullseye, 10-fpm-bullseye, fpm-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 4224e1aab82c9d3d2d4d759ce5c5e3e40242ecb3
+Directory: 10.0/php8.2/fpm-bullseye
diff --git a/_bashbrew-list b/_bashbrew-list
index 88775a3..fd4185e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,292 +1,355 @@
-drupal:7
-drupal:7-apache
 drupal:7-apache-bullseye
 drupal:7-apache-buster
-drupal:7-fpm
 drupal:7-fpm-alpine3.16
 drupal:7-fpm-bullseye
 drupal:7-fpm-buster
-drupal:7-php8.0
-drupal:7-php8.0-apache
 drupal:7-php8.0-apache-bullseye
 drupal:7-php8.0-apache-buster
-drupal:7-php8.0-fpm
 drupal:7-php8.0-fpm-alpine3.16
 drupal:7-php8.0-fpm-bullseye
 drupal:7-php8.0-fpm-buster
-drupal:7.98
-drupal:7.98-apache
+drupal:7-php8.1
+drupal:7-php8.1-apache
+drupal:7-php8.1-apache-bookworm
+drupal:7-php8.1-apache-bullseye
+drupal:7-php8.1-fpm
+drupal:7-php8.1-fpm-alpine
+drupal:7-php8.1-fpm-alpine3.17
+drupal:7-php8.1-fpm-alpine3.18
+drupal:7-php8.1-fpm-bookworm
+drupal:7-php8.1-fpm-bullseye
+drupal:7-php8.2
+drupal:7-php8.2-apache
+drupal:7-php8.2-apache-bookworm
+drupal:7-php8.2-apache-bullseye
+drupal:7-php8.2-fpm
+drupal:7-php8.2-fpm-alpine
+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-apache-bullseye
 drupal:7.98-apache-buster
-drupal:7.98-fpm
 drupal:7.98-fpm-alpine3.16
 drupal:7.98-fpm-bullseye
 drupal:7.98-fpm-buster
-drupal:7.98-php8.0
-drupal:7.98-php8.0-apache
 drupal:7.98-php8.0-apache-bullseye
 drupal:7.98-php8.0-apache-buster
-drupal:7.98-php8.0-fpm
 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
+drupal:7.98-php8.1-apache-bullseye
+drupal:7.98-php8.1-fpm
+drupal:7.98-php8.1-fpm-alpine
+drupal:7.98-php8.1-fpm-alpine3.17
+drupal:7.98-php8.1-fpm-alpine3.18
+drupal:7.98-php8.1-fpm-bookworm
+drupal:7.98-php8.1-fpm-bullseye
+drupal:7.98-php8.2
+drupal:7.98-php8.2-apache
+drupal:7.98-php8.2-apache-bookworm
+drupal:7.98-php8.2-apache-bullseye
+drupal:7.98-php8.2-fpm
+drupal:7.98-php8.2-fpm-alpine
+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-apache-buster
 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-fpm-buster
-drupal:9-php8.0
-drupal:9-php8.0-apache
 drupal:9-php8.0-apache-bullseye
 drupal:9-php8.0-apache-buster
-drupal:9-php8.0-fpm
 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-apache-buster
 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.1-fpm-buster
+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.4
 drupal:9.4-apache
+drupal:9.4-apache-bookworm
 drupal:9.4-apache-bullseye
-drupal:9.4-apache-buster
 drupal:9.4-fpm
 drupal:9.4-fpm-alpine
 drupal:9.4-fpm-alpine3.17
 drupal:9.4-fpm-alpine3.18
+drupal:9.4-fpm-bookworm
 drupal:9.4-fpm-bullseye
-drupal:9.4-fpm-buster
-drupal:9.4-php8.0
-drupal:9.4-php8.0-apache
 drupal:9.4-php8.0-apache-bullseye
 drupal:9.4-php8.0-apache-buster
-drupal:9.4-php8.0-fpm
 drupal:9.4-php8.0-fpm-alpine3.16
 drupal:9.4-php8.0-fpm-bullseye
 drupal:9.4-php8.0-fpm-buster
 drupal:9.4-php8.1
 drupal:9.4-php8.1-apache
+drupal:9.4-php8.1-apache-bookworm
 drupal:9.4-php8.1-apache-bullseye
-drupal:9.4-php8.1-apache-buster
 drupal:9.4-php8.1-fpm
 drupal:9.4-php8.1-fpm-alpine
 drupal:9.4-php8.1-fpm-alpine3.17
 drupal:9.4-php8.1-fpm-alpine3.18
+drupal:9.4-php8.1-fpm-bookworm
 drupal:9.4-php8.1-fpm-bullseye
-drupal:9.4-php8.1-fpm-buster
+drupal:9.4-php8.2
+drupal:9.4-php8.2-apache
+drupal:9.4-php8.2-apache-bookworm
+drupal:9.4-php8.2-apache-bullseye
+drupal:9.4-php8.2-fpm
+drupal:9.4-php8.2-fpm-alpine
+drupal:9.4-php8.2-fpm-alpine3.17
+drupal:9.4-php8.2-fpm-alpine3.18
+drupal:9.4-php8.2-fpm-bookworm
+drupal:9.4-php8.2-fpm-bullseye
 drupal:9.4.15
 drupal:9.4.15-apache
+drupal:9.4.15-apache-bookworm
 drupal:9.4.15-apache-bullseye
-drupal:9.4.15-apache-buster
 drupal:9.4.15-fpm
 drupal:9.4.15-fpm-alpine
 drupal:9.4.15-fpm-alpine3.17
 drupal:9.4.15-fpm-alpine3.18
+drupal:9.4.15-fpm-bookworm
 drupal:9.4.15-fpm-bullseye
-drupal:9.4.15-fpm-buster
-drupal:9.4.15-php8.0
-drupal:9.4.15-php8.0-apache
 drupal:9.4.15-php8.0-apache-bullseye
 drupal:9.4.15-php8.0-apache-buster
-drupal:9.4.15-php8.0-fpm
 drupal:9.4.15-php8.0-fpm-alpine3.16
 drupal:9.4.15-php8.0-fpm-bullseye
 drupal:9.4.15-php8.0-fpm-buster
 drupal:9.4.15-php8.1
 drupal:9.4.15-php8.1-apache
+drupal:9.4.15-php8.1-apache-bookworm
 drupal:9.4.15-php8.1-apache-bullseye
-drupal:9.4.15-php8.1-apache-buster
 drupal:9.4.15-php8.1-fpm
 drupal:9.4.15-php8.1-fpm-alpine
 drupal:9.4.15-php8.1-fpm-alpine3.17
 drupal:9.4.15-php8.1-fpm-alpine3.18
+drupal:9.4.15-php8.1-fpm-bookworm
 drupal:9.4.15-php8.1-fpm-bullseye
-drupal:9.4.15-php8.1-fpm-buster
+drupal:9.4.15-php8.2
+drupal:9.4.15-php8.2-apache
+drupal:9.4.15-php8.2-apache-bookworm
+drupal:9.4.15-php8.2-apache-bullseye
+drupal:9.4.15-php8.2-fpm
+drupal:9.4.15-php8.2-fpm-alpine
+drupal:9.4.15-php8.2-fpm-alpine3.17
+drupal:9.4.15-php8.2-fpm-alpine3.18
+drupal:9.4.15-php8.2-fpm-bookworm
+drupal:9.4.15-php8.2-fpm-bullseye
 drupal:9.5
 drupal:9.5-apache
+drupal:9.5-apache-bookworm
 drupal:9.5-apache-bullseye
-drupal:9.5-apache-buster
 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-fpm-buster
-drupal:9.5-php8.0
-drupal:9.5-php8.0-apache
 drupal:9.5-php8.0-apache-bullseye
 drupal:9.5-php8.0-apache-buster
-drupal:9.5-php8.0-fpm
 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-apache-buster
 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.1-fpm-buster
+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.9
 drupal:9.5.9-apache
+drupal:9.5.9-apache-bookworm
 drupal:9.5.9-apache-bullseye
-drupal:9.5.9-apache-buster
 drupal:9.5.9-fpm
 drupal:9.5.9-fpm-alpine
 drupal:9.5.9-fpm-alpine3.17
 drupal:9.5.9-fpm-alpine3.18
+drupal:9.5.9-fpm-bookworm
 drupal:9.5.9-fpm-bullseye
-drupal:9.5.9-fpm-buster
-drupal:9.5.9-php8.0
-drupal:9.5.9-php8.0-apache
 drupal:9.5.9-php8.0-apache-bullseye
 drupal:9.5.9-php8.0-apache-buster
-drupal:9.5.9-php8.0-fpm
 drupal:9.5.9-php8.0-fpm-alpine3.16
 drupal:9.5.9-php8.0-fpm-bullseye
 drupal:9.5.9-php8.0-fpm-buster
 drupal:9.5.9-php8.1
 drupal:9.5.9-php8.1-apache
+drupal:9.5.9-php8.1-apache-bookworm
 drupal:9.5.9-php8.1-apache-bullseye
-drupal:9.5.9-php8.1-apache-buster
 drupal:9.5.9-php8.1-fpm
 drupal:9.5.9-php8.1-fpm-alpine
 drupal:9.5.9-php8.1-fpm-alpine3.17
 drupal:9.5.9-php8.1-fpm-alpine3.18
+drupal:9.5.9-php8.1-fpm-bookworm
 drupal:9.5.9-php8.1-fpm-bullseye
-drupal:9.5.9-php8.1-fpm-buster
+drupal:9.5.9-php8.2
+drupal:9.5.9-php8.2-apache
+drupal:9.5.9-php8.2-apache-bookworm
+drupal:9.5.9-php8.2-apache-bullseye
+drupal:9.5.9-php8.2-fpm
+drupal:9.5.9-php8.2-fpm-alpine
+drupal:9.5.9-php8.2-fpm-alpine3.17
+drupal:9.5.9-php8.2-fpm-alpine3.18
+drupal:9.5.9-php8.2-fpm-bookworm
+drupal:9.5.9-php8.2-fpm-bullseye
 drupal:10
 drupal:10-apache
+drupal:10-apache-bookworm
 drupal:10-apache-bullseye
-drupal:10-apache-buster
 drupal:10-fpm
 drupal:10-fpm-alpine
 drupal:10-fpm-alpine3.17
 drupal:10-fpm-alpine3.18
+drupal:10-fpm-bookworm
 drupal:10-fpm-bullseye
-drupal:10-fpm-buster
 drupal:10-php8.1
 drupal:10-php8.1-apache
+drupal:10-php8.1-apache-bookworm
 drupal:10-php8.1-apache-bullseye
-drupal:10-php8.1-apache-buster
 drupal:10-php8.1-fpm
 drupal:10-php8.1-fpm-alpine
 drupal:10-php8.1-fpm-alpine3.17
 drupal:10-php8.1-fpm-alpine3.18
+drupal:10-php8.1-fpm-bookworm
 drupal:10-php8.1-fpm-bullseye
-drupal:10-php8.1-fpm-buster
 drupal:10-php8.2
 drupal:10-php8.2-apache
+drupal:10-php8.2-apache-bookworm
 drupal:10-php8.2-apache-bullseye
-drupal:10-php8.2-apache-buster
 drupal:10-php8.2-fpm
 drupal:10-php8.2-fpm-alpine
 drupal:10-php8.2-fpm-alpine3.17
 drupal:10-php8.2-fpm-alpine3.18
+drupal:10-php8.2-fpm-bookworm
 drupal:10-php8.2-fpm-bullseye
-drupal:10-php8.2-fpm-buster
 drupal:10.0
 drupal:10.0-apache
+drupal:10.0-apache-bookworm
 drupal:10.0-apache-bullseye
-drupal:10.0-apache-buster
 drupal:10.0-fpm
 drupal:10.0-fpm-alpine
 drupal:10.0-fpm-alpine3.17
 drupal:10.0-fpm-alpine3.18
+drupal:10.0-fpm-bookworm
 drupal:10.0-fpm-bullseye
-drupal:10.0-fpm-buster
 drupal:10.0-php8.1
 drupal:10.0-php8.1-apache
+drupal:10.0-php8.1-apache-bookworm
 drupal:10.0-php8.1-apache-bullseye
-drupal:10.0-php8.1-apache-buster
 drupal:10.0-php8.1-fpm
 drupal:10.0-php8.1-fpm-alpine
 drupal:10.0-php8.1-fpm-alpine3.17
 drupal:10.0-php8.1-fpm-alpine3.18
+drupal:10.0-php8.1-fpm-bookworm
 drupal:10.0-php8.1-fpm-bullseye
-drupal:10.0-php8.1-fpm-buster
 drupal:10.0-php8.2
 drupal:10.0-php8.2-apache
+drupal:10.0-php8.2-apache-bookworm
 drupal:10.0-php8.2-apache-bullseye
-drupal:10.0-php8.2-apache-buster
 drupal:10.0-php8.2-fpm
 drupal:10.0-php8.2-fpm-alpine
 drupal:10.0-php8.2-fpm-alpine3.17
 drupal:10.0-php8.2-fpm-alpine3.18
+drupal:10.0-php8.2-fpm-bookworm
 drupal:10.0-php8.2-fpm-bullseye
-drupal:10.0-php8.2-fpm-buster
 drupal:10.0.9
 drupal:10.0.9-apache
+drupal:10.0.9-apache-bookworm
 drupal:10.0.9-apache-bullseye
-drupal:10.0.9-apache-buster
 drupal:10.0.9-fpm
 drupal:10.0.9-fpm-alpine
 drupal:10.0.9-fpm-alpine3.17
 drupal:10.0.9-fpm-alpine3.18
+drupal:10.0.9-fpm-bookworm
 drupal:10.0.9-fpm-bullseye
-drupal:10.0.9-fpm-buster
 drupal:10.0.9-php8.1
 drupal:10.0.9-php8.1-apache
+drupal:10.0.9-php8.1-apache-bookworm
 drupal:10.0.9-php8.1-apache-bullseye
-drupal:10.0.9-php8.1-apache-buster
 drupal:10.0.9-php8.1-fpm
 drupal:10.0.9-php8.1-fpm-alpine
 drupal:10.0.9-php8.1-fpm-alpine3.17
 drupal:10.0.9-php8.1-fpm-alpine3.18
+drupal:10.0.9-php8.1-fpm-bookworm
 drupal:10.0.9-php8.1-fpm-bullseye
-drupal:10.0.9-php8.1-fpm-buster
 drupal:10.0.9-php8.2
 drupal:10.0.9-php8.2-apache
+drupal:10.0.9-php8.2-apache-bookworm
 drupal:10.0.9-php8.2-apache-bullseye
-drupal:10.0.9-php8.2-apache-buster
 drupal:10.0.9-php8.2-fpm
 drupal:10.0.9-php8.2-fpm-alpine
 drupal:10.0.9-php8.2-fpm-alpine3.17
 drupal:10.0.9-php8.2-fpm-alpine3.18
+drupal:10.0.9-php8.2-fpm-bookworm
 drupal:10.0.9-php8.2-fpm-bullseye
-drupal:10.0.9-php8.2-fpm-buster
 drupal:apache
+drupal:apache-bookworm
 drupal:apache-bullseye
-drupal:apache-buster
 drupal:fpm
 drupal:fpm-alpine
 drupal:fpm-alpine3.17
 drupal:fpm-alpine3.18
+drupal:fpm-bookworm
 drupal:fpm-bullseye
-drupal:fpm-buster
 drupal:latest
 drupal:php8.1
 drupal:php8.1-apache
+drupal:php8.1-apache-bookworm
 drupal:php8.1-apache-bullseye
-drupal:php8.1-apache-buster
 drupal:php8.1-fpm
 drupal:php8.1-fpm-alpine
 drupal:php8.1-fpm-alpine3.17
 drupal:php8.1-fpm-alpine3.18
+drupal:php8.1-fpm-bookworm
 drupal:php8.1-fpm-bullseye
-drupal:php8.1-fpm-buster
 drupal:php8.2
 drupal:php8.2-apache
+drupal:php8.2-apache-bookworm
 drupal:php8.2-apache-bullseye
-drupal:php8.2-apache-buster
 drupal:php8.2-fpm
 drupal:php8.2-fpm-alpine
 drupal:php8.2-fpm-alpine3.17
 drupal:php8.2-fpm-alpine3.18
+drupal:php8.2-fpm-bookworm
 drupal:php8.2-fpm-bullseye
-drupal:php8.2-fpm-buster
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 7c355dd..d5e22ac 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,39 +1,63 @@
-drupal:7
+drupal:7-apache-bullseye
 drupal:7-apache-buster
 drupal:7-fpm-alpine3.16
-drupal:7-fpm
+drupal:7-fpm-bullseye
 drupal:7-fpm-buster
-drupal:9.4-php8.0
+drupal:7-php8.1
+drupal:7-php8.1-apache-bullseye
+drupal:7-php8.1-fpm-alpine3.17
+drupal:7-php8.1-fpm-alpine
+drupal:7-php8.1-fpm
+drupal:7-php8.1-fpm-bullseye
+drupal:7-php8.2
+drupal:7-php8.2-apache-bullseye
+drupal:7-php8.2-fpm-alpine3.17
+drupal:7-php8.2-fpm-alpine
+drupal:7-php8.2-fpm
+drupal:7-php8.2-fpm-bullseye
+drupal:9.4-php8.0-apache-bullseye
 drupal:9.4-php8.0-apache-buster
 drupal:9.4-php8.0-fpm-alpine3.16
-drupal:9.4-php8.0-fpm
+drupal:9.4-php8.0-fpm-bullseye
 drupal:9.4-php8.0-fpm-buster
 drupal:9.4
-drupal:9.4-apache-buster
+drupal:9.4-apache-bullseye
 drupal:9.4-fpm-alpine3.17
 drupal:9.4-fpm-alpine
 drupal:9.4-fpm
-drupal:9.4-fpm-buster
-drupal:9-php8.0
+drupal:9.4-fpm-bullseye
+drupal:9.4-php8.2
+drupal:9.4-php8.2-apache-bullseye
+drupal:9.4-php8.2-fpm-alpine3.17
+drupal:9.4-php8.2-fpm-alpine
+drupal:9.4-php8.2-fpm
+drupal:9.4-php8.2-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
+drupal:9-php8.0-fpm-bullseye
 drupal:9-php8.0-fpm-buster
 drupal:9
-drupal:9-apache-buster
+drupal:9-apache-bullseye
 drupal:9-fpm-alpine3.17
 drupal:9-fpm-alpine
 drupal:9-fpm
-drupal:9-fpm-buster
+drupal:9-fpm-bullseye
+drupal:9-php8.2
+drupal:9-php8.2-apache-bullseye
+drupal:9-php8.2-fpm-alpine3.17
+drupal:9-php8.2-fpm-alpine
+drupal:9-php8.2-fpm
+drupal:9-php8.2-fpm-bullseye
 drupal:php8.1
-drupal:php8.1-apache-buster
+drupal:php8.1-apache-bullseye
 drupal:php8.1-fpm-alpine3.17
 drupal:php8.1-fpm-alpine
 drupal:php8.1-fpm
-drupal:php8.1-fpm-buster
+drupal:php8.1-fpm-bullseye
 drupal:latest
-drupal:apache-buster
+drupal:apache-bullseye
 drupal:fpm-alpine3.17
 drupal:fpm-alpine
 drupal:fpm
-drupal:fpm-buster
+drupal:fpm-bullseye
diff --git a/drupal_7/Dockerfile b/drupal_7-apache-bullseye/Dockerfile
similarity index 94%
rename from drupal_7/Dockerfile
rename to drupal_7-apache-bullseye/Dockerfile
index 7d78875..b15d1b9 100644
--- a/drupal_7/Dockerfile
+++ b/drupal_7-apache-bullseye/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_7-apache-buster/Dockerfile b/drupal_7-apache-buster/Dockerfile
index 1be4d7f..eebd123 100644
--- a/drupal_7-apache-buster/Dockerfile
+++ b/drupal_7-apache-buster/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_7-fpm/Dockerfile b/drupal_7-fpm-bullseye/Dockerfile
similarity index 94%
rename from drupal_7-fpm/Dockerfile
rename to drupal_7-fpm-bullseye/Dockerfile
index ac31848..1ba214e 100644
--- a/drupal_7-fpm/Dockerfile
+++ b/drupal_7-fpm-bullseye/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_7-fpm-buster/Dockerfile b/drupal_7-fpm-buster/Dockerfile
index 8d55692..d898a39 100644
--- a/drupal_7-fpm-buster/Dockerfile
+++ b/drupal_7-fpm-buster/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_7-apache-buster/Dockerfile b/drupal_7-php8.1-apache-bullseye/Dockerfile
similarity index 93%
copy from drupal_7-apache-buster/Dockerfile
copy to drupal_7-php8.1-apache-bullseye/Dockerfile
index 1be4d7f..56dcae1 100644
--- a/drupal_7-apache-buster/Dockerfile
+++ b/drupal_7-php8.1-apache-bullseye/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-apache-buster
+FROM php:8.1-apache-bullseye
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_7-fpm-alpine3.16/Dockerfile b/drupal_7-php8.1-fpm-alpine/Dockerfile
similarity index 98%
copy from drupal_7-fpm-alpine3.16/Dockerfile
copy to drupal_7-php8.1-fpm-alpine/Dockerfile
index 017c515..cf35616 100644
--- a/drupal_7-fpm-alpine3.16/Dockerfile
+++ b/drupal_7-php8.1-fpm-alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-fpm-alpine3.16
+FROM php:8.1-fpm-alpine3.18
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/drupal_7-fpm-alpine3.16/Dockerfile b/drupal_7-php8.1-fpm-alpine3.17/Dockerfile
similarity index 98%
copy from drupal_7-fpm-alpine3.16/Dockerfile
copy to drupal_7-php8.1-fpm-alpine3.17/Dockerfile
index 017c515..628aa8a 100644
--- a/drupal_7-fpm-alpine3.16/Dockerfile
+++ b/drupal_7-php8.1-fpm-alpine3.17/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-fpm-alpine3.16
+FROM php:8.1-fpm-alpine3.17
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/drupal_7-apache-buster/Dockerfile b/drupal_7-php8.1-fpm-bullseye/Dockerfile
similarity index 93%
copy from drupal_7-apache-buster/Dockerfile
copy to drupal_7-php8.1-fpm-bullseye/Dockerfile
index 1be4d7f..a16c2b3 100644
--- a/drupal_7-apache-buster/Dockerfile
+++ b/drupal_7-php8.1-fpm-bullseye/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-apache-buster
+FROM php:8.1-fpm-bullseye
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_7-apache-buster/Dockerfile b/drupal_7-php8.1-fpm/Dockerfile
similarity index 93%
copy from drupal_7-apache-buster/Dockerfile
copy to drupal_7-php8.1-fpm/Dockerfile
index 1be4d7f..e6e43b6 100644
--- a/drupal_7-apache-buster/Dockerfile
+++ b/drupal_7-php8.1-fpm/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-apache-buster
+FROM php:8.1-fpm-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_7-apache-buster/Dockerfile b/drupal_7-php8.1/Dockerfile
similarity index 93%
copy from drupal_7-apache-buster/Dockerfile
copy to drupal_7-php8.1/Dockerfile
index 1be4d7f..2b68d2f 100644
--- a/drupal_7-apache-buster/Dockerfile
+++ b/drupal_7-php8.1/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-apache-buster
+FROM php:8.1-apache-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_7-apache-buster/Dockerfile b/drupal_7-php8.2-apache-bullseye/Dockerfile
similarity index 93%
copy from drupal_7-apache-buster/Dockerfile
copy to drupal_7-php8.2-apache-bullseye/Dockerfile
index 1be4d7f..eb28d43 100644
--- a/drupal_7-apache-buster/Dockerfile
+++ b/drupal_7-php8.2-apache-bullseye/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-apache-buster
+FROM php:8.2-apache-bullseye
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_7-fpm-alpine3.16/Dockerfile b/drupal_7-php8.2-fpm-alpine/Dockerfile
similarity index 98%
copy from drupal_7-fpm-alpine3.16/Dockerfile
copy to drupal_7-php8.2-fpm-alpine/Dockerfile
index 017c515..1412d80 100644
--- a/drupal_7-fpm-alpine3.16/Dockerfile
+++ b/drupal_7-php8.2-fpm-alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-fpm-alpine3.16
+FROM php:8.2-fpm-alpine3.18
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/drupal_7-fpm-alpine3.16/Dockerfile b/drupal_7-php8.2-fpm-alpine3.17/Dockerfile
similarity index 98%
copy from drupal_7-fpm-alpine3.16/Dockerfile
copy to drupal_7-php8.2-fpm-alpine3.17/Dockerfile
index 017c515..e2b7699 100644
--- a/drupal_7-fpm-alpine3.16/Dockerfile
+++ b/drupal_7-php8.2-fpm-alpine3.17/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-fpm-alpine3.16
+FROM php:8.2-fpm-alpine3.17
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/drupal_7-apache-buster/Dockerfile b/drupal_7-php8.2-fpm-bullseye/Dockerfile
similarity index 93%
copy from drupal_7-apache-buster/Dockerfile
copy to drupal_7-php8.2-fpm-bullseye/Dockerfile
index 1be4d7f..0e0d6e8 100644
--- a/drupal_7-apache-buster/Dockerfile
+++ b/drupal_7-php8.2-fpm-bullseye/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-apache-buster
+FROM php:8.2-fpm-bullseye
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_7-apache-buster/Dockerfile b/drupal_7-php8.2-fpm/Dockerfile
similarity index 93%
copy from drupal_7-apache-buster/Dockerfile
copy to drupal_7-php8.2-fpm/Dockerfile
index 1be4d7f..1e14236 100644
--- a/drupal_7-apache-buster/Dockerfile
+++ b/drupal_7-php8.2-fpm/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-apache-buster
+FROM php:8.2-fpm-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_7-apache-buster/Dockerfile b/drupal_7-php8.2/Dockerfile
similarity index 93%
copy from drupal_7-apache-buster/Dockerfile
copy to drupal_7-php8.2/Dockerfile
index 1be4d7f..1c28f88 100644
--- a/drupal_7-apache-buster/Dockerfile
+++ b/drupal_7-php8.2/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.0-apache-buster
+FROM php:8.2-apache-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9/Dockerfile b/drupal_9-apache-bullseye/Dockerfile
similarity index 94%
copy from drupal_9/Dockerfile
copy to drupal_9-apache-bullseye/Dockerfile
index 45b19a3..a48a8fa 100644
--- a/drupal_9/Dockerfile
+++ b/drupal_9-apache-bullseye/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9-fpm/Dockerfile b/drupal_9-fpm-bullseye/Dockerfile
similarity index 94%
copy from drupal_9-fpm/Dockerfile
copy to drupal_9-fpm-bullseye/Dockerfile
index c82cd8f..1dd33e8 100644
--- a/drupal_9-fpm/Dockerfile
+++ b/drupal_9-fpm-bullseye/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9-fpm/Dockerfile b/drupal_9-fpm/Dockerfile
index c82cd8f..a4e6102 100644
--- a/drupal_9-fpm/Dockerfile
+++ b/drupal_9-fpm/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-fpm-bullseye
+FROM php:8.1-fpm-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9-php8.0/Dockerfile b/drupal_9-php8.0-apache-bullseye/Dockerfile
similarity index 94%
rename from drupal_9-php8.0/Dockerfile
rename to drupal_9-php8.0-apache-bullseye/Dockerfile
index 3c127ec..fe9d6b3 100644
--- a/drupal_9-php8.0/Dockerfile
+++ b/drupal_9-php8.0-apache-bullseye/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9-php8.0-apache-buster/Dockerfile b/drupal_9-php8.0-apache-buster/Dockerfile
index 0bc949c..656286c 100644
--- a/drupal_9-php8.0-apache-buster/Dockerfile
+++ b/drupal_9-php8.0-apache-buster/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9-php8.0-fpm/Dockerfile b/drupal_9-php8.0-fpm-bullseye/Dockerfile
similarity index 94%
rename from drupal_9-php8.0-fpm/Dockerfile
rename to drupal_9-php8.0-fpm-bullseye/Dockerfile
index fdf6192..7906557 100644
--- a/drupal_9-php8.0-fpm/Dockerfile
+++ b/drupal_9-php8.0-fpm-bullseye/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9-php8.0-fpm-buster/Dockerfile b/drupal_9-php8.0-fpm-buster/Dockerfile
index 2921f95..8ad08b9 100644
--- a/drupal_9-php8.0-fpm-buster/Dockerfile
+++ b/drupal_9-php8.0-fpm-buster/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_latest/Dockerfile b/drupal_9-php8.2-apache-bullseye/Dockerfile
similarity index 93%
copy from drupal_latest/Dockerfile
copy to drupal_9-php8.2-apache-bullseye/Dockerfile
index 5f2e200..daf204f 100644
--- a/drupal_latest/Dockerfile
+++ b/drupal_9-php8.2-apache-bullseye/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
@@ -66,7 +66,7 @@ RUN { \
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
 # https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.0.9
+ENV DRUPAL_VERSION 9.5.9
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/drupal_fpm-alpine/Dockerfile b/drupal_9-php8.2-fpm-alpine/Dockerfile
similarity index 98%
copy from drupal_fpm-alpine/Dockerfile
copy to drupal_9-php8.2-fpm-alpine/Dockerfile
index 161770e..fe6d96b 100644
--- a/drupal_fpm-alpine/Dockerfile
+++ b/drupal_9-php8.2-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 10.0.9
+ENV DRUPAL_VERSION 9.5.9
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/drupal_fpm-alpine3.17/Dockerfile b/drupal_9-php8.2-fpm-alpine3.17/Dockerfile
similarity index 98%
copy from drupal_fpm-alpine3.17/Dockerfile
copy to drupal_9-php8.2-fpm-alpine3.17/Dockerfile
index 2d91633..434457b 100644
--- a/drupal_fpm-alpine3.17/Dockerfile
+++ b/drupal_9-php8.2-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 10.0.9
+ENV DRUPAL_VERSION 9.5.9
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/drupal_9-fpm-buster/Dockerfile b/drupal_9-php8.2-fpm-bullseye/Dockerfile
similarity index 93%
rename from drupal_9-fpm-buster/Dockerfile
rename to drupal_9-php8.2-fpm-bullseye/Dockerfile
index 0dbd25d..56a932a 100644
--- a/drupal_9-fpm-buster/Dockerfile
+++ b/drupal_9-php8.2-fpm-bullseye/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-fpm-buster
+FROM php:8.2-fpm-bullseye
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9-apache-buster/Dockerfile b/drupal_9-php8.2-fpm/Dockerfile
similarity index 93%
copy from drupal_9-apache-buster/Dockerfile
copy to drupal_9-php8.2-fpm/Dockerfile
index 43873e5..408366a 100644
--- a/drupal_9-apache-buster/Dockerfile
+++ b/drupal_9-php8.2-fpm/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-apache-buster
+FROM php:8.2-fpm-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9-apache-buster/Dockerfile b/drupal_9-php8.2/Dockerfile
similarity index 93%
rename from drupal_9-apache-buster/Dockerfile
rename to drupal_9-php8.2/Dockerfile
index 43873e5..22142fe 100644
--- a/drupal_9-apache-buster/Dockerfile
+++ b/drupal_9-php8.2/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-apache-buster
+FROM php:8.2-apache-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9.4/Dockerfile b/drupal_9.4-apache-bullseye/Dockerfile
similarity index 94%
copy from drupal_9.4/Dockerfile
copy to drupal_9.4-apache-bullseye/Dockerfile
index afcff25..fb87b96 100644
--- a/drupal_9.4/Dockerfile
+++ b/drupal_9.4-apache-bullseye/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9.4-apache-buster/Dockerfile b/drupal_9.4-fpm-bullseye/Dockerfile
similarity index 93%
copy from drupal_9.4-apache-buster/Dockerfile
copy to drupal_9.4-fpm-bullseye/Dockerfile
index 6cc799d..0dc038a 100644
--- a/drupal_9.4-apache-buster/Dockerfile
+++ b/drupal_9.4-fpm-bullseye/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-apache-buster
+FROM php:8.1-fpm-bullseye
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9.4-fpm/Dockerfile b/drupal_9.4-fpm/Dockerfile
index 1e3d9ed..165e40e 100644
--- a/drupal_9.4-fpm/Dockerfile
+++ b/drupal_9.4-fpm/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-fpm-bullseye
+FROM php:8.1-fpm-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9.4-php8.0/Dockerfile b/drupal_9.4-php8.0-apache-bullseye/Dockerfile
similarity index 94%
rename from drupal_9.4-php8.0/Dockerfile
rename to drupal_9.4-php8.0-apache-bullseye/Dockerfile
index 94e5a8e..72db39c 100644
--- a/drupal_9.4-php8.0/Dockerfile
+++ b/drupal_9.4-php8.0-apache-bullseye/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9.4-php8.0-apache-buster/Dockerfile b/drupal_9.4-php8.0-apache-buster/Dockerfile
index 1626ec2..43e54eb 100644
--- a/drupal_9.4-php8.0-apache-buster/Dockerfile
+++ b/drupal_9.4-php8.0-apache-buster/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9.4-php8.0-fpm/Dockerfile b/drupal_9.4-php8.0-fpm-bullseye/Dockerfile
similarity index 94%
rename from drupal_9.4-php8.0-fpm/Dockerfile
rename to drupal_9.4-php8.0-fpm-bullseye/Dockerfile
index 3348378..0238156 100644
--- a/drupal_9.4-php8.0-fpm/Dockerfile
+++ b/drupal_9.4-php8.0-fpm-bullseye/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9.4-php8.0-fpm-buster/Dockerfile b/drupal_9.4-php8.0-fpm-buster/Dockerfile
index ceff00f..ebcc1ec 100644
--- a/drupal_9.4-php8.0-fpm-buster/Dockerfile
+++ b/drupal_9.4-php8.0-fpm-buster/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_latest/Dockerfile b/drupal_9.4-php8.2-apache-bullseye/Dockerfile
similarity index 93%
copy from drupal_latest/Dockerfile
copy to drupal_9.4-php8.2-apache-bullseye/Dockerfile
index 5f2e200..f1830cf 100644
--- a/drupal_latest/Dockerfile
+++ b/drupal_9.4-php8.2-apache-bullseye/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
@@ -66,7 +66,7 @@ RUN { \
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
 # https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.0.9
+ENV DRUPAL_VERSION 9.4.15
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/drupal_fpm-alpine/Dockerfile b/drupal_9.4-php8.2-fpm-alpine/Dockerfile
similarity index 98%
copy from drupal_fpm-alpine/Dockerfile
copy to drupal_9.4-php8.2-fpm-alpine/Dockerfile
index 161770e..d33c2ca 100644
--- a/drupal_fpm-alpine/Dockerfile
+++ b/drupal_9.4-php8.2-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 10.0.9
+ENV DRUPAL_VERSION 9.4.15
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/drupal_fpm-alpine3.17/Dockerfile b/drupal_9.4-php8.2-fpm-alpine3.17/Dockerfile
similarity index 98%
copy from drupal_fpm-alpine3.17/Dockerfile
copy to drupal_9.4-php8.2-fpm-alpine3.17/Dockerfile
index 2d91633..63410a1 100644
--- a/drupal_fpm-alpine3.17/Dockerfile
+++ b/drupal_9.4-php8.2-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 10.0.9
+ENV DRUPAL_VERSION 9.4.15
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/drupal_9.4-fpm-buster/Dockerfile b/drupal_9.4-php8.2-fpm-bullseye/Dockerfile
similarity index 93%
rename from drupal_9.4-fpm-buster/Dockerfile
rename to drupal_9.4-php8.2-fpm-bullseye/Dockerfile
index 5863d47..f8bad54 100644
--- a/drupal_9.4-fpm-buster/Dockerfile
+++ b/drupal_9.4-php8.2-fpm-bullseye/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-fpm-buster
+FROM php:8.2-fpm-bullseye
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9.4-apache-buster/Dockerfile b/drupal_9.4-php8.2-fpm/Dockerfile
similarity index 93%
copy from drupal_9.4-apache-buster/Dockerfile
copy to drupal_9.4-php8.2-fpm/Dockerfile
index 6cc799d..4aaf949 100644
--- a/drupal_9.4-apache-buster/Dockerfile
+++ b/drupal_9.4-php8.2-fpm/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-apache-buster
+FROM php:8.2-fpm-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9.4-apache-buster/Dockerfile b/drupal_9.4-php8.2/Dockerfile
similarity index 93%
rename from drupal_9.4-apache-buster/Dockerfile
rename to drupal_9.4-php8.2/Dockerfile
index 6cc799d..91b9f9b 100644
--- a/drupal_9.4-apache-buster/Dockerfile
+++ b/drupal_9.4-php8.2/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-apache-buster
+FROM php:8.2-apache-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9.4/Dockerfile b/drupal_9.4/Dockerfile
index afcff25..d809ae0 100644
--- a/drupal_9.4/Dockerfile
+++ b/drupal_9.4/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-apache-bullseye
+FROM php:8.1-apache-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_9/Dockerfile b/drupal_9/Dockerfile
index 45b19a3..13314f4 100644
--- a/drupal_9/Dockerfile
+++ b/drupal_9/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-apache-bullseye
+FROM php:8.1-apache-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_latest/Dockerfile b/drupal_apache-bullseye/Dockerfile
similarity index 94%
copy from drupal_latest/Dockerfile
copy to drupal_apache-bullseye/Dockerfile
index 5f2e200..b16a712 100644
--- a/drupal_latest/Dockerfile
+++ b/drupal_apache-bullseye/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_apache-buster/Dockerfile b/drupal_fpm-bullseye/Dockerfile
similarity index 93%
rename from drupal_apache-buster/Dockerfile
rename to drupal_fpm-bullseye/Dockerfile
index bf1896b..492c71b 100644
--- a/drupal_apache-buster/Dockerfile
+++ b/drupal_fpm-bullseye/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.2-apache-buster
+FROM php:8.2-fpm-bullseye
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_fpm/Dockerfile b/drupal_fpm/Dockerfile
index c16e72b..752c9e5 100644
--- a/drupal_fpm/Dockerfile
+++ b/drupal_fpm/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.2-fpm-bullseye
+FROM php:8.2-fpm-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_latest/Dockerfile b/drupal_latest/Dockerfile
index 5f2e200..e6c5dd8 100644
--- a/drupal_latest/Dockerfile
+++ b/drupal_latest/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.2-apache-bullseye
+FROM php:8.2-apache-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_php8.1/Dockerfile b/drupal_php8.1-apache-bullseye/Dockerfile
similarity index 94%
copy from drupal_php8.1/Dockerfile
copy to drupal_php8.1-apache-bullseye/Dockerfile
index fced652..544fb2c 100644
--- a/drupal_php8.1/Dockerfile
+++ b/drupal_php8.1-apache-bullseye/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_php8.1-apache-buster/Dockerfile b/drupal_php8.1-apache-buster/Dockerfile
deleted file mode 100644
index 78c6a01..0000000
diff --git a/drupal_fpm-buster/Dockerfile b/drupal_php8.1-fpm-bullseye/Dockerfile
similarity index 93%
rename from drupal_fpm-buster/Dockerfile
rename to drupal_php8.1-fpm-bullseye/Dockerfile
index 3095b66..a7e8d9d 100644
--- a/drupal_fpm-buster/Dockerfile
+++ b/drupal_php8.1-fpm-bullseye/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.2-fpm-buster
+FROM php:8.1-fpm-bullseye
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_php8.1-fpm-buster/Dockerfile b/drupal_php8.1-fpm-buster/Dockerfile
deleted file mode 100644
index 07a713d..0000000
diff --git a/drupal_php8.1-fpm/Dockerfile b/drupal_php8.1-fpm/Dockerfile
index 3412408..35e5861 100644
--- a/drupal_php8.1-fpm/Dockerfile
+++ b/drupal_php8.1-fpm/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-fpm-bullseye
+FROM php:8.1-fpm-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \
diff --git a/drupal_php8.1/Dockerfile b/drupal_php8.1/Dockerfile
index fced652..ab6303f 100644
--- a/drupal_php8.1/Dockerfile
+++ b/drupal_php8.1/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-apache-bullseye
+FROM php:8.1-apache-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
@@ -44,7 +44,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query -S \
 		| cut -d: -f1 \

Relevant Maintainers:

@yosifkit yosifkit merged commit 73fc255 into docker-library:master Jun 22, 2023
68 checks passed
@yosifkit yosifkit deleted the drupal branch June 22, 2023 22:33
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.

None yet

3 participants