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 php #18076

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Update php #18076

merged 1 commit into from
Dec 11, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 11, 2024

Changes:

Changes:

- docker-library/php@a0644559: Merge pull request docker-library/php#1552 from jnoordsij/alpine3.21
- docker-library/php@45cfafc3: Add patches for Alpine/8.1 builds
- docker-library/php@aa678aea: Add Alpine 3.21 and drop 3.19
@tianon tianon requested a review from a team as a code owner December 11, 2024 19:32
Copy link

Diff for d82984f:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6924bea..1a450ad 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -11,16 +11,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: fe4d130db0611370ec9b6679aaff042a019bb9b5
 Directory: 8.1/bullseye/apache
 
-Tags: 8.1.31-cli-alpine3.19, 8.1-cli-alpine3.19, 8.1.31-alpine3.19, 8.1-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: fe4d130db0611370ec9b6679aaff042a019bb9b5
-Directory: 8.1/alpine3.19/cli
-
-Tags: 8.1.31-cli-alpine3.20, 8.1-cli-alpine3.20, 8.1.31-alpine3.20, 8.1-alpine3.20, 8.1.31-cli-alpine, 8.1-cli-alpine, 8.1.31-alpine, 8.1-alpine
+Tags: 8.1.31-cli-alpine3.20, 8.1-cli-alpine3.20, 8.1.31-alpine3.20, 8.1-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: fe4d130db0611370ec9b6679aaff042a019bb9b5
+GitCommit: 45cfafc333513e71d34191c7ffc8608e1428a96f
 Directory: 8.1/alpine3.20/cli
 
+Tags: 8.1.31-cli-alpine3.21, 8.1-cli-alpine3.21, 8.1.31-alpine3.21, 8.1-alpine3.21, 8.1.31-cli-alpine, 8.1-cli-alpine, 8.1.31-alpine, 8.1-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 45cfafc333513e71d34191c7ffc8608e1428a96f
+Directory: 8.1/alpine3.21/cli
+
 Tags: 8.1.31-cli-bookworm, 8.1-cli-bookworm, 8.1.31-bookworm, 8.1-bookworm, 8.1.31-cli, 8.1-cli, 8.1.31, 8.1
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: fe4d130db0611370ec9b6679aaff042a019bb9b5
@@ -31,16 +31,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: fe4d130db0611370ec9b6679aaff042a019bb9b5
 Directory: 8.1/bullseye/cli
 
-Tags: 8.1.31-fpm-alpine3.19, 8.1-fpm-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: fe4d130db0611370ec9b6679aaff042a019bb9b5
-Directory: 8.1/alpine3.19/fpm
-
-Tags: 8.1.31-fpm-alpine3.20, 8.1-fpm-alpine3.20, 8.1.31-fpm-alpine, 8.1-fpm-alpine
+Tags: 8.1.31-fpm-alpine3.20, 8.1-fpm-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: fe4d130db0611370ec9b6679aaff042a019bb9b5
+GitCommit: 45cfafc333513e71d34191c7ffc8608e1428a96f
 Directory: 8.1/alpine3.20/fpm
 
+Tags: 8.1.31-fpm-alpine3.21, 8.1-fpm-alpine3.21, 8.1.31-fpm-alpine, 8.1-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 45cfafc333513e71d34191c7ffc8608e1428a96f
+Directory: 8.1/alpine3.21/fpm
+
 Tags: 8.1.31-fpm-bookworm, 8.1-fpm-bookworm, 8.1.31-fpm, 8.1-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: fe4d130db0611370ec9b6679aaff042a019bb9b5
@@ -51,16 +51,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: fe4d130db0611370ec9b6679aaff042a019bb9b5
 Directory: 8.1/bullseye/fpm
 
-Tags: 8.1.31-zts-alpine3.19, 8.1-zts-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: fe4d130db0611370ec9b6679aaff042a019bb9b5
-Directory: 8.1/alpine3.19/zts
-
-Tags: 8.1.31-zts-alpine3.20, 8.1-zts-alpine3.20, 8.1.31-zts-alpine, 8.1-zts-alpine
+Tags: 8.1.31-zts-alpine3.20, 8.1-zts-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: fe4d130db0611370ec9b6679aaff042a019bb9b5
+GitCommit: 45cfafc333513e71d34191c7ffc8608e1428a96f
 Directory: 8.1/alpine3.20/zts
 
+Tags: 8.1.31-zts-alpine3.21, 8.1-zts-alpine3.21, 8.1.31-zts-alpine, 8.1-zts-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 45cfafc333513e71d34191c7ffc8608e1428a96f
+Directory: 8.1/alpine3.21/zts
+
 Tags: 8.1.31-zts-bookworm, 8.1-zts-bookworm, 8.1.31-zts, 8.1-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: fe4d130db0611370ec9b6679aaff042a019bb9b5
@@ -81,16 +81,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: bc48addcd1436fdef4a69e6009794f2ac372e878
 Directory: 8.2/bullseye/apache
 
-Tags: 8.2.26-cli-alpine3.19, 8.2-cli-alpine3.19, 8.2.26-alpine3.19, 8.2-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: bc48addcd1436fdef4a69e6009794f2ac372e878
-Directory: 8.2/alpine3.19/cli
-
-Tags: 8.2.26-cli-alpine3.20, 8.2-cli-alpine3.20, 8.2.26-alpine3.20, 8.2-alpine3.20, 8.2.26-cli-alpine, 8.2-cli-alpine, 8.2.26-alpine, 8.2-alpine
+Tags: 8.2.26-cli-alpine3.20, 8.2-cli-alpine3.20, 8.2.26-alpine3.20, 8.2-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: bc48addcd1436fdef4a69e6009794f2ac372e878
 Directory: 8.2/alpine3.20/cli
 
+Tags: 8.2.26-cli-alpine3.21, 8.2-cli-alpine3.21, 8.2.26-alpine3.21, 8.2-alpine3.21, 8.2.26-cli-alpine, 8.2-cli-alpine, 8.2.26-alpine, 8.2-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.2/alpine3.21/cli
+
 Tags: 8.2.26-cli-bookworm, 8.2-cli-bookworm, 8.2.26-bookworm, 8.2-bookworm, 8.2.26-cli, 8.2-cli, 8.2.26, 8.2
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: bc48addcd1436fdef4a69e6009794f2ac372e878
@@ -101,16 +101,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: bc48addcd1436fdef4a69e6009794f2ac372e878
 Directory: 8.2/bullseye/cli
 
-Tags: 8.2.26-fpm-alpine3.19, 8.2-fpm-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: bc48addcd1436fdef4a69e6009794f2ac372e878
-Directory: 8.2/alpine3.19/fpm
-
-Tags: 8.2.26-fpm-alpine3.20, 8.2-fpm-alpine3.20, 8.2.26-fpm-alpine, 8.2-fpm-alpine
+Tags: 8.2.26-fpm-alpine3.20, 8.2-fpm-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: bc48addcd1436fdef4a69e6009794f2ac372e878
 Directory: 8.2/alpine3.20/fpm
 
+Tags: 8.2.26-fpm-alpine3.21, 8.2-fpm-alpine3.21, 8.2.26-fpm-alpine, 8.2-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.2/alpine3.21/fpm
+
 Tags: 8.2.26-fpm-bookworm, 8.2-fpm-bookworm, 8.2.26-fpm, 8.2-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: bc48addcd1436fdef4a69e6009794f2ac372e878
@@ -121,16 +121,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: bc48addcd1436fdef4a69e6009794f2ac372e878
 Directory: 8.2/bullseye/fpm
 
-Tags: 8.2.26-zts-alpine3.19, 8.2-zts-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: bc48addcd1436fdef4a69e6009794f2ac372e878
-Directory: 8.2/alpine3.19/zts
-
-Tags: 8.2.26-zts-alpine3.20, 8.2-zts-alpine3.20, 8.2.26-zts-alpine, 8.2-zts-alpine
+Tags: 8.2.26-zts-alpine3.20, 8.2-zts-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: bc48addcd1436fdef4a69e6009794f2ac372e878
 Directory: 8.2/alpine3.20/zts
 
+Tags: 8.2.26-zts-alpine3.21, 8.2-zts-alpine3.21, 8.2.26-zts-alpine, 8.2-zts-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.2/alpine3.21/zts
+
 Tags: 8.2.26-zts-bookworm, 8.2-zts-bookworm, 8.2.26-zts, 8.2-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: bc48addcd1436fdef4a69e6009794f2ac372e878
@@ -151,16 +151,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: c33f511aa7d899f4ecabcb527d3854396ab3d6c0
 Directory: 8.2-rc/bullseye/apache
 
-Tags: 8.2.27RC1-cli-alpine3.19, 8.2-rc-cli-alpine3.19, 8.2.27RC1-alpine3.19, 8.2-rc-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c33f511aa7d899f4ecabcb527d3854396ab3d6c0
-Directory: 8.2-rc/alpine3.19/cli
-
-Tags: 8.2.27RC1-cli-alpine3.20, 8.2-rc-cli-alpine3.20, 8.2.27RC1-alpine3.20, 8.2-rc-alpine3.20, 8.2.27RC1-cli-alpine, 8.2-rc-cli-alpine, 8.2.27RC1-alpine, 8.2-rc-alpine
+Tags: 8.2.27RC1-cli-alpine3.20, 8.2-rc-cli-alpine3.20, 8.2.27RC1-alpine3.20, 8.2-rc-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: c33f511aa7d899f4ecabcb527d3854396ab3d6c0
 Directory: 8.2-rc/alpine3.20/cli
 
+Tags: 8.2.27RC1-cli-alpine3.21, 8.2-rc-cli-alpine3.21, 8.2.27RC1-alpine3.21, 8.2-rc-alpine3.21, 8.2.27RC1-cli-alpine, 8.2-rc-cli-alpine, 8.2.27RC1-alpine, 8.2-rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.2-rc/alpine3.21/cli
+
 Tags: 8.2.27RC1-cli-bookworm, 8.2-rc-cli-bookworm, 8.2.27RC1-bookworm, 8.2-rc-bookworm, 8.2.27RC1-cli, 8.2-rc-cli, 8.2.27RC1, 8.2-rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: c33f511aa7d899f4ecabcb527d3854396ab3d6c0
@@ -171,16 +171,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: c33f511aa7d899f4ecabcb527d3854396ab3d6c0
 Directory: 8.2-rc/bullseye/cli
 
-Tags: 8.2.27RC1-fpm-alpine3.19, 8.2-rc-fpm-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c33f511aa7d899f4ecabcb527d3854396ab3d6c0
-Directory: 8.2-rc/alpine3.19/fpm
-
-Tags: 8.2.27RC1-fpm-alpine3.20, 8.2-rc-fpm-alpine3.20, 8.2.27RC1-fpm-alpine, 8.2-rc-fpm-alpine
+Tags: 8.2.27RC1-fpm-alpine3.20, 8.2-rc-fpm-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: c33f511aa7d899f4ecabcb527d3854396ab3d6c0
 Directory: 8.2-rc/alpine3.20/fpm
 
+Tags: 8.2.27RC1-fpm-alpine3.21, 8.2-rc-fpm-alpine3.21, 8.2.27RC1-fpm-alpine, 8.2-rc-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.2-rc/alpine3.21/fpm
+
 Tags: 8.2.27RC1-fpm-bookworm, 8.2-rc-fpm-bookworm, 8.2.27RC1-fpm, 8.2-rc-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: c33f511aa7d899f4ecabcb527d3854396ab3d6c0
@@ -191,16 +191,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: c33f511aa7d899f4ecabcb527d3854396ab3d6c0
 Directory: 8.2-rc/bullseye/fpm
 
-Tags: 8.2.27RC1-zts-alpine3.19, 8.2-rc-zts-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c33f511aa7d899f4ecabcb527d3854396ab3d6c0
-Directory: 8.2-rc/alpine3.19/zts
-
-Tags: 8.2.27RC1-zts-alpine3.20, 8.2-rc-zts-alpine3.20, 8.2.27RC1-zts-alpine, 8.2-rc-zts-alpine
+Tags: 8.2.27RC1-zts-alpine3.20, 8.2-rc-zts-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: c33f511aa7d899f4ecabcb527d3854396ab3d6c0
 Directory: 8.2-rc/alpine3.20/zts
 
+Tags: 8.2.27RC1-zts-alpine3.21, 8.2-rc-zts-alpine3.21, 8.2.27RC1-zts-alpine, 8.2-rc-zts-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.2-rc/alpine3.21/zts
+
 Tags: 8.2.27RC1-zts-bookworm, 8.2-rc-zts-bookworm, 8.2.27RC1-zts, 8.2-rc-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: c33f511aa7d899f4ecabcb527d3854396ab3d6c0
@@ -221,16 +221,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: e324a7accd4df1646f4a1acd99647fb419a14c66
 Directory: 8.3/bullseye/apache
 
-Tags: 8.3.14-cli-alpine3.19, 8.3-cli-alpine3.19, 8.3.14-alpine3.19, 8.3-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e324a7accd4df1646f4a1acd99647fb419a14c66
-Directory: 8.3/alpine3.19/cli
-
-Tags: 8.3.14-cli-alpine3.20, 8.3-cli-alpine3.20, 8.3.14-alpine3.20, 8.3-alpine3.20, 8.3.14-cli-alpine, 8.3-cli-alpine, 8.3.14-alpine, 8.3-alpine
+Tags: 8.3.14-cli-alpine3.20, 8.3-cli-alpine3.20, 8.3.14-alpine3.20, 8.3-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: e324a7accd4df1646f4a1acd99647fb419a14c66
 Directory: 8.3/alpine3.20/cli
 
+Tags: 8.3.14-cli-alpine3.21, 8.3-cli-alpine3.21, 8.3.14-alpine3.21, 8.3-alpine3.21, 8.3.14-cli-alpine, 8.3-cli-alpine, 8.3.14-alpine, 8.3-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.3/alpine3.21/cli
+
 Tags: 8.3.14-cli-bookworm, 8.3-cli-bookworm, 8.3.14-bookworm, 8.3-bookworm, 8.3.14-cli, 8.3-cli, 8.3.14, 8.3
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: e324a7accd4df1646f4a1acd99647fb419a14c66
@@ -241,16 +241,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: e324a7accd4df1646f4a1acd99647fb419a14c66
 Directory: 8.3/bullseye/cli
 
-Tags: 8.3.14-fpm-alpine3.19, 8.3-fpm-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e324a7accd4df1646f4a1acd99647fb419a14c66
-Directory: 8.3/alpine3.19/fpm
-
-Tags: 8.3.14-fpm-alpine3.20, 8.3-fpm-alpine3.20, 8.3.14-fpm-alpine, 8.3-fpm-alpine
+Tags: 8.3.14-fpm-alpine3.20, 8.3-fpm-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: e324a7accd4df1646f4a1acd99647fb419a14c66
 Directory: 8.3/alpine3.20/fpm
 
+Tags: 8.3.14-fpm-alpine3.21, 8.3-fpm-alpine3.21, 8.3.14-fpm-alpine, 8.3-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.3/alpine3.21/fpm
+
 Tags: 8.3.14-fpm-bookworm, 8.3-fpm-bookworm, 8.3.14-fpm, 8.3-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: e324a7accd4df1646f4a1acd99647fb419a14c66
@@ -261,16 +261,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: e324a7accd4df1646f4a1acd99647fb419a14c66
 Directory: 8.3/bullseye/fpm
 
-Tags: 8.3.14-zts-alpine3.19, 8.3-zts-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e324a7accd4df1646f4a1acd99647fb419a14c66
-Directory: 8.3/alpine3.19/zts
-
-Tags: 8.3.14-zts-alpine3.20, 8.3-zts-alpine3.20, 8.3.14-zts-alpine, 8.3-zts-alpine
+Tags: 8.3.14-zts-alpine3.20, 8.3-zts-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: e324a7accd4df1646f4a1acd99647fb419a14c66
 Directory: 8.3/alpine3.20/zts
 
+Tags: 8.3.14-zts-alpine3.21, 8.3-zts-alpine3.21, 8.3.14-zts-alpine, 8.3-zts-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.3/alpine3.21/zts
+
 Tags: 8.3.14-zts-bookworm, 8.3-zts-bookworm, 8.3.14-zts, 8.3-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: e324a7accd4df1646f4a1acd99647fb419a14c66
@@ -291,16 +291,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 31175c2b6608cbd9075c0ea00b7942d4aff59d72
 Directory: 8.3-rc/bullseye/apache
 
-Tags: 8.3.15RC1-cli-alpine3.19, 8.3-rc-cli-alpine3.19, 8.3.15RC1-alpine3.19, 8.3-rc-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 31175c2b6608cbd9075c0ea00b7942d4aff59d72
-Directory: 8.3-rc/alpine3.19/cli
-
-Tags: 8.3.15RC1-cli-alpine3.20, 8.3-rc-cli-alpine3.20, 8.3.15RC1-alpine3.20, 8.3-rc-alpine3.20, 8.3.15RC1-cli-alpine, 8.3-rc-cli-alpine, 8.3.15RC1-alpine, 8.3-rc-alpine
+Tags: 8.3.15RC1-cli-alpine3.20, 8.3-rc-cli-alpine3.20, 8.3.15RC1-alpine3.20, 8.3-rc-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 31175c2b6608cbd9075c0ea00b7942d4aff59d72
 Directory: 8.3-rc/alpine3.20/cli
 
+Tags: 8.3.15RC1-cli-alpine3.21, 8.3-rc-cli-alpine3.21, 8.3.15RC1-alpine3.21, 8.3-rc-alpine3.21, 8.3.15RC1-cli-alpine, 8.3-rc-cli-alpine, 8.3.15RC1-alpine, 8.3-rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.3-rc/alpine3.21/cli
+
 Tags: 8.3.15RC1-cli-bookworm, 8.3-rc-cli-bookworm, 8.3.15RC1-bookworm, 8.3-rc-bookworm, 8.3.15RC1-cli, 8.3-rc-cli, 8.3.15RC1, 8.3-rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 31175c2b6608cbd9075c0ea00b7942d4aff59d72
@@ -311,16 +311,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 31175c2b6608cbd9075c0ea00b7942d4aff59d72
 Directory: 8.3-rc/bullseye/cli
 
-Tags: 8.3.15RC1-fpm-alpine3.19, 8.3-rc-fpm-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 31175c2b6608cbd9075c0ea00b7942d4aff59d72
-Directory: 8.3-rc/alpine3.19/fpm
-
-Tags: 8.3.15RC1-fpm-alpine3.20, 8.3-rc-fpm-alpine3.20, 8.3.15RC1-fpm-alpine, 8.3-rc-fpm-alpine
+Tags: 8.3.15RC1-fpm-alpine3.20, 8.3-rc-fpm-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 31175c2b6608cbd9075c0ea00b7942d4aff59d72
 Directory: 8.3-rc/alpine3.20/fpm
 
+Tags: 8.3.15RC1-fpm-alpine3.21, 8.3-rc-fpm-alpine3.21, 8.3.15RC1-fpm-alpine, 8.3-rc-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.3-rc/alpine3.21/fpm
+
 Tags: 8.3.15RC1-fpm-bookworm, 8.3-rc-fpm-bookworm, 8.3.15RC1-fpm, 8.3-rc-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 31175c2b6608cbd9075c0ea00b7942d4aff59d72
@@ -331,16 +331,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 31175c2b6608cbd9075c0ea00b7942d4aff59d72
 Directory: 8.3-rc/bullseye/fpm
 
-Tags: 8.3.15RC1-zts-alpine3.19, 8.3-rc-zts-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 31175c2b6608cbd9075c0ea00b7942d4aff59d72
-Directory: 8.3-rc/alpine3.19/zts
-
-Tags: 8.3.15RC1-zts-alpine3.20, 8.3-rc-zts-alpine3.20, 8.3.15RC1-zts-alpine, 8.3-rc-zts-alpine
+Tags: 8.3.15RC1-zts-alpine3.20, 8.3-rc-zts-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 31175c2b6608cbd9075c0ea00b7942d4aff59d72
 Directory: 8.3-rc/alpine3.20/zts
 
+Tags: 8.3.15RC1-zts-alpine3.21, 8.3-rc-zts-alpine3.21, 8.3.15RC1-zts-alpine, 8.3-rc-zts-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.3-rc/alpine3.21/zts
+
 Tags: 8.3.15RC1-zts-bookworm, 8.3-rc-zts-bookworm, 8.3.15RC1-zts, 8.3-rc-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 31175c2b6608cbd9075c0ea00b7942d4aff59d72
@@ -361,16 +361,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 193d0e2a61ace10dcd480480a3d91f3d358d0406
 Directory: 8.4/bullseye/apache
 
-Tags: 8.4.1-cli-alpine3.19, 8.4-cli-alpine3.19, 8-cli-alpine3.19, cli-alpine3.19, 8.4.1-alpine3.19, 8.4-alpine3.19, 8-alpine3.19, alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 193d0e2a61ace10dcd480480a3d91f3d358d0406
-Directory: 8.4/alpine3.19/cli
-
-Tags: 8.4.1-cli-alpine3.20, 8.4-cli-alpine3.20, 8-cli-alpine3.20, cli-alpine3.20, 8.4.1-alpine3.20, 8.4-alpine3.20, 8-alpine3.20, alpine3.20, 8.4.1-cli-alpine, 8.4-cli-alpine, 8-cli-alpine, cli-alpine, 8.4.1-alpine, 8.4-alpine, 8-alpine, alpine
+Tags: 8.4.1-cli-alpine3.20, 8.4-cli-alpine3.20, 8-cli-alpine3.20, cli-alpine3.20, 8.4.1-alpine3.20, 8.4-alpine3.20, 8-alpine3.20, alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 193d0e2a61ace10dcd480480a3d91f3d358d0406
 Directory: 8.4/alpine3.20/cli
 
+Tags: 8.4.1-cli-alpine3.21, 8.4-cli-alpine3.21, 8-cli-alpine3.21, cli-alpine3.21, 8.4.1-alpine3.21, 8.4-alpine3.21, 8-alpine3.21, alpine3.21, 8.4.1-cli-alpine, 8.4-cli-alpine, 8-cli-alpine, cli-alpine, 8.4.1-alpine, 8.4-alpine, 8-alpine, alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.4/alpine3.21/cli
+
 Tags: 8.4.1-cli-bookworm, 8.4-cli-bookworm, 8-cli-bookworm, cli-bookworm, 8.4.1-bookworm, 8.4-bookworm, 8-bookworm, bookworm, 8.4.1-cli, 8.4-cli, 8-cli, cli, 8.4.1, 8.4, 8, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 193d0e2a61ace10dcd480480a3d91f3d358d0406
@@ -381,16 +381,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 193d0e2a61ace10dcd480480a3d91f3d358d0406
 Directory: 8.4/bullseye/cli
 
-Tags: 8.4.1-fpm-alpine3.19, 8.4-fpm-alpine3.19, 8-fpm-alpine3.19, fpm-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 193d0e2a61ace10dcd480480a3d91f3d358d0406
-Directory: 8.4/alpine3.19/fpm
-
-Tags: 8.4.1-fpm-alpine3.20, 8.4-fpm-alpine3.20, 8-fpm-alpine3.20, fpm-alpine3.20, 8.4.1-fpm-alpine, 8.4-fpm-alpine, 8-fpm-alpine, fpm-alpine
+Tags: 8.4.1-fpm-alpine3.20, 8.4-fpm-alpine3.20, 8-fpm-alpine3.20, fpm-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 193d0e2a61ace10dcd480480a3d91f3d358d0406
 Directory: 8.4/alpine3.20/fpm
 
+Tags: 8.4.1-fpm-alpine3.21, 8.4-fpm-alpine3.21, 8-fpm-alpine3.21, fpm-alpine3.21, 8.4.1-fpm-alpine, 8.4-fpm-alpine, 8-fpm-alpine, fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.4/alpine3.21/fpm
+
 Tags: 8.4.1-fpm-bookworm, 8.4-fpm-bookworm, 8-fpm-bookworm, fpm-bookworm, 8.4.1-fpm, 8.4-fpm, 8-fpm, fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 193d0e2a61ace10dcd480480a3d91f3d358d0406
@@ -401,16 +401,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 193d0e2a61ace10dcd480480a3d91f3d358d0406
 Directory: 8.4/bullseye/fpm
 
-Tags: 8.4.1-zts-alpine3.19, 8.4-zts-alpine3.19, 8-zts-alpine3.19, zts-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 193d0e2a61ace10dcd480480a3d91f3d358d0406
-Directory: 8.4/alpine3.19/zts
-
-Tags: 8.4.1-zts-alpine3.20, 8.4-zts-alpine3.20, 8-zts-alpine3.20, zts-alpine3.20, 8.4.1-zts-alpine, 8.4-zts-alpine, 8-zts-alpine, zts-alpine
+Tags: 8.4.1-zts-alpine3.20, 8.4-zts-alpine3.20, 8-zts-alpine3.20, zts-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 193d0e2a61ace10dcd480480a3d91f3d358d0406
 Directory: 8.4/alpine3.20/zts
 
+Tags: 8.4.1-zts-alpine3.21, 8.4-zts-alpine3.21, 8-zts-alpine3.21, zts-alpine3.21, 8.4.1-zts-alpine, 8.4-zts-alpine, 8-zts-alpine, zts-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.4/alpine3.21/zts
+
 Tags: 8.4.1-zts-bookworm, 8.4-zts-bookworm, 8-zts-bookworm, zts-bookworm, 8.4.1-zts, 8.4-zts, 8-zts, zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 193d0e2a61ace10dcd480480a3d91f3d358d0406
@@ -431,16 +431,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 0b6d745a64cdbeccc92571f3ae6dfebe0a43b224
 Directory: 8.4-rc/bullseye/apache
 
-Tags: 8.4.2RC1-cli-alpine3.19, 8.4-rc-cli-alpine3.19, 8.4.2RC1-alpine3.19, 8.4-rc-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0b6d745a64cdbeccc92571f3ae6dfebe0a43b224
-Directory: 8.4-rc/alpine3.19/cli
-
-Tags: 8.4.2RC1-cli-alpine3.20, 8.4-rc-cli-alpine3.20, 8.4.2RC1-alpine3.20, 8.4-rc-alpine3.20, 8.4.2RC1-cli-alpine, 8.4-rc-cli-alpine, 8.4.2RC1-alpine, 8.4-rc-alpine
+Tags: 8.4.2RC1-cli-alpine3.20, 8.4-rc-cli-alpine3.20, 8.4.2RC1-alpine3.20, 8.4-rc-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 0b6d745a64cdbeccc92571f3ae6dfebe0a43b224
 Directory: 8.4-rc/alpine3.20/cli
 
+Tags: 8.4.2RC1-cli-alpine3.21, 8.4-rc-cli-alpine3.21, 8.4.2RC1-alpine3.21, 8.4-rc-alpine3.21, 8.4.2RC1-cli-alpine, 8.4-rc-cli-alpine, 8.4.2RC1-alpine, 8.4-rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.4-rc/alpine3.21/cli
+
 Tags: 8.4.2RC1-cli-bookworm, 8.4-rc-cli-bookworm, 8.4.2RC1-bookworm, 8.4-rc-bookworm, 8.4.2RC1-cli, 8.4-rc-cli, 8.4.2RC1, 8.4-rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 0b6d745a64cdbeccc92571f3ae6dfebe0a43b224
@@ -451,16 +451,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 0b6d745a64cdbeccc92571f3ae6dfebe0a43b224
 Directory: 8.4-rc/bullseye/cli
 
-Tags: 8.4.2RC1-fpm-alpine3.19, 8.4-rc-fpm-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0b6d745a64cdbeccc92571f3ae6dfebe0a43b224
-Directory: 8.4-rc/alpine3.19/fpm
-
-Tags: 8.4.2RC1-fpm-alpine3.20, 8.4-rc-fpm-alpine3.20, 8.4.2RC1-fpm-alpine, 8.4-rc-fpm-alpine
+Tags: 8.4.2RC1-fpm-alpine3.20, 8.4-rc-fpm-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 0b6d745a64cdbeccc92571f3ae6dfebe0a43b224
 Directory: 8.4-rc/alpine3.20/fpm
 
+Tags: 8.4.2RC1-fpm-alpine3.21, 8.4-rc-fpm-alpine3.21, 8.4.2RC1-fpm-alpine, 8.4-rc-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.4-rc/alpine3.21/fpm
+
 Tags: 8.4.2RC1-fpm-bookworm, 8.4-rc-fpm-bookworm, 8.4.2RC1-fpm, 8.4-rc-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 0b6d745a64cdbeccc92571f3ae6dfebe0a43b224
@@ -471,16 +471,16 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 0b6d745a64cdbeccc92571f3ae6dfebe0a43b224
 Directory: 8.4-rc/bullseye/fpm
 
-Tags: 8.4.2RC1-zts-alpine3.19, 8.4-rc-zts-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0b6d745a64cdbeccc92571f3ae6dfebe0a43b224
-Directory: 8.4-rc/alpine3.19/zts
-
-Tags: 8.4.2RC1-zts-alpine3.20, 8.4-rc-zts-alpine3.20, 8.4.2RC1-zts-alpine, 8.4-rc-zts-alpine
+Tags: 8.4.2RC1-zts-alpine3.20, 8.4-rc-zts-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 0b6d745a64cdbeccc92571f3ae6dfebe0a43b224
 Directory: 8.4-rc/alpine3.20/zts
 
+Tags: 8.4.2RC1-zts-alpine3.21, 8.4-rc-zts-alpine3.21, 8.4.2RC1-zts-alpine, 8.4-rc-zts-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: aa678aea64417b34fbcaaea23c3293e1fb2f3c8a
+Directory: 8.4-rc/alpine3.21/zts
+
 Tags: 8.4.2RC1-zts-bookworm, 8.4-rc-zts-bookworm, 8.4.2RC1-zts, 8.4-rc-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 0b6d745a64cdbeccc92571f3ae6dfebe0a43b224
diff --git a/_bashbrew-list b/_bashbrew-list
index 150f95e..cfc7caa 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
 php:8
 php:8-alpine
-php:8-alpine3.19
 php:8-alpine3.20
+php:8-alpine3.21
 php:8-apache
 php:8-apache-bookworm
 php:8-apache-bullseye
@@ -9,26 +9,26 @@ php:8-bookworm
 php:8-bullseye
 php:8-cli
 php:8-cli-alpine
-php:8-cli-alpine3.19
 php:8-cli-alpine3.20
+php:8-cli-alpine3.21
 php:8-cli-bookworm
 php:8-cli-bullseye
 php:8-fpm
 php:8-fpm-alpine
-php:8-fpm-alpine3.19
 php:8-fpm-alpine3.20
+php:8-fpm-alpine3.21
 php:8-fpm-bookworm
 php:8-fpm-bullseye
 php:8-zts
 php:8-zts-alpine
-php:8-zts-alpine3.19
 php:8-zts-alpine3.20
+php:8-zts-alpine3.21
 php:8-zts-bookworm
 php:8-zts-bullseye
 php:8.1
 php:8.1-alpine
-php:8.1-alpine3.19
 php:8.1-alpine3.20
+php:8.1-alpine3.21
 php:8.1-apache
 php:8.1-apache-bookworm
 php:8.1-apache-bullseye
@@ -36,26 +36,26 @@ php:8.1-bookworm
 php:8.1-bullseye
 php:8.1-cli
 php:8.1-cli-alpine
-php:8.1-cli-alpine3.19
 php:8.1-cli-alpine3.20
+php:8.1-cli-alpine3.21
 php:8.1-cli-bookworm
 php:8.1-cli-bullseye
 php:8.1-fpm
 php:8.1-fpm-alpine
-php:8.1-fpm-alpine3.19
 php:8.1-fpm-alpine3.20
+php:8.1-fpm-alpine3.21
 php:8.1-fpm-bookworm
 php:8.1-fpm-bullseye
 php:8.1-zts
 php:8.1-zts-alpine
-php:8.1-zts-alpine3.19
 php:8.1-zts-alpine3.20
+php:8.1-zts-alpine3.21
 php:8.1-zts-bookworm
 php:8.1-zts-bullseye
 php:8.1.31
 php:8.1.31-alpine
-php:8.1.31-alpine3.19
 php:8.1.31-alpine3.20
+php:8.1.31-alpine3.21
 php:8.1.31-apache
 php:8.1.31-apache-bookworm
 php:8.1.31-apache-bullseye
@@ -63,26 +63,26 @@ php:8.1.31-bookworm
 php:8.1.31-bullseye
 php:8.1.31-cli
 php:8.1.31-cli-alpine
-php:8.1.31-cli-alpine3.19
 php:8.1.31-cli-alpine3.20
+php:8.1.31-cli-alpine3.21
 php:8.1.31-cli-bookworm
 php:8.1.31-cli-bullseye
 php:8.1.31-fpm
 php:8.1.31-fpm-alpine
-php:8.1.31-fpm-alpine3.19
 php:8.1.31-fpm-alpine3.20
+php:8.1.31-fpm-alpine3.21
 php:8.1.31-fpm-bookworm
 php:8.1.31-fpm-bullseye
 php:8.1.31-zts
 php:8.1.31-zts-alpine
-php:8.1.31-zts-alpine3.19
 php:8.1.31-zts-alpine3.20
+php:8.1.31-zts-alpine3.21
 php:8.1.31-zts-bookworm
 php:8.1.31-zts-bullseye
 php:8.2
 php:8.2-alpine
-php:8.2-alpine3.19
 php:8.2-alpine3.20
+php:8.2-alpine3.21
 php:8.2-apache
 php:8.2-apache-bookworm
 php:8.2-apache-bullseye
@@ -90,20 +90,20 @@ php:8.2-bookworm
 php:8.2-bullseye
 php:8.2-cli
 php:8.2-cli-alpine
-php:8.2-cli-alpine3.19
 php:8.2-cli-alpine3.20
+php:8.2-cli-alpine3.21
 php:8.2-cli-bookworm
 php:8.2-cli-bullseye
 php:8.2-fpm
 php:8.2-fpm-alpine
-php:8.2-fpm-alpine3.19
 php:8.2-fpm-alpine3.20
+php:8.2-fpm-alpine3.21
 php:8.2-fpm-bookworm
 php:8.2-fpm-bullseye
 php:8.2-rc
 php:8.2-rc-alpine
-php:8.2-rc-alpine3.19
 php:8.2-rc-alpine3.20
+php:8.2-rc-alpine3.21
 php:8.2-rc-apache
 php:8.2-rc-apache-bookworm
 php:8.2-rc-apache-bullseye
@@ -111,32 +111,32 @@ php:8.2-rc-bookworm
 php:8.2-rc-bullseye
 php:8.2-rc-cli
 php:8.2-rc-cli-alpine
-php:8.2-rc-cli-alpine3.19
 php:8.2-rc-cli-alpine3.20
+php:8.2-rc-cli-alpine3.21
 php:8.2-rc-cli-bookworm
 php:8.2-rc-cli-bullseye
 php:8.2-rc-fpm
 php:8.2-rc-fpm-alpine
-php:8.2-rc-fpm-alpine3.19
 php:8.2-rc-fpm-alpine3.20
+php:8.2-rc-fpm-alpine3.21
 php:8.2-rc-fpm-bookworm
 php:8.2-rc-fpm-bullseye
 php:8.2-rc-zts
 php:8.2-rc-zts-alpine
-php:8.2-rc-zts-alpine3.19
 php:8.2-rc-zts-alpine3.20
+php:8.2-rc-zts-alpine3.21
 php:8.2-rc-zts-bookworm
 php:8.2-rc-zts-bullseye
 php:8.2-zts
 php:8.2-zts-alpine
-php:8.2-zts-alpine3.19
 php:8.2-zts-alpine3.20
+php:8.2-zts-alpine3.21
 php:8.2-zts-bookworm
 php:8.2-zts-bullseye
 php:8.2.26
 php:8.2.26-alpine
-php:8.2.26-alpine3.19
 php:8.2.26-alpine3.20
+php:8.2.26-alpine3.21
 php:8.2.26-apache
 php:8.2.26-apache-bookworm
 php:8.2.26-apache-bullseye
@@ -144,26 +144,26 @@ php:8.2.26-bookworm
 php:8.2.26-bullseye
 php:8.2.26-cli
 php:8.2.26-cli-alpine
-php:8.2.26-cli-alpine3.19
 php:8.2.26-cli-alpine3.20
+php:8.2.26-cli-alpine3.21
 php:8.2.26-cli-bookworm
 php:8.2.26-cli-bullseye
 php:8.2.26-fpm
 php:8.2.26-fpm-alpine
-php:8.2.26-fpm-alpine3.19
 php:8.2.26-fpm-alpine3.20
+php:8.2.26-fpm-alpine3.21
 php:8.2.26-fpm-bookworm
 php:8.2.26-fpm-bullseye
 php:8.2.26-zts
 php:8.2.26-zts-alpine
-php:8.2.26-zts-alpine3.19
 php:8.2.26-zts-alpine3.20
+php:8.2.26-zts-alpine3.21
 php:8.2.26-zts-bookworm
 php:8.2.26-zts-bullseye
 php:8.2.27RC1
 php:8.2.27RC1-alpine
-php:8.2.27RC1-alpine3.19
 php:8.2.27RC1-alpine3.20
+php:8.2.27RC1-alpine3.21
 php:8.2.27RC1-apache
 php:8.2.27RC1-apache-bookworm
 php:8.2.27RC1-apache-bullseye
@@ -171,26 +171,26 @@ php:8.2.27RC1-bookworm
 php:8.2.27RC1-bullseye
 php:8.2.27RC1-cli
 php:8.2.27RC1-cli-alpine
-php:8.2.27RC1-cli-alpine3.19
 php:8.2.27RC1-cli-alpine3.20
+php:8.2.27RC1-cli-alpine3.21
 php:8.2.27RC1-cli-bookworm
 php:8.2.27RC1-cli-bullseye
 php:8.2.27RC1-fpm
 php:8.2.27RC1-fpm-alpine
-php:8.2.27RC1-fpm-alpine3.19
 php:8.2.27RC1-fpm-alpine3.20
+php:8.2.27RC1-fpm-alpine3.21
 php:8.2.27RC1-fpm-bookworm
 php:8.2.27RC1-fpm-bullseye
 php:8.2.27RC1-zts
 php:8.2.27RC1-zts-alpine
-php:8.2.27RC1-zts-alpine3.19
 php:8.2.27RC1-zts-alpine3.20
+php:8.2.27RC1-zts-alpine3.21
 php:8.2.27RC1-zts-bookworm
 php:8.2.27RC1-zts-bullseye
 php:8.3
 php:8.3-alpine
-php:8.3-alpine3.19
 php:8.3-alpine3.20
+php:8.3-alpine3.21
 php:8.3-apache
 php:8.3-apache-bookworm
 php:8.3-apache-bullseye
@@ -198,20 +198,20 @@ php:8.3-bookworm
 php:8.3-bullseye
 php:8.3-cli
 php:8.3-cli-alpine
-php:8.3-cli-alpine3.19
 php:8.3-cli-alpine3.20
+php:8.3-cli-alpine3.21
 php:8.3-cli-bookworm
 php:8.3-cli-bullseye
 php:8.3-fpm
 php:8.3-fpm-alpine
-php:8.3-fpm-alpine3.19
 php:8.3-fpm-alpine3.20
+php:8.3-fpm-alpine3.21
 php:8.3-fpm-bookworm
 php:8.3-fpm-bullseye
 php:8.3-rc
 php:8.3-rc-alpine
-php:8.3-rc-alpine3.19
 php:8.3-rc-alpine3.20
+php:8.3-rc-alpine3.21
 php:8.3-rc-apache
 php:8.3-rc-apache-bookworm
 php:8.3-rc-apache-bullseye
@@ -219,32 +219,32 @@ php:8.3-rc-bookworm
 php:8.3-rc-bullseye
 php:8.3-rc-cli
 php:8.3-rc-cli-alpine
-php:8.3-rc-cli-alpine3.19
 php:8.3-rc-cli-alpine3.20
+php:8.3-rc-cli-alpine3.21
 php:8.3-rc-cli-bookworm
 php:8.3-rc-cli-bullseye
 php:8.3-rc-fpm
 php:8.3-rc-fpm-alpine
-php:8.3-rc-fpm-alpine3.19
 php:8.3-rc-fpm-alpine3.20
+php:8.3-rc-fpm-alpine3.21
 php:8.3-rc-fpm-bookworm
 php:8.3-rc-fpm-bullseye
 php:8.3-rc-zts
 php:8.3-rc-zts-alpine
-php:8.3-rc-zts-alpine3.19
 php:8.3-rc-zts-alpine3.20
+php:8.3-rc-zts-alpine3.21
 php:8.3-rc-zts-bookworm
 php:8.3-rc-zts-bullseye
 php:8.3-zts
 php:8.3-zts-alpine
-php:8.3-zts-alpine3.19
 php:8.3-zts-alpine3.20
+php:8.3-zts-alpine3.21
 php:8.3-zts-bookworm
 php:8.3-zts-bullseye
 php:8.3.14
 php:8.3.14-alpine
-php:8.3.14-alpine3.19
 php:8.3.14-alpine3.20
+php:8.3.14-alpine3.21
 php:8.3.14-apache
 php:8.3.14-apache-bookworm
 php:8.3.14-apache-bullseye
@@ -252,26 +252,26 @@ php:8.3.14-bookworm
 php:8.3.14-bullseye
 php:8.3.14-cli
 php:8.3.14-cli-alpine
-php:8.3.14-cli-alpine3.19
 php:8.3.14-cli-alpine3.20
+php:8.3.14-cli-alpine3.21
 php:8.3.14-cli-bookworm
 php:8.3.14-cli-bullseye
 php:8.3.14-fpm
 php:8.3.14-fpm-alpine
-php:8.3.14-fpm-alpine3.19
 php:8.3.14-fpm-alpine3.20
+php:8.3.14-fpm-alpine3.21
 php:8.3.14-fpm-bookworm
 php:8.3.14-fpm-bullseye
 php:8.3.14-zts
 php:8.3.14-zts-alpine
-php:8.3.14-zts-alpine3.19
 php:8.3.14-zts-alpine3.20
+php:8.3.14-zts-alpine3.21
 php:8.3.14-zts-bookworm
 php:8.3.14-zts-bullseye
 php:8.3.15RC1
 php:8.3.15RC1-alpine
-php:8.3.15RC1-alpine3.19
 php:8.3.15RC1-alpine3.20
+php:8.3.15RC1-alpine3.21
 php:8.3.15RC1-apache
 php:8.3.15RC1-apache-bookworm
 php:8.3.15RC1-apache-bullseye
@@ -279,26 +279,26 @@ php:8.3.15RC1-bookworm
 php:8.3.15RC1-bullseye
 php:8.3.15RC1-cli
 php:8.3.15RC1-cli-alpine
-php:8.3.15RC1-cli-alpine3.19
 php:8.3.15RC1-cli-alpine3.20
+php:8.3.15RC1-cli-alpine3.21
 php:8.3.15RC1-cli-bookworm
 php:8.3.15RC1-cli-bullseye
 php:8.3.15RC1-fpm
 php:8.3.15RC1-fpm-alpine
-php:8.3.15RC1-fpm-alpine3.19
 php:8.3.15RC1-fpm-alpine3.20
+php:8.3.15RC1-fpm-alpine3.21
 php:8.3.15RC1-fpm-bookworm
 php:8.3.15RC1-fpm-bullseye
 php:8.3.15RC1-zts
 php:8.3.15RC1-zts-alpine
-php:8.3.15RC1-zts-alpine3.19
 php:8.3.15RC1-zts-alpine3.20
+php:8.3.15RC1-zts-alpine3.21
 php:8.3.15RC1-zts-bookworm
 php:8.3.15RC1-zts-bullseye
 php:8.4
 php:8.4-alpine
-php:8.4-alpine3.19
 php:8.4-alpine3.20
+php:8.4-alpine3.21
 php:8.4-apache
 php:8.4-apache-bookworm
 php:8.4-apache-bullseye
@@ -306,20 +306,20 @@ php:8.4-bookworm
 php:8.4-bullseye
 php:8.4-cli
 php:8.4-cli-alpine
-php:8.4-cli-alpine3.19
 php:8.4-cli-alpine3.20
+php:8.4-cli-alpine3.21
 php:8.4-cli-bookworm
 php:8.4-cli-bullseye
 php:8.4-fpm
 php:8.4-fpm-alpine
-php:8.4-fpm-alpine3.19
 php:8.4-fpm-alpine3.20
+php:8.4-fpm-alpine3.21
 php:8.4-fpm-bookworm
 php:8.4-fpm-bullseye
 php:8.4-rc
 php:8.4-rc-alpine
-php:8.4-rc-alpine3.19
 php:8.4-rc-alpine3.20
+php:8.4-rc-alpine3.21
 php:8.4-rc-apache
 php:8.4-rc-apache-bookworm
 php:8.4-rc-apache-bullseye
@@ -327,32 +327,32 @@ php:8.4-rc-bookworm
 php:8.4-rc-bullseye
 php:8.4-rc-cli
 php:8.4-rc-cli-alpine
-php:8.4-rc-cli-alpine3.19
 php:8.4-rc-cli-alpine3.20
+php:8.4-rc-cli-alpine3.21
 php:8.4-rc-cli-bookworm
 php:8.4-rc-cli-bullseye
 php:8.4-rc-fpm
 php:8.4-rc-fpm-alpine
-php:8.4-rc-fpm-alpine3.19
 php:8.4-rc-fpm-alpine3.20
+php:8.4-rc-fpm-alpine3.21
 php:8.4-rc-fpm-bookworm
 php:8.4-rc-fpm-bullseye
 php:8.4-rc-zts
 php:8.4-rc-zts-alpine
-php:8.4-rc-zts-alpine3.19
 php:8.4-rc-zts-alpine3.20
+php:8.4-rc-zts-alpine3.21
 php:8.4-rc-zts-bookworm
 php:8.4-rc-zts-bullseye
 php:8.4-zts
 php:8.4-zts-alpine
-php:8.4-zts-alpine3.19
 php:8.4-zts-alpine3.20
+php:8.4-zts-alpine3.21
 php:8.4-zts-bookworm
 php:8.4-zts-bullseye
 php:8.4.1
 php:8.4.1-alpine
-php:8.4.1-alpine3.19
 php:8.4.1-alpine3.20
+php:8.4.1-alpine3.21
 php:8.4.1-apache
 php:8.4.1-apache-bookworm
 php:8.4.1-apache-bullseye
@@ -360,26 +360,26 @@ php:8.4.1-bookworm
 php:8.4.1-bullseye
 php:8.4.1-cli
 php:8.4.1-cli-alpine
-php:8.4.1-cli-alpine3.19
 php:8.4.1-cli-alpine3.20
+php:8.4.1-cli-alpine3.21
 php:8.4.1-cli-bookworm
 php:8.4.1-cli-bullseye
 php:8.4.1-fpm
 php:8.4.1-fpm-alpine
-php:8.4.1-fpm-alpine3.19
 php:8.4.1-fpm-alpine3.20
+php:8.4.1-fpm-alpine3.21
 php:8.4.1-fpm-bookworm
 php:8.4.1-fpm-bullseye
 php:8.4.1-zts
 php:8.4.1-zts-alpine
-php:8.4.1-zts-alpine3.19
 php:8.4.1-zts-alpine3.20
+php:8.4.1-zts-alpine3.21
 php:8.4.1-zts-bookworm
 php:8.4.1-zts-bullseye
 php:8.4.2RC1
 php:8.4.2RC1-alpine
-php:8.4.2RC1-alpine3.19
 php:8.4.2RC1-alpine3.20
+php:8.4.2RC1-alpine3.21
 php:8.4.2RC1-apache
 php:8.4.2RC1-apache-bookworm
 php:8.4.2RC1-apache-bullseye
@@ -387,25 +387,25 @@ php:8.4.2RC1-bookworm
 php:8.4.2RC1-bullseye
 php:8.4.2RC1-cli
 php:8.4.2RC1-cli-alpine
-php:8.4.2RC1-cli-alpine3.19
 php:8.4.2RC1-cli-alpine3.20
+php:8.4.2RC1-cli-alpine3.21
 php:8.4.2RC1-cli-bookworm
 php:8.4.2RC1-cli-bullseye
 php:8.4.2RC1-fpm
 php:8.4.2RC1-fpm-alpine
-php:8.4.2RC1-fpm-alpine3.19
 php:8.4.2RC1-fpm-alpine3.20
+php:8.4.2RC1-fpm-alpine3.21
 php:8.4.2RC1-fpm-bookworm
 php:8.4.2RC1-fpm-bullseye
 php:8.4.2RC1-zts
 php:8.4.2RC1-zts-alpine
-php:8.4.2RC1-zts-alpine3.19
 php:8.4.2RC1-zts-alpine3.20
+php:8.4.2RC1-zts-alpine3.21
 php:8.4.2RC1-zts-bookworm
 php:8.4.2RC1-zts-bullseye
 php:alpine
-php:alpine3.19
 php:alpine3.20
+php:alpine3.21
 php:apache
 php:apache-bookworm
 php:apache-bullseye
@@ -413,20 +413,20 @@ php:bookworm
 php:bullseye
 php:cli
 php:cli-alpine
-php:cli-alpine3.19
 php:cli-alpine3.20
+php:cli-alpine3.21
 php:cli-bookworm
 php:cli-bullseye
 php:fpm
 php:fpm-alpine
-php:fpm-alpine3.19
 php:fpm-alpine3.20
+php:fpm-alpine3.21
 php:fpm-bookworm
 php:fpm-bullseye
 php:latest
 php:zts
 php:zts-alpine
-php:zts-alpine3.19
 php:zts-alpine3.20
+php:zts-alpine3.21
 php:zts-bookworm
 php:zts-bullseye
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index c4cf47c..5980b87 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,98 +1,98 @@
 php:8.1
 php:8.1-alpine
-php:8.1-alpine3.19
+php:8.1-alpine3.20
 php:8.1-apache
 php:8.1-apache-bullseye
 php:8.1-bullseye
 php:8.1-fpm
 php:8.1-fpm-alpine
-php:8.1-fpm-alpine3.19
+php:8.1-fpm-alpine3.20
 php:8.1-fpm-bullseye
 php:8.1-zts
 php:8.1-zts-alpine
-php:8.1-zts-alpine3.19
+php:8.1-zts-alpine3.20
 php:8.1-zts-bullseye
 php:8.2
 php:8.2-alpine
-php:8.2-alpine3.19
+php:8.2-alpine3.20
 php:8.2-apache
 php:8.2-apache-bullseye
 php:8.2-bullseye
 php:8.2-fpm
 php:8.2-fpm-alpine
-php:8.2-fpm-alpine3.19
+php:8.2-fpm-alpine3.20
 php:8.2-fpm-bullseye
 php:8.2-rc
 php:8.2-rc-alpine
-php:8.2-rc-alpine3.19
+php:8.2-rc-alpine3.20
 php:8.2-rc-apache
 php:8.2-rc-apache-bullseye
 php:8.2-rc-bullseye
 php:8.2-rc-fpm
 php:8.2-rc-fpm-alpine
-php:8.2-rc-fpm-alpine3.19
+php:8.2-rc-fpm-alpine3.20
 php:8.2-rc-fpm-bullseye
 php:8.2-rc-zts
 php:8.2-rc-zts-alpine
-php:8.2-rc-zts-alpine3.19
+php:8.2-rc-zts-alpine3.20
 php:8.2-rc-zts-bullseye
 php:8.2-zts
 php:8.2-zts-alpine
-php:8.2-zts-alpine3.19
+php:8.2-zts-alpine3.20
 php:8.2-zts-bullseye
 php:8.3
 php:8.3-alpine
-php:8.3-alpine3.19
+php:8.3-alpine3.20
 php:8.3-apache
 php:8.3-apache-bullseye
 php:8.3-bullseye
 php:8.3-fpm
 php:8.3-fpm-alpine
-php:8.3-fpm-alpine3.19
+php:8.3-fpm-alpine3.20
 php:8.3-fpm-bullseye
 php:8.3-rc
 php:8.3-rc-alpine
-php:8.3-rc-alpine3.19
+php:8.3-rc-alpine3.20
 php:8.3-rc-apache
 php:8.3-rc-apache-bullseye
 php:8.3-rc-bullseye
 php:8.3-rc-fpm
 php:8.3-rc-fpm-alpine
-php:8.3-rc-fpm-alpine3.19
+php:8.3-rc-fpm-alpine3.20
 php:8.3-rc-fpm-bullseye
 php:8.3-rc-zts
 php:8.3-rc-zts-alpine
-php:8.3-rc-zts-alpine3.19
+php:8.3-rc-zts-alpine3.20
 php:8.3-rc-zts-bullseye
 php:8.3-zts
 php:8.3-zts-alpine
-php:8.3-zts-alpine3.19
+php:8.3-zts-alpine3.20
 php:8.3-zts-bullseye
 php:8.4-rc
 php:8.4-rc-alpine
-php:8.4-rc-alpine3.19
+php:8.4-rc-alpine3.20
 php:8.4-rc-apache
 php:8.4-rc-apache-bullseye
 php:8.4-rc-bullseye
 php:8.4-rc-fpm
 php:8.4-rc-fpm-alpine
-php:8.4-rc-fpm-alpine3.19
+php:8.4-rc-fpm-alpine3.20
 php:8.4-rc-fpm-bullseye
 php:8.4-rc-zts
 php:8.4-rc-zts-alpine
-php:8.4-rc-zts-alpine3.19
+php:8.4-rc-zts-alpine3.20
 php:8.4-rc-zts-bullseye
 php:alpine
-php:alpine3.19
+php:alpine3.20
 php:apache
 php:apache-bullseye
 php:bullseye
 php:fpm
 php:fpm-alpine
-php:fpm-alpine3.19
+php:fpm-alpine3.20
 php:fpm-bullseye
 php:latest
 php:zts
 php:zts-alpine
-php:zts-alpine3.19
+php:zts-alpine3.20
 php:zts-bullseye
diff --git a/php_8.1-alpine/Dockerfile b/php_8.1-alpine/Dockerfile
index d5d1f25..755cd66 100644
--- a/php_8.1-alpine/Dockerfile
+++ b/php_8.1-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -100,6 +100,8 @@ RUN set -eux; \
 		linux-headers \
 		oniguruma-dev \
 		openssl-dev \
+		patch \
+		patchutils \
 		readline-dev \
 		sqlite-dev \
 	; \
@@ -117,6 +119,17 @@ RUN set -eux; \
 	; \
 	docker-php-source extract; \
 	cd /usr/src/php; \
+# Apply patches; see https://github.com/docker-library/php/pull/1552
+	# https://github.com/php/php-src/issues/11678
+	curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \
+	echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
+	patch -p1 < 11678.patch; \
+	rm 11678.patch; \
+	# https://github.com/php/php-src/issues/14834
+	curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
+	echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
+	filterdiff -x '*/NEWS' 14834.patch | patch -p1; \
+	rm 14834.patch; \
 	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	./configure \
 		--build="$gnuArch" \
diff --git a/php_8.1-alpine3.19/Dockerfile b/php_8.1-alpine3.20/Dockerfile
similarity index 89%
rename from php_8.1-alpine3.19/Dockerfile
rename to php_8.1-alpine3.20/Dockerfile
index 3849988..23c077e 100644
--- a/php_8.1-alpine3.19/Dockerfile
+++ b/php_8.1-alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -100,6 +100,8 @@ RUN set -eux; \
 		linux-headers \
 		oniguruma-dev \
 		openssl-dev \
+		patch \
+		patchutils \
 		readline-dev \
 		sqlite-dev \
 	; \
@@ -117,6 +119,17 @@ RUN set -eux; \
 	; \
 	docker-php-source extract; \
 	cd /usr/src/php; \
+# Apply patches; see https://github.com/docker-library/php/pull/1552
+	# https://github.com/php/php-src/issues/11678
+	curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \
+	echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
+	patch -p1 < 11678.patch; \
+	rm 11678.patch; \
+	# https://github.com/php/php-src/issues/14834
+	curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
+	echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
+	filterdiff -x '*/NEWS' 14834.patch | patch -p1; \
+	rm 14834.patch; \
 	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	./configure \
 		--build="$gnuArch" \
diff --git a/php_8.1-alpine3.19/docker-php-entrypoint b/php_8.1-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.1-alpine3.19/docker-php-entrypoint
rename to php_8.1-alpine3.20/docker-php-entrypoint
diff --git a/php_8.1-alpine3.19/docker-php-ext-configure b/php_8.1-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.1-alpine3.19/docker-php-ext-configure
rename to php_8.1-alpine3.20/docker-php-ext-configure
diff --git a/php_8.1-alpine3.19/docker-php-ext-enable b/php_8.1-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.1-alpine3.19/docker-php-ext-enable
rename to php_8.1-alpine3.20/docker-php-ext-enable
diff --git a/php_8.1-alpine3.19/docker-php-ext-install b/php_8.1-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.1-alpine3.19/docker-php-ext-install
rename to php_8.1-alpine3.20/docker-php-ext-install
diff --git a/php_8.1-alpine3.19/docker-php-source b/php_8.1-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.1-alpine3.19/docker-php-source
rename to php_8.1-alpine3.20/docker-php-source
diff --git a/php_8.1-fpm-alpine/Dockerfile b/php_8.1-fpm-alpine/Dockerfile
index 846a3a7..a496a78 100644
--- a/php_8.1-fpm-alpine/Dockerfile
+++ b/php_8.1-fpm-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -100,6 +100,8 @@ RUN set -eux; \
 		linux-headers \
 		oniguruma-dev \
 		openssl-dev \
+		patch \
+		patchutils \
 		readline-dev \
 		sqlite-dev \
 	; \
@@ -117,6 +119,17 @@ RUN set -eux; \
 	; \
 	docker-php-source extract; \
 	cd /usr/src/php; \
+# Apply patches; see https://github.com/docker-library/php/pull/1552
+	# https://github.com/php/php-src/issues/11678
+	curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \
+	echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
+	patch -p1 < 11678.patch; \
+	rm 11678.patch; \
+	# https://github.com/php/php-src/issues/14834
+	curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
+	echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
+	filterdiff -x '*/NEWS' 14834.patch | patch -p1; \
+	rm 14834.patch; \
 	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	./configure \
 		--build="$gnuArch" \
diff --git a/php_8.1-fpm-alpine3.19/Dockerfile b/php_8.1-fpm-alpine3.20/Dockerfile
similarity index 91%
rename from php_8.1-fpm-alpine3.19/Dockerfile
rename to php_8.1-fpm-alpine3.20/Dockerfile
index 7e5596b..8093d11 100644
--- a/php_8.1-fpm-alpine3.19/Dockerfile
+++ b/php_8.1-fpm-alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -100,6 +100,8 @@ RUN set -eux; \
 		linux-headers \
 		oniguruma-dev \
 		openssl-dev \
+		patch \
+		patchutils \
 		readline-dev \
 		sqlite-dev \
 	; \
@@ -117,6 +119,17 @@ RUN set -eux; \
 	; \
 	docker-php-source extract; \
 	cd /usr/src/php; \
+# Apply patches; see https://github.com/docker-library/php/pull/1552
+	# https://github.com/php/php-src/issues/11678
+	curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \
+	echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
+	patch -p1 < 11678.patch; \
+	rm 11678.patch; \
+	# https://github.com/php/php-src/issues/14834
+	curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
+	echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
+	filterdiff -x '*/NEWS' 14834.patch | patch -p1; \
+	rm 14834.patch; \
 	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	./configure \
 		--build="$gnuArch" \
diff --git a/php_8.1-fpm-alpine3.19/docker-php-entrypoint b/php_8.1-fpm-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.1-fpm-alpine3.19/docker-php-entrypoint
rename to php_8.1-fpm-alpine3.20/docker-php-entrypoint
diff --git a/php_8.1-fpm-alpine3.19/docker-php-ext-configure b/php_8.1-fpm-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.1-fpm-alpine3.19/docker-php-ext-configure
rename to php_8.1-fpm-alpine3.20/docker-php-ext-configure
diff --git a/php_8.1-fpm-alpine3.19/docker-php-ext-enable b/php_8.1-fpm-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.1-fpm-alpine3.19/docker-php-ext-enable
rename to php_8.1-fpm-alpine3.20/docker-php-ext-enable
diff --git a/php_8.1-fpm-alpine3.19/docker-php-ext-install b/php_8.1-fpm-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.1-fpm-alpine3.19/docker-php-ext-install
rename to php_8.1-fpm-alpine3.20/docker-php-ext-install
diff --git a/php_8.1-fpm-alpine3.19/docker-php-source b/php_8.1-fpm-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.1-fpm-alpine3.19/docker-php-source
rename to php_8.1-fpm-alpine3.20/docker-php-source
diff --git a/php_8.1-zts-alpine/Dockerfile b/php_8.1-zts-alpine/Dockerfile
index b48e30b..d69d8d9 100644
--- a/php_8.1-zts-alpine/Dockerfile
+++ b/php_8.1-zts-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -100,6 +100,8 @@ RUN set -eux; \
 		linux-headers \
 		oniguruma-dev \
 		openssl-dev \
+		patch \
+		patchutils \
 		readline-dev \
 		sqlite-dev \
 	; \
@@ -117,6 +119,17 @@ RUN set -eux; \
 	; \
 	docker-php-source extract; \
 	cd /usr/src/php; \
+# Apply patches; see https://github.com/docker-library/php/pull/1552
+	# https://github.com/php/php-src/issues/11678
+	curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \
+	echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
+	patch -p1 < 11678.patch; \
+	rm 11678.patch; \
+	# https://github.com/php/php-src/issues/14834
+	curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
+	echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
+	filterdiff -x '*/NEWS' 14834.patch | patch -p1; \
+	rm 14834.patch; \
 	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	./configure \
 		--build="$gnuArch" \
diff --git a/php_8.1-zts-alpine3.19/Dockerfile b/php_8.1-zts-alpine3.20/Dockerfile
similarity index 89%
rename from php_8.1-zts-alpine3.19/Dockerfile
rename to php_8.1-zts-alpine3.20/Dockerfile
index bc49cf8..9efedf1 100644
--- a/php_8.1-zts-alpine3.19/Dockerfile
+++ b/php_8.1-zts-alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -100,6 +100,8 @@ RUN set -eux; \
 		linux-headers \
 		oniguruma-dev \
 		openssl-dev \
+		patch \
+		patchutils \
 		readline-dev \
 		sqlite-dev \
 	; \
@@ -117,6 +119,17 @@ RUN set -eux; \
 	; \
 	docker-php-source extract; \
 	cd /usr/src/php; \
+# Apply patches; see https://github.com/docker-library/php/pull/1552
+	# https://github.com/php/php-src/issues/11678
+	curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \
+	echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
+	patch -p1 < 11678.patch; \
+	rm 11678.patch; \
+	# https://github.com/php/php-src/issues/14834
+	curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
+	echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
+	filterdiff -x '*/NEWS' 14834.patch | patch -p1; \
+	rm 14834.patch; \
 	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	./configure \
 		--build="$gnuArch" \
diff --git a/php_8.1-zts-alpine3.19/docker-php-entrypoint b/php_8.1-zts-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.1-zts-alpine3.19/docker-php-entrypoint
rename to php_8.1-zts-alpine3.20/docker-php-entrypoint
diff --git a/php_8.1-zts-alpine3.19/docker-php-ext-configure b/php_8.1-zts-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.1-zts-alpine3.19/docker-php-ext-configure
rename to php_8.1-zts-alpine3.20/docker-php-ext-configure
diff --git a/php_8.1-zts-alpine3.19/docker-php-ext-enable b/php_8.1-zts-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.1-zts-alpine3.19/docker-php-ext-enable
rename to php_8.1-zts-alpine3.20/docker-php-ext-enable
diff --git a/php_8.1-zts-alpine3.19/docker-php-ext-install b/php_8.1-zts-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.1-zts-alpine3.19/docker-php-ext-install
rename to php_8.1-zts-alpine3.20/docker-php-ext-install
diff --git a/php_8.1-zts-alpine3.19/docker-php-source b/php_8.1-zts-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.1-zts-alpine3.19/docker-php-source
rename to php_8.1-zts-alpine3.20/docker-php-source
diff --git a/php_8.2-alpine/Dockerfile b/php_8.2-alpine/Dockerfile
index 4921d54..817ece4 100644
--- a/php_8.2-alpine/Dockerfile
+++ b/php_8.2-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.2-alpine3.19/Dockerfile b/php_8.2-alpine3.19/Dockerfile
deleted file mode 100644
index 3892b2b..0000000
diff --git a/php_8.2-alpine/Dockerfile b/php_8.2-alpine3.20/Dockerfile
similarity index 100%
copy from php_8.2-alpine/Dockerfile
copy to php_8.2-alpine3.20/Dockerfile
diff --git a/php_8.2-alpine3.19/docker-php-entrypoint b/php_8.2-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.2-alpine3.19/docker-php-entrypoint
rename to php_8.2-alpine3.20/docker-php-entrypoint
diff --git a/php_8.2-alpine3.19/docker-php-ext-configure b/php_8.2-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.2-alpine3.19/docker-php-ext-configure
rename to php_8.2-alpine3.20/docker-php-ext-configure
diff --git a/php_8.2-alpine3.19/docker-php-ext-enable b/php_8.2-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.2-alpine3.19/docker-php-ext-enable
rename to php_8.2-alpine3.20/docker-php-ext-enable
diff --git a/php_8.2-alpine3.19/docker-php-ext-install b/php_8.2-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.2-alpine3.19/docker-php-ext-install
rename to php_8.2-alpine3.20/docker-php-ext-install
diff --git a/php_8.2-alpine3.19/docker-php-source b/php_8.2-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.2-alpine3.19/docker-php-source
rename to php_8.2-alpine3.20/docker-php-source
diff --git a/php_8.2-fpm-alpine/Dockerfile b/php_8.2-fpm-alpine/Dockerfile
index 5d6b88c..5c73602 100644
--- a/php_8.2-fpm-alpine/Dockerfile
+++ b/php_8.2-fpm-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.2-fpm-alpine3.19/Dockerfile b/php_8.2-fpm-alpine3.19/Dockerfile
deleted file mode 100644
index 6d3fc2e..0000000
diff --git a/php_8.2-fpm-alpine/Dockerfile b/php_8.2-fpm-alpine3.20/Dockerfile
similarity index 100%
copy from php_8.2-fpm-alpine/Dockerfile
copy to php_8.2-fpm-alpine3.20/Dockerfile
diff --git a/php_8.2-fpm-alpine3.19/docker-php-entrypoint b/php_8.2-fpm-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.2-fpm-alpine3.19/docker-php-entrypoint
rename to php_8.2-fpm-alpine3.20/docker-php-entrypoint
diff --git a/php_8.2-fpm-alpine3.19/docker-php-ext-configure b/php_8.2-fpm-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.2-fpm-alpine3.19/docker-php-ext-configure
rename to php_8.2-fpm-alpine3.20/docker-php-ext-configure
diff --git a/php_8.2-fpm-alpine3.19/docker-php-ext-enable b/php_8.2-fpm-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.2-fpm-alpine3.19/docker-php-ext-enable
rename to php_8.2-fpm-alpine3.20/docker-php-ext-enable
diff --git a/php_8.2-fpm-alpine3.19/docker-php-ext-install b/php_8.2-fpm-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.2-fpm-alpine3.19/docker-php-ext-install
rename to php_8.2-fpm-alpine3.20/docker-php-ext-install
diff --git a/php_8.2-fpm-alpine3.19/docker-php-source b/php_8.2-fpm-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.2-fpm-alpine3.19/docker-php-source
rename to php_8.2-fpm-alpine3.20/docker-php-source
diff --git a/php_8.2-rc-alpine/Dockerfile b/php_8.2-rc-alpine/Dockerfile
index 95c01e2..2c619cb 100644
--- a/php_8.2-rc-alpine/Dockerfile
+++ b/php_8.2-rc-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.2-rc-alpine3.19/Dockerfile b/php_8.2-rc-alpine3.19/Dockerfile
deleted file mode 100644
index debd7c2..0000000
diff --git a/php_8.2-rc-alpine/Dockerfile b/php_8.2-rc-alpine3.20/Dockerfile
similarity index 100%
copy from php_8.2-rc-alpine/Dockerfile
copy to php_8.2-rc-alpine3.20/Dockerfile
diff --git a/php_8.2-rc-alpine3.19/docker-php-entrypoint b/php_8.2-rc-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.2-rc-alpine3.19/docker-php-entrypoint
rename to php_8.2-rc-alpine3.20/docker-php-entrypoint
diff --git a/php_8.2-rc-alpine3.19/docker-php-ext-configure b/php_8.2-rc-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.2-rc-alpine3.19/docker-php-ext-configure
rename to php_8.2-rc-alpine3.20/docker-php-ext-configure
diff --git a/php_8.2-rc-alpine3.19/docker-php-ext-enable b/php_8.2-rc-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.2-rc-alpine3.19/docker-php-ext-enable
rename to php_8.2-rc-alpine3.20/docker-php-ext-enable
diff --git a/php_8.2-rc-alpine3.19/docker-php-ext-install b/php_8.2-rc-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.2-rc-alpine3.19/docker-php-ext-install
rename to php_8.2-rc-alpine3.20/docker-php-ext-install
diff --git a/php_8.2-rc-alpine3.19/docker-php-source b/php_8.2-rc-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.2-rc-alpine3.19/docker-php-source
rename to php_8.2-rc-alpine3.20/docker-php-source
diff --git a/php_8.2-rc-fpm-alpine/Dockerfile b/php_8.2-rc-fpm-alpine/Dockerfile
index 2803260..7aae9b3 100644
--- a/php_8.2-rc-fpm-alpine/Dockerfile
+++ b/php_8.2-rc-fpm-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.2-rc-fpm-alpine3.19/Dockerfile b/php_8.2-rc-fpm-alpine3.19/Dockerfile
deleted file mode 100644
index 7dfa190..0000000
diff --git a/php_8.2-rc-fpm-alpine/Dockerfile b/php_8.2-rc-fpm-alpine3.20/Dockerfile
similarity index 100%
copy from php_8.2-rc-fpm-alpine/Dockerfile
copy to php_8.2-rc-fpm-alpine3.20/Dockerfile
diff --git a/php_8.2-rc-fpm-alpine3.19/docker-php-entrypoint b/php_8.2-rc-fpm-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.2-rc-fpm-alpine3.19/docker-php-entrypoint
rename to php_8.2-rc-fpm-alpine3.20/docker-php-entrypoint
diff --git a/php_8.2-rc-fpm-alpine3.19/docker-php-ext-configure b/php_8.2-rc-fpm-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.2-rc-fpm-alpine3.19/docker-php-ext-configure
rename to php_8.2-rc-fpm-alpine3.20/docker-php-ext-configure
diff --git a/php_8.2-rc-fpm-alpine3.19/docker-php-ext-enable b/php_8.2-rc-fpm-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.2-rc-fpm-alpine3.19/docker-php-ext-enable
rename to php_8.2-rc-fpm-alpine3.20/docker-php-ext-enable
diff --git a/php_8.2-rc-fpm-alpine3.19/docker-php-ext-install b/php_8.2-rc-fpm-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.2-rc-fpm-alpine3.19/docker-php-ext-install
rename to php_8.2-rc-fpm-alpine3.20/docker-php-ext-install
diff --git a/php_8.2-rc-fpm-alpine3.19/docker-php-source b/php_8.2-rc-fpm-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.2-rc-fpm-alpine3.19/docker-php-source
rename to php_8.2-rc-fpm-alpine3.20/docker-php-source
diff --git a/php_8.2-rc-zts-alpine/Dockerfile b/php_8.2-rc-zts-alpine/Dockerfile
index 4e5beec..61b13b6 100644
--- a/php_8.2-rc-zts-alpine/Dockerfile
+++ b/php_8.2-rc-zts-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.2-rc-zts-alpine3.19/Dockerfile b/php_8.2-rc-zts-alpine3.19/Dockerfile
deleted file mode 100644
index 48a09c7..0000000
diff --git a/php_8.2-rc-zts-alpine/Dockerfile b/php_8.2-rc-zts-alpine3.20/Dockerfile
similarity index 100%
copy from php_8.2-rc-zts-alpine/Dockerfile
copy to php_8.2-rc-zts-alpine3.20/Dockerfile
diff --git a/php_8.2-rc-zts-alpine3.19/docker-php-entrypoint b/php_8.2-rc-zts-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.2-rc-zts-alpine3.19/docker-php-entrypoint
rename to php_8.2-rc-zts-alpine3.20/docker-php-entrypoint
diff --git a/php_8.2-rc-zts-alpine3.19/docker-php-ext-configure b/php_8.2-rc-zts-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.2-rc-zts-alpine3.19/docker-php-ext-configure
rename to php_8.2-rc-zts-alpine3.20/docker-php-ext-configure
diff --git a/php_8.2-rc-zts-alpine3.19/docker-php-ext-enable b/php_8.2-rc-zts-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.2-rc-zts-alpine3.19/docker-php-ext-enable
rename to php_8.2-rc-zts-alpine3.20/docker-php-ext-enable
diff --git a/php_8.2-rc-zts-alpine3.19/docker-php-ext-install b/php_8.2-rc-zts-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.2-rc-zts-alpine3.19/docker-php-ext-install
rename to php_8.2-rc-zts-alpine3.20/docker-php-ext-install
diff --git a/php_8.2-rc-zts-alpine3.19/docker-php-source b/php_8.2-rc-zts-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.2-rc-zts-alpine3.19/docker-php-source
rename to php_8.2-rc-zts-alpine3.20/docker-php-source
diff --git a/php_8.2-zts-alpine/Dockerfile b/php_8.2-zts-alpine/Dockerfile
index 6c63ed4..5eacd41 100644
--- a/php_8.2-zts-alpine/Dockerfile
+++ b/php_8.2-zts-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.2-zts-alpine3.19/Dockerfile b/php_8.2-zts-alpine3.19/Dockerfile
deleted file mode 100644
index 3f7e6b1..0000000
diff --git a/php_8.2-zts-alpine/Dockerfile b/php_8.2-zts-alpine3.20/Dockerfile
similarity index 100%
copy from php_8.2-zts-alpine/Dockerfile
copy to php_8.2-zts-alpine3.20/Dockerfile
diff --git a/php_8.2-zts-alpine3.19/docker-php-entrypoint b/php_8.2-zts-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.2-zts-alpine3.19/docker-php-entrypoint
rename to php_8.2-zts-alpine3.20/docker-php-entrypoint
diff --git a/php_8.2-zts-alpine3.19/docker-php-ext-configure b/php_8.2-zts-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.2-zts-alpine3.19/docker-php-ext-configure
rename to php_8.2-zts-alpine3.20/docker-php-ext-configure
diff --git a/php_8.2-zts-alpine3.19/docker-php-ext-enable b/php_8.2-zts-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.2-zts-alpine3.19/docker-php-ext-enable
rename to php_8.2-zts-alpine3.20/docker-php-ext-enable
diff --git a/php_8.2-zts-alpine3.19/docker-php-ext-install b/php_8.2-zts-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.2-zts-alpine3.19/docker-php-ext-install
rename to php_8.2-zts-alpine3.20/docker-php-ext-install
diff --git a/php_8.2-zts-alpine3.19/docker-php-source b/php_8.2-zts-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.2-zts-alpine3.19/docker-php-source
rename to php_8.2-zts-alpine3.20/docker-php-source
diff --git a/php_8.3-alpine/Dockerfile b/php_8.3-alpine/Dockerfile
index 1a5ed55..fe98c28 100644
--- a/php_8.3-alpine/Dockerfile
+++ b/php_8.3-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.3-alpine3.19/Dockerfile b/php_8.3-alpine3.19/Dockerfile
deleted file mode 100644
index db107f1..0000000
diff --git a/php_8.3-alpine/Dockerfile b/php_8.3-alpine3.20/Dockerfile
similarity index 100%
copy from php_8.3-alpine/Dockerfile
copy to php_8.3-alpine3.20/Dockerfile
diff --git a/php_8.3-alpine3.19/docker-php-entrypoint b/php_8.3-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.3-alpine3.19/docker-php-entrypoint
rename to php_8.3-alpine3.20/docker-php-entrypoint
diff --git a/php_8.3-alpine3.19/docker-php-ext-configure b/php_8.3-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.3-alpine3.19/docker-php-ext-configure
rename to php_8.3-alpine3.20/docker-php-ext-configure
diff --git a/php_8.3-alpine3.19/docker-php-ext-enable b/php_8.3-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.3-alpine3.19/docker-php-ext-enable
rename to php_8.3-alpine3.20/docker-php-ext-enable
diff --git a/php_8.3-alpine3.19/docker-php-ext-install b/php_8.3-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.3-alpine3.19/docker-php-ext-install
rename to php_8.3-alpine3.20/docker-php-ext-install
diff --git a/php_8.3-alpine3.19/docker-php-source b/php_8.3-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.3-alpine3.19/docker-php-source
rename to php_8.3-alpine3.20/docker-php-source
diff --git a/php_8.3-fpm-alpine/Dockerfile b/php_8.3-fpm-alpine/Dockerfile
index 2d98147..0732577 100644
--- a/php_8.3-fpm-alpine/Dockerfile
+++ b/php_8.3-fpm-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.3-fpm-alpine3.19/Dockerfile b/php_8.3-fpm-alpine3.19/Dockerfile
deleted file mode 100644
index 31edd9c..0000000
diff --git a/php_8.3-fpm-alpine/Dockerfile b/php_8.3-fpm-alpine3.20/Dockerfile
similarity index 100%
copy from php_8.3-fpm-alpine/Dockerfile
copy to php_8.3-fpm-alpine3.20/Dockerfile
diff --git a/php_8.3-fpm-alpine3.19/docker-php-entrypoint b/php_8.3-fpm-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.3-fpm-alpine3.19/docker-php-entrypoint
rename to php_8.3-fpm-alpine3.20/docker-php-entrypoint
diff --git a/php_8.3-fpm-alpine3.19/docker-php-ext-configure b/php_8.3-fpm-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.3-fpm-alpine3.19/docker-php-ext-configure
rename to php_8.3-fpm-alpine3.20/docker-php-ext-configure
diff --git a/php_8.3-fpm-alpine3.19/docker-php-ext-enable b/php_8.3-fpm-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.3-fpm-alpine3.19/docker-php-ext-enable
rename to php_8.3-fpm-alpine3.20/docker-php-ext-enable
diff --git a/php_8.3-fpm-alpine3.19/docker-php-ext-install b/php_8.3-fpm-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.3-fpm-alpine3.19/docker-php-ext-install
rename to php_8.3-fpm-alpine3.20/docker-php-ext-install
diff --git a/php_8.3-fpm-alpine3.19/docker-php-source b/php_8.3-fpm-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.3-fpm-alpine3.19/docker-php-source
rename to php_8.3-fpm-alpine3.20/docker-php-source
diff --git a/php_8.3-rc-alpine/Dockerfile b/php_8.3-rc-alpine/Dockerfile
index 0fb527d..2f971d4 100644
--- a/php_8.3-rc-alpine/Dockerfile
+++ b/php_8.3-rc-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.3-rc-alpine3.19/Dockerfile b/php_8.3-rc-alpine3.19/Dockerfile
deleted file mode 100644
index a817f1e..0000000
diff --git a/php_8.3-rc-alpine/Dockerfile b/php_8.3-rc-alpine3.20/Dockerfile
similarity index 100%
copy from php_8.3-rc-alpine/Dockerfile
copy to php_8.3-rc-alpine3.20/Dockerfile
diff --git a/php_8.3-rc-alpine3.19/docker-php-entrypoint b/php_8.3-rc-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.3-rc-alpine3.19/docker-php-entrypoint
rename to php_8.3-rc-alpine3.20/docker-php-entrypoint
diff --git a/php_8.3-rc-alpine3.19/docker-php-ext-configure b/php_8.3-rc-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.3-rc-alpine3.19/docker-php-ext-configure
rename to php_8.3-rc-alpine3.20/docker-php-ext-configure
diff --git a/php_8.3-rc-alpine3.19/docker-php-ext-enable b/php_8.3-rc-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.3-rc-alpine3.19/docker-php-ext-enable
rename to php_8.3-rc-alpine3.20/docker-php-ext-enable
diff --git a/php_8.3-rc-alpine3.19/docker-php-ext-install b/php_8.3-rc-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.3-rc-alpine3.19/docker-php-ext-install
rename to php_8.3-rc-alpine3.20/docker-php-ext-install
diff --git a/php_8.3-rc-alpine3.19/docker-php-source b/php_8.3-rc-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.3-rc-alpine3.19/docker-php-source
rename to php_8.3-rc-alpine3.20/docker-php-source
diff --git a/php_8.3-rc-fpm-alpine/Dockerfile b/php_8.3-rc-fpm-alpine/Dockerfile
index 94b81cd..af97dfc 100644
--- a/php_8.3-rc-fpm-alpine/Dockerfile
+++ b/php_8.3-rc-fpm-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.3-rc-fpm-alpine3.19/Dockerfile b/php_8.3-rc-fpm-alpine3.19/Dockerfile
deleted file mode 100644
index d7084f3..0000000
diff --git a/php_8.3-rc-fpm-alpine/Dockerfile b/php_8.3-rc-fpm-alpine3.20/Dockerfile
similarity index 100%
copy from php_8.3-rc-fpm-alpine/Dockerfile
copy to php_8.3-rc-fpm-alpine3.20/Dockerfile
diff --git a/php_8.3-rc-fpm-alpine3.19/docker-php-entrypoint b/php_8.3-rc-fpm-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.3-rc-fpm-alpine3.19/docker-php-entrypoint
rename to php_8.3-rc-fpm-alpine3.20/docker-php-entrypoint
diff --git a/php_8.3-rc-fpm-alpine3.19/docker-php-ext-configure b/php_8.3-rc-fpm-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.3-rc-fpm-alpine3.19/docker-php-ext-configure
rename to php_8.3-rc-fpm-alpine3.20/docker-php-ext-configure
diff --git a/php_8.3-rc-fpm-alpine3.19/docker-php-ext-enable b/php_8.3-rc-fpm-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.3-rc-fpm-alpine3.19/docker-php-ext-enable
rename to php_8.3-rc-fpm-alpine3.20/docker-php-ext-enable
diff --git a/php_8.3-rc-fpm-alpine3.19/docker-php-ext-install b/php_8.3-rc-fpm-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.3-rc-fpm-alpine3.19/docker-php-ext-install
rename to php_8.3-rc-fpm-alpine3.20/docker-php-ext-install
diff --git a/php_8.3-rc-fpm-alpine3.19/docker-php-source b/php_8.3-rc-fpm-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.3-rc-fpm-alpine3.19/docker-php-source
rename to php_8.3-rc-fpm-alpine3.20/docker-php-source
diff --git a/php_8.3-rc-zts-alpine/Dockerfile b/php_8.3-rc-zts-alpine/Dockerfile
index e6b9de5..08f830b 100644
--- a/php_8.3-rc-zts-alpine/Dockerfile
+++ b/php_8.3-rc-zts-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.3-rc-zts-alpine3.19/Dockerfile b/php_8.3-rc-zts-alpine3.19/Dockerfile
deleted file mode 100644
index c5a9d7e..0000000
diff --git a/php_8.3-rc-zts-alpine/Dockerfile b/php_8.3-rc-zts-alpine3.20/Dockerfile
similarity index 100%
copy from php_8.3-rc-zts-alpine/Dockerfile
copy to php_8.3-rc-zts-alpine3.20/Dockerfile
diff --git a/php_8.3-rc-zts-alpine3.19/docker-php-entrypoint b/php_8.3-rc-zts-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.3-rc-zts-alpine3.19/docker-php-entrypoint
rename to php_8.3-rc-zts-alpine3.20/docker-php-entrypoint
diff --git a/php_8.3-rc-zts-alpine3.19/docker-php-ext-configure b/php_8.3-rc-zts-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.3-rc-zts-alpine3.19/docker-php-ext-configure
rename to php_8.3-rc-zts-alpine3.20/docker-php-ext-configure
diff --git a/php_8.3-rc-zts-alpine3.19/docker-php-ext-enable b/php_8.3-rc-zts-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.3-rc-zts-alpine3.19/docker-php-ext-enable
rename to php_8.3-rc-zts-alpine3.20/docker-php-ext-enable
diff --git a/php_8.3-rc-zts-alpine3.19/docker-php-ext-install b/php_8.3-rc-zts-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.3-rc-zts-alpine3.19/docker-php-ext-install
rename to php_8.3-rc-zts-alpine3.20/docker-php-ext-install
diff --git a/php_8.3-rc-zts-alpine3.19/docker-php-source b/php_8.3-rc-zts-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.3-rc-zts-alpine3.19/docker-php-source
rename to php_8.3-rc-zts-alpine3.20/docker-php-source
diff --git a/php_8.3-zts-alpine/Dockerfile b/php_8.3-zts-alpine/Dockerfile
index ab99767..23c61d9 100644
--- a/php_8.3-zts-alpine/Dockerfile
+++ b/php_8.3-zts-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.3-zts-alpine3.19/Dockerfile b/php_8.3-zts-alpine3.19/Dockerfile
deleted file mode 100644
index 2b01f3a..0000000
diff --git a/php_8.3-zts-alpine/Dockerfile b/php_8.3-zts-alpine3.20/Dockerfile
similarity index 100%
copy from php_8.3-zts-alpine/Dockerfile
copy to php_8.3-zts-alpine3.20/Dockerfile
diff --git a/php_8.3-zts-alpine3.19/docker-php-entrypoint b/php_8.3-zts-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.3-zts-alpine3.19/docker-php-entrypoint
rename to php_8.3-zts-alpine3.20/docker-php-entrypoint
diff --git a/php_8.3-zts-alpine3.19/docker-php-ext-configure b/php_8.3-zts-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.3-zts-alpine3.19/docker-php-ext-configure
rename to php_8.3-zts-alpine3.20/docker-php-ext-configure
diff --git a/php_8.3-zts-alpine3.19/docker-php-ext-enable b/php_8.3-zts-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.3-zts-alpine3.19/docker-php-ext-enable
rename to php_8.3-zts-alpine3.20/docker-php-ext-enable
diff --git a/php_8.3-zts-alpine3.19/docker-php-ext-install b/php_8.3-zts-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.3-zts-alpine3.19/docker-php-ext-install
rename to php_8.3-zts-alpine3.20/docker-php-ext-install
diff --git a/php_8.3-zts-alpine3.19/docker-php-source b/php_8.3-zts-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.3-zts-alpine3.19/docker-php-source
rename to php_8.3-zts-alpine3.20/docker-php-source
diff --git a/php_8.4-rc-alpine/Dockerfile b/php_8.4-rc-alpine/Dockerfile
index 98bf286..138dd7f 100644
--- a/php_8.4-rc-alpine/Dockerfile
+++ b/php_8.4-rc-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.4-rc-alpine3.19/Dockerfile b/php_8.4-rc-alpine3.19/Dockerfile
deleted file mode 100644
index ed140ed..0000000
diff --git a/php_8.4-rc-alpine/Dockerfile b/php_8.4-rc-alpine3.20/Dockerfile
similarity index 100%
copy from php_8.4-rc-alpine/Dockerfile
copy to php_8.4-rc-alpine3.20/Dockerfile
diff --git a/php_8.4-rc-alpine3.19/docker-php-entrypoint b/php_8.4-rc-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.4-rc-alpine3.19/docker-php-entrypoint
rename to php_8.4-rc-alpine3.20/docker-php-entrypoint
diff --git a/php_8.4-rc-alpine3.19/docker-php-ext-configure b/php_8.4-rc-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.4-rc-alpine3.19/docker-php-ext-configure
rename to php_8.4-rc-alpine3.20/docker-php-ext-configure
diff --git a/php_8.4-rc-alpine3.19/docker-php-ext-enable b/php_8.4-rc-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.4-rc-alpine3.19/docker-php-ext-enable
rename to php_8.4-rc-alpine3.20/docker-php-ext-enable
diff --git a/php_8.4-rc-alpine3.19/docker-php-ext-install b/php_8.4-rc-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.4-rc-alpine3.19/docker-php-ext-install
rename to php_8.4-rc-alpine3.20/docker-php-ext-install
diff --git a/php_8.4-rc-alpine3.19/docker-php-source b/php_8.4-rc-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.4-rc-alpine3.19/docker-php-source
rename to php_8.4-rc-alpine3.20/docker-php-source
diff --git a/php_8.4-rc-fpm-alpine/Dockerfile b/php_8.4-rc-fpm-alpine/Dockerfile
index 1d3d500..ee2c5ea 100644
--- a/php_8.4-rc-fpm-alpine/Dockerfile
+++ b/php_8.4-rc-fpm-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.4-rc-fpm-alpine3.19/Dockerfile b/php_8.4-rc-fpm-alpine3.19/Dockerfile
deleted file mode 100644
index 0ad5a37..0000000
diff --git a/php_8.4-rc-fpm-alpine/Dockerfile b/php_8.4-rc-fpm-alpine3.20/Dockerfile
similarity index 100%
copy from php_8.4-rc-fpm-alpine/Dockerfile
copy to php_8.4-rc-fpm-alpine3.20/Dockerfile
diff --git a/php_8.4-rc-fpm-alpine3.19/docker-php-entrypoint b/php_8.4-rc-fpm-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.4-rc-fpm-alpine3.19/docker-php-entrypoint
rename to php_8.4-rc-fpm-alpine3.20/docker-php-entrypoint
diff --git a/php_8.4-rc-fpm-alpine3.19/docker-php-ext-configure b/php_8.4-rc-fpm-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.4-rc-fpm-alpine3.19/docker-php-ext-configure
rename to php_8.4-rc-fpm-alpine3.20/docker-php-ext-configure
diff --git a/php_8.4-rc-fpm-alpine3.19/docker-php-ext-enable b/php_8.4-rc-fpm-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.4-rc-fpm-alpine3.19/docker-php-ext-enable
rename to php_8.4-rc-fpm-alpine3.20/docker-php-ext-enable
diff --git a/php_8.4-rc-fpm-alpine3.19/docker-php-ext-install b/php_8.4-rc-fpm-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.4-rc-fpm-alpine3.19/docker-php-ext-install
rename to php_8.4-rc-fpm-alpine3.20/docker-php-ext-install
diff --git a/php_8.4-rc-fpm-alpine3.19/docker-php-source b/php_8.4-rc-fpm-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.4-rc-fpm-alpine3.19/docker-php-source
rename to php_8.4-rc-fpm-alpine3.20/docker-php-source
diff --git a/php_8.4-rc-zts-alpine/Dockerfile b/php_8.4-rc-zts-alpine/Dockerfile
index 4d4fe07..ca37ec5 100644
--- a/php_8.4-rc-zts-alpine/Dockerfile
+++ b/php_8.4-rc-zts-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.4-rc-zts-alpine3.19/Dockerfile b/php_8.4-rc-zts-alpine3.19/Dockerfile
deleted file mode 100644
index 45e8613..0000000
diff --git a/php_8.4-rc-zts-alpine/Dockerfile b/php_8.4-rc-zts-alpine3.20/Dockerfile
similarity index 100%
copy from php_8.4-rc-zts-alpine/Dockerfile
copy to php_8.4-rc-zts-alpine3.20/Dockerfile
diff --git a/php_8.4-rc-zts-alpine3.19/docker-php-entrypoint b/php_8.4-rc-zts-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_8.4-rc-zts-alpine3.19/docker-php-entrypoint
rename to php_8.4-rc-zts-alpine3.20/docker-php-entrypoint
diff --git a/php_8.4-rc-zts-alpine3.19/docker-php-ext-configure b/php_8.4-rc-zts-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_8.4-rc-zts-alpine3.19/docker-php-ext-configure
rename to php_8.4-rc-zts-alpine3.20/docker-php-ext-configure
diff --git a/php_8.4-rc-zts-alpine3.19/docker-php-ext-enable b/php_8.4-rc-zts-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_8.4-rc-zts-alpine3.19/docker-php-ext-enable
rename to php_8.4-rc-zts-alpine3.20/docker-php-ext-enable
diff --git a/php_8.4-rc-zts-alpine3.19/docker-php-ext-install b/php_8.4-rc-zts-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_8.4-rc-zts-alpine3.19/docker-php-ext-install
rename to php_8.4-rc-zts-alpine3.20/docker-php-ext-install
diff --git a/php_8.4-rc-zts-alpine3.19/docker-php-source b/php_8.4-rc-zts-alpine3.20/docker-php-source
similarity index 100%
rename from php_8.4-rc-zts-alpine3.19/docker-php-source
rename to php_8.4-rc-zts-alpine3.20/docker-php-source
diff --git a/php_alpine/Dockerfile b/php_alpine/Dockerfile
index c6cb912..8ebf75f 100644
--- a/php_alpine/Dockerfile
+++ b/php_alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_alpine3.19/Dockerfile b/php_alpine3.19/Dockerfile
deleted file mode 100644
index d658b6e..0000000
diff --git a/php_alpine/Dockerfile b/php_alpine3.20/Dockerfile
similarity index 100%
copy from php_alpine/Dockerfile
copy to php_alpine3.20/Dockerfile
diff --git a/php_alpine3.19/docker-php-entrypoint b/php_alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_alpine3.19/docker-php-entrypoint
rename to php_alpine3.20/docker-php-entrypoint
diff --git a/php_alpine3.19/docker-php-ext-configure b/php_alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_alpine3.19/docker-php-ext-configure
rename to php_alpine3.20/docker-php-ext-configure
diff --git a/php_alpine3.19/docker-php-ext-enable b/php_alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_alpine3.19/docker-php-ext-enable
rename to php_alpine3.20/docker-php-ext-enable
diff --git a/php_alpine3.19/docker-php-ext-install b/php_alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_alpine3.19/docker-php-ext-install
rename to php_alpine3.20/docker-php-ext-install
diff --git a/php_alpine3.19/docker-php-source b/php_alpine3.20/docker-php-source
similarity index 100%
rename from php_alpine3.19/docker-php-source
rename to php_alpine3.20/docker-php-source
diff --git a/php_fpm-alpine/Dockerfile b/php_fpm-alpine/Dockerfile
index e64d6ff..cc4fda4 100644
--- a/php_fpm-alpine/Dockerfile
+++ b/php_fpm-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_fpm-alpine3.19/Dockerfile b/php_fpm-alpine3.19/Dockerfile
deleted file mode 100644
index c08d644..0000000
diff --git a/php_fpm-alpine/Dockerfile b/php_fpm-alpine3.20/Dockerfile
similarity index 100%
copy from php_fpm-alpine/Dockerfile
copy to php_fpm-alpine3.20/Dockerfile
diff --git a/php_fpm-alpine3.19/docker-php-entrypoint b/php_fpm-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_fpm-alpine3.19/docker-php-entrypoint
rename to php_fpm-alpine3.20/docker-php-entrypoint
diff --git a/php_fpm-alpine3.19/docker-php-ext-configure b/php_fpm-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_fpm-alpine3.19/docker-php-ext-configure
rename to php_fpm-alpine3.20/docker-php-ext-configure
diff --git a/php_fpm-alpine3.19/docker-php-ext-enable b/php_fpm-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_fpm-alpine3.19/docker-php-ext-enable
rename to php_fpm-alpine3.20/docker-php-ext-enable
diff --git a/php_fpm-alpine3.19/docker-php-ext-install b/php_fpm-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_fpm-alpine3.19/docker-php-ext-install
rename to php_fpm-alpine3.20/docker-php-ext-install
diff --git a/php_fpm-alpine3.19/docker-php-source b/php_fpm-alpine3.20/docker-php-source
similarity index 100%
rename from php_fpm-alpine3.19/docker-php-source
rename to php_fpm-alpine3.20/docker-php-source
diff --git a/php_zts-alpine/Dockerfile b/php_zts-alpine/Dockerfile
index 804335b..a7bd0c7 100644
--- a/php_zts-alpine/Dockerfile
+++ b/php_zts-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_zts-alpine3.19/Dockerfile b/php_zts-alpine3.19/Dockerfile
deleted file mode 100644
index 4973364..0000000
diff --git a/php_zts-alpine/Dockerfile b/php_zts-alpine3.20/Dockerfile
similarity index 100%
copy from php_zts-alpine/Dockerfile
copy to php_zts-alpine3.20/Dockerfile
diff --git a/php_zts-alpine3.19/docker-php-entrypoint b/php_zts-alpine3.20/docker-php-entrypoint
similarity index 100%
rename from php_zts-alpine3.19/docker-php-entrypoint
rename to php_zts-alpine3.20/docker-php-entrypoint
diff --git a/php_zts-alpine3.19/docker-php-ext-configure b/php_zts-alpine3.20/docker-php-ext-configure
similarity index 100%
rename from php_zts-alpine3.19/docker-php-ext-configure
rename to php_zts-alpine3.20/docker-php-ext-configure
diff --git a/php_zts-alpine3.19/docker-php-ext-enable b/php_zts-alpine3.20/docker-php-ext-enable
similarity index 100%
rename from php_zts-alpine3.19/docker-php-ext-enable
rename to php_zts-alpine3.20/docker-php-ext-enable
diff --git a/php_zts-alpine3.19/docker-php-ext-install b/php_zts-alpine3.20/docker-php-ext-install
similarity index 100%
rename from php_zts-alpine3.19/docker-php-ext-install
rename to php_zts-alpine3.20/docker-php-ext-install
diff --git a/php_zts-alpine3.19/docker-php-source b/php_zts-alpine3.20/docker-php-source
similarity index 100%
rename from php_zts-alpine3.19/docker-php-source
rename to php_zts-alpine3.20/docker-php-source

Relevant Maintainers:

@yosifkit yosifkit merged commit 232c327 into docker-library:master Dec 11, 2024
103 checks passed
@yosifkit yosifkit deleted the php branch December 11, 2024 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants