Update php #19246
Merged
Update php #19246
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/php@98d7f098: Merge pull request docker-library/php#1580 from infosiftr/alpine3.22 - docker-library/php@9c90483c: Backport patches for Alpine 3.22 + ZTS - docker-library/php@904a84a1: Add Alpine 3.22 (remove Alpine 3.20)
Diff for 7a08588:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 02c8fec..f7230a2 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -11,15 +11,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: aada98fe2ddd5df2b73e25ecf552c954b299f928
Directory: 8.1/bullseye/apache
-Tags: 8.1.32-cli-alpine3.20, 8.1-cli-alpine3.20, 8.1.32-alpine3.20, 8.1-alpine3.20
+Tags: 8.1.32-cli-alpine3.21, 8.1-cli-alpine3.21, 8.1.32-alpine3.21, 8.1-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: aada98fe2ddd5df2b73e25ecf552c954b299f928
-Directory: 8.1/alpine3.20/cli
+Directory: 8.1/alpine3.21/cli
-Tags: 8.1.32-cli-alpine3.21, 8.1-cli-alpine3.21, 8.1.32-alpine3.21, 8.1-alpine3.21, 8.1.32-cli-alpine, 8.1-cli-alpine, 8.1.32-alpine, 8.1-alpine
+Tags: 8.1.32-cli-alpine3.22, 8.1-cli-alpine3.22, 8.1.32-alpine3.22, 8.1-alpine3.22, 8.1.32-cli-alpine, 8.1-cli-alpine, 8.1.32-alpine, 8.1-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: aada98fe2ddd5df2b73e25ecf552c954b299f928
-Directory: 8.1/alpine3.21/cli
+GitCommit: 904a84a176cea22942566d52335794314c3b2aed
+Directory: 8.1/alpine3.22/cli
Tags: 8.1.32-cli-bookworm, 8.1-cli-bookworm, 8.1.32-bookworm, 8.1-bookworm, 8.1.32-cli, 8.1-cli, 8.1.32, 8.1
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -31,15 +31,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: aada98fe2ddd5df2b73e25ecf552c954b299f928
Directory: 8.1/bullseye/cli
-Tags: 8.1.32-fpm-alpine3.20, 8.1-fpm-alpine3.20
+Tags: 8.1.32-fpm-alpine3.21, 8.1-fpm-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: aada98fe2ddd5df2b73e25ecf552c954b299f928
-Directory: 8.1/alpine3.20/fpm
+Directory: 8.1/alpine3.21/fpm
-Tags: 8.1.32-fpm-alpine3.21, 8.1-fpm-alpine3.21, 8.1.32-fpm-alpine, 8.1-fpm-alpine
+Tags: 8.1.32-fpm-alpine3.22, 8.1-fpm-alpine3.22, 8.1.32-fpm-alpine, 8.1-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: aada98fe2ddd5df2b73e25ecf552c954b299f928
-Directory: 8.1/alpine3.21/fpm
+GitCommit: 904a84a176cea22942566d52335794314c3b2aed
+Directory: 8.1/alpine3.22/fpm
Tags: 8.1.32-fpm-bookworm, 8.1-fpm-bookworm, 8.1.32-fpm, 8.1-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -51,15 +51,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: aada98fe2ddd5df2b73e25ecf552c954b299f928
Directory: 8.1/bullseye/fpm
-Tags: 8.1.32-zts-alpine3.20, 8.1-zts-alpine3.20
+Tags: 8.1.32-zts-alpine3.21, 8.1-zts-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: aada98fe2ddd5df2b73e25ecf552c954b299f928
-Directory: 8.1/alpine3.20/zts
+Directory: 8.1/alpine3.21/zts
-Tags: 8.1.32-zts-alpine3.21, 8.1-zts-alpine3.21, 8.1.32-zts-alpine, 8.1-zts-alpine
+Tags: 8.1.32-zts-alpine3.22, 8.1-zts-alpine3.22, 8.1.32-zts-alpine, 8.1-zts-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: aada98fe2ddd5df2b73e25ecf552c954b299f928
-Directory: 8.1/alpine3.21/zts
+GitCommit: 9c90483c2bb64195cc9c55cb06a4830955015830
+Directory: 8.1/alpine3.22/zts
Tags: 8.1.32-zts-bookworm, 8.1-zts-bookworm, 8.1.32-zts, 8.1-zts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -81,15 +81,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: 1d34ec5ee5ce9fa76a776c039a9f98533cc096f8
Directory: 8.2/bullseye/apache
-Tags: 8.2.28-cli-alpine3.20, 8.2-cli-alpine3.20, 8.2.28-alpine3.20, 8.2-alpine3.20
+Tags: 8.2.28-cli-alpine3.21, 8.2-cli-alpine3.21, 8.2.28-alpine3.21, 8.2-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 1d34ec5ee5ce9fa76a776c039a9f98533cc096f8
-Directory: 8.2/alpine3.20/cli
+Directory: 8.2/alpine3.21/cli
-Tags: 8.2.28-cli-alpine3.21, 8.2-cli-alpine3.21, 8.2.28-alpine3.21, 8.2-alpine3.21, 8.2.28-cli-alpine, 8.2-cli-alpine, 8.2.28-alpine, 8.2-alpine
+Tags: 8.2.28-cli-alpine3.22, 8.2-cli-alpine3.22, 8.2.28-alpine3.22, 8.2-alpine3.22, 8.2.28-cli-alpine, 8.2-cli-alpine, 8.2.28-alpine, 8.2-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 1d34ec5ee5ce9fa76a776c039a9f98533cc096f8
-Directory: 8.2/alpine3.21/cli
+GitCommit: 904a84a176cea22942566d52335794314c3b2aed
+Directory: 8.2/alpine3.22/cli
Tags: 8.2.28-cli-bookworm, 8.2-cli-bookworm, 8.2.28-bookworm, 8.2-bookworm, 8.2.28-cli, 8.2-cli, 8.2.28, 8.2
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -101,15 +101,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: 1d34ec5ee5ce9fa76a776c039a9f98533cc096f8
Directory: 8.2/bullseye/cli
-Tags: 8.2.28-fpm-alpine3.20, 8.2-fpm-alpine3.20
+Tags: 8.2.28-fpm-alpine3.21, 8.2-fpm-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 1d34ec5ee5ce9fa76a776c039a9f98533cc096f8
-Directory: 8.2/alpine3.20/fpm
+Directory: 8.2/alpine3.21/fpm
-Tags: 8.2.28-fpm-alpine3.21, 8.2-fpm-alpine3.21, 8.2.28-fpm-alpine, 8.2-fpm-alpine
+Tags: 8.2.28-fpm-alpine3.22, 8.2-fpm-alpine3.22, 8.2.28-fpm-alpine, 8.2-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 1d34ec5ee5ce9fa76a776c039a9f98533cc096f8
-Directory: 8.2/alpine3.21/fpm
+GitCommit: 904a84a176cea22942566d52335794314c3b2aed
+Directory: 8.2/alpine3.22/fpm
Tags: 8.2.28-fpm-bookworm, 8.2-fpm-bookworm, 8.2.28-fpm, 8.2-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -121,15 +121,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: 1d34ec5ee5ce9fa76a776c039a9f98533cc096f8
Directory: 8.2/bullseye/fpm
-Tags: 8.2.28-zts-alpine3.20, 8.2-zts-alpine3.20
+Tags: 8.2.28-zts-alpine3.21, 8.2-zts-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 1d34ec5ee5ce9fa76a776c039a9f98533cc096f8
-Directory: 8.2/alpine3.20/zts
+Directory: 8.2/alpine3.21/zts
-Tags: 8.2.28-zts-alpine3.21, 8.2-zts-alpine3.21, 8.2.28-zts-alpine, 8.2-zts-alpine
+Tags: 8.2.28-zts-alpine3.22, 8.2-zts-alpine3.22, 8.2.28-zts-alpine, 8.2-zts-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 1d34ec5ee5ce9fa76a776c039a9f98533cc096f8
-Directory: 8.2/alpine3.21/zts
+GitCommit: 9c90483c2bb64195cc9c55cb06a4830955015830
+Directory: 8.2/alpine3.22/zts
Tags: 8.2.28-zts-bookworm, 8.2-zts-bookworm, 8.2.28-zts, 8.2-zts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -151,15 +151,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: e055cc2b6c4df1b306c59eddb6612bcc4e816c5c
Directory: 8.3/bullseye/apache
-Tags: 8.3.22-cli-alpine3.20, 8.3-cli-alpine3.20, 8.3.22-alpine3.20, 8.3-alpine3.20
+Tags: 8.3.22-cli-alpine3.21, 8.3-cli-alpine3.21, 8.3.22-alpine3.21, 8.3-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: e055cc2b6c4df1b306c59eddb6612bcc4e816c5c
-Directory: 8.3/alpine3.20/cli
+Directory: 8.3/alpine3.21/cli
-Tags: 8.3.22-cli-alpine3.21, 8.3-cli-alpine3.21, 8.3.22-alpine3.21, 8.3-alpine3.21, 8.3.22-cli-alpine, 8.3-cli-alpine, 8.3.22-alpine, 8.3-alpine
+Tags: 8.3.22-cli-alpine3.22, 8.3-cli-alpine3.22, 8.3.22-alpine3.22, 8.3-alpine3.22, 8.3.22-cli-alpine, 8.3-cli-alpine, 8.3.22-alpine, 8.3-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e055cc2b6c4df1b306c59eddb6612bcc4e816c5c
-Directory: 8.3/alpine3.21/cli
+GitCommit: 904a84a176cea22942566d52335794314c3b2aed
+Directory: 8.3/alpine3.22/cli
Tags: 8.3.22-cli-bookworm, 8.3-cli-bookworm, 8.3.22-bookworm, 8.3-bookworm, 8.3.22-cli, 8.3-cli, 8.3.22, 8.3
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -171,15 +171,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: e055cc2b6c4df1b306c59eddb6612bcc4e816c5c
Directory: 8.3/bullseye/cli
-Tags: 8.3.22-fpm-alpine3.20, 8.3-fpm-alpine3.20
+Tags: 8.3.22-fpm-alpine3.21, 8.3-fpm-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: e055cc2b6c4df1b306c59eddb6612bcc4e816c5c
-Directory: 8.3/alpine3.20/fpm
+Directory: 8.3/alpine3.21/fpm
-Tags: 8.3.22-fpm-alpine3.21, 8.3-fpm-alpine3.21, 8.3.22-fpm-alpine, 8.3-fpm-alpine
+Tags: 8.3.22-fpm-alpine3.22, 8.3-fpm-alpine3.22, 8.3.22-fpm-alpine, 8.3-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e055cc2b6c4df1b306c59eddb6612bcc4e816c5c
-Directory: 8.3/alpine3.21/fpm
+GitCommit: 904a84a176cea22942566d52335794314c3b2aed
+Directory: 8.3/alpine3.22/fpm
Tags: 8.3.22-fpm-bookworm, 8.3-fpm-bookworm, 8.3.22-fpm, 8.3-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -191,15 +191,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: e055cc2b6c4df1b306c59eddb6612bcc4e816c5c
Directory: 8.3/bullseye/fpm
-Tags: 8.3.22-zts-alpine3.20, 8.3-zts-alpine3.20
+Tags: 8.3.22-zts-alpine3.21, 8.3-zts-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: e055cc2b6c4df1b306c59eddb6612bcc4e816c5c
-Directory: 8.3/alpine3.20/zts
+Directory: 8.3/alpine3.21/zts
-Tags: 8.3.22-zts-alpine3.21, 8.3-zts-alpine3.21, 8.3.22-zts-alpine, 8.3-zts-alpine
+Tags: 8.3.22-zts-alpine3.22, 8.3-zts-alpine3.22, 8.3.22-zts-alpine, 8.3-zts-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e055cc2b6c4df1b306c59eddb6612bcc4e816c5c
-Directory: 8.3/alpine3.21/zts
+GitCommit: 9c90483c2bb64195cc9c55cb06a4830955015830
+Directory: 8.3/alpine3.22/zts
Tags: 8.3.22-zts-bookworm, 8.3-zts-bookworm, 8.3.22-zts, 8.3-zts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -221,15 +221,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: 1b31e2e0cb2a9ad2cf0c198422be888bec840a59
Directory: 8.4/bullseye/apache
-Tags: 8.4.8-cli-alpine3.20, 8.4-cli-alpine3.20, 8-cli-alpine3.20, cli-alpine3.20, 8.4.8-alpine3.20, 8.4-alpine3.20, 8-alpine3.20, alpine3.20
+Tags: 8.4.8-cli-alpine3.21, 8.4-cli-alpine3.21, 8-cli-alpine3.21, cli-alpine3.21, 8.4.8-alpine3.21, 8.4-alpine3.21, 8-alpine3.21, alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 1b31e2e0cb2a9ad2cf0c198422be888bec840a59
-Directory: 8.4/alpine3.20/cli
+Directory: 8.4/alpine3.21/cli
-Tags: 8.4.8-cli-alpine3.21, 8.4-cli-alpine3.21, 8-cli-alpine3.21, cli-alpine3.21, 8.4.8-alpine3.21, 8.4-alpine3.21, 8-alpine3.21, alpine3.21, 8.4.8-cli-alpine, 8.4-cli-alpine, 8-cli-alpine, cli-alpine, 8.4.8-alpine, 8.4-alpine, 8-alpine, alpine
+Tags: 8.4.8-cli-alpine3.22, 8.4-cli-alpine3.22, 8-cli-alpine3.22, cli-alpine3.22, 8.4.8-alpine3.22, 8.4-alpine3.22, 8-alpine3.22, alpine3.22, 8.4.8-cli-alpine, 8.4-cli-alpine, 8-cli-alpine, cli-alpine, 8.4.8-alpine, 8.4-alpine, 8-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 1b31e2e0cb2a9ad2cf0c198422be888bec840a59
-Directory: 8.4/alpine3.21/cli
+GitCommit: 904a84a176cea22942566d52335794314c3b2aed
+Directory: 8.4/alpine3.22/cli
Tags: 8.4.8-cli-bookworm, 8.4-cli-bookworm, 8-cli-bookworm, cli-bookworm, 8.4.8-bookworm, 8.4-bookworm, 8-bookworm, bookworm, 8.4.8-cli, 8.4-cli, 8-cli, cli, 8.4.8, 8.4, 8, latest
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -241,15 +241,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: 1b31e2e0cb2a9ad2cf0c198422be888bec840a59
Directory: 8.4/bullseye/cli
-Tags: 8.4.8-fpm-alpine3.20, 8.4-fpm-alpine3.20, 8-fpm-alpine3.20, fpm-alpine3.20
+Tags: 8.4.8-fpm-alpine3.21, 8.4-fpm-alpine3.21, 8-fpm-alpine3.21, fpm-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 1b31e2e0cb2a9ad2cf0c198422be888bec840a59
-Directory: 8.4/alpine3.20/fpm
+Directory: 8.4/alpine3.21/fpm
-Tags: 8.4.8-fpm-alpine3.21, 8.4-fpm-alpine3.21, 8-fpm-alpine3.21, fpm-alpine3.21, 8.4.8-fpm-alpine, 8.4-fpm-alpine, 8-fpm-alpine, fpm-alpine
+Tags: 8.4.8-fpm-alpine3.22, 8.4-fpm-alpine3.22, 8-fpm-alpine3.22, fpm-alpine3.22, 8.4.8-fpm-alpine, 8.4-fpm-alpine, 8-fpm-alpine, fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 1b31e2e0cb2a9ad2cf0c198422be888bec840a59
-Directory: 8.4/alpine3.21/fpm
+GitCommit: 904a84a176cea22942566d52335794314c3b2aed
+Directory: 8.4/alpine3.22/fpm
Tags: 8.4.8-fpm-bookworm, 8.4-fpm-bookworm, 8-fpm-bookworm, fpm-bookworm, 8.4.8-fpm, 8.4-fpm, 8-fpm, fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -261,15 +261,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: 1b31e2e0cb2a9ad2cf0c198422be888bec840a59
Directory: 8.4/bullseye/fpm
-Tags: 8.4.8-zts-alpine3.20, 8.4-zts-alpine3.20, 8-zts-alpine3.20, zts-alpine3.20
+Tags: 8.4.8-zts-alpine3.21, 8.4-zts-alpine3.21, 8-zts-alpine3.21, zts-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 1b31e2e0cb2a9ad2cf0c198422be888bec840a59
-Directory: 8.4/alpine3.20/zts
+Directory: 8.4/alpine3.21/zts
-Tags: 8.4.8-zts-alpine3.21, 8.4-zts-alpine3.21, 8-zts-alpine3.21, zts-alpine3.21, 8.4.8-zts-alpine, 8.4-zts-alpine, 8-zts-alpine, zts-alpine
+Tags: 8.4.8-zts-alpine3.22, 8.4-zts-alpine3.22, 8-zts-alpine3.22, zts-alpine3.22, 8.4.8-zts-alpine, 8.4-zts-alpine, 8-zts-alpine, zts-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 1b31e2e0cb2a9ad2cf0c198422be888bec840a59
-Directory: 8.4/alpine3.21/zts
+GitCommit: 9c90483c2bb64195cc9c55cb06a4830955015830
+Directory: 8.4/alpine3.22/zts
Tags: 8.4.8-zts-bookworm, 8.4-zts-bookworm, 8-zts-bookworm, zts-bookworm, 8.4.8-zts, 8.4-zts, 8-zts, zts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
diff --git a/_bashbrew-list b/_bashbrew-list
index 2e64314..0c11b72 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
php:8
php:8-alpine
-php:8-alpine3.20
php:8-alpine3.21
+php:8-alpine3.22
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.20
php:8-cli-alpine3.21
+php:8-cli-alpine3.22
php:8-cli-bookworm
php:8-cli-bullseye
php:8-fpm
php:8-fpm-alpine
-php:8-fpm-alpine3.20
php:8-fpm-alpine3.21
+php:8-fpm-alpine3.22
php:8-fpm-bookworm
php:8-fpm-bullseye
php:8-zts
php:8-zts-alpine
-php:8-zts-alpine3.20
php:8-zts-alpine3.21
+php:8-zts-alpine3.22
php:8-zts-bookworm
php:8-zts-bullseye
php:8.1
php:8.1-alpine
-php:8.1-alpine3.20
php:8.1-alpine3.21
+php:8.1-alpine3.22
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.20
php:8.1-cli-alpine3.21
+php:8.1-cli-alpine3.22
php:8.1-cli-bookworm
php:8.1-cli-bullseye
php:8.1-fpm
php:8.1-fpm-alpine
-php:8.1-fpm-alpine3.20
php:8.1-fpm-alpine3.21
+php:8.1-fpm-alpine3.22
php:8.1-fpm-bookworm
php:8.1-fpm-bullseye
php:8.1-zts
php:8.1-zts-alpine
-php:8.1-zts-alpine3.20
php:8.1-zts-alpine3.21
+php:8.1-zts-alpine3.22
php:8.1-zts-bookworm
php:8.1-zts-bullseye
php:8.1.32
php:8.1.32-alpine
-php:8.1.32-alpine3.20
php:8.1.32-alpine3.21
+php:8.1.32-alpine3.22
php:8.1.32-apache
php:8.1.32-apache-bookworm
php:8.1.32-apache-bullseye
@@ -63,26 +63,26 @@ php:8.1.32-bookworm
php:8.1.32-bullseye
php:8.1.32-cli
php:8.1.32-cli-alpine
-php:8.1.32-cli-alpine3.20
php:8.1.32-cli-alpine3.21
+php:8.1.32-cli-alpine3.22
php:8.1.32-cli-bookworm
php:8.1.32-cli-bullseye
php:8.1.32-fpm
php:8.1.32-fpm-alpine
-php:8.1.32-fpm-alpine3.20
php:8.1.32-fpm-alpine3.21
+php:8.1.32-fpm-alpine3.22
php:8.1.32-fpm-bookworm
php:8.1.32-fpm-bullseye
php:8.1.32-zts
php:8.1.32-zts-alpine
-php:8.1.32-zts-alpine3.20
php:8.1.32-zts-alpine3.21
+php:8.1.32-zts-alpine3.22
php:8.1.32-zts-bookworm
php:8.1.32-zts-bullseye
php:8.2
php:8.2-alpine
-php:8.2-alpine3.20
php:8.2-alpine3.21
+php:8.2-alpine3.22
php:8.2-apache
php:8.2-apache-bookworm
php:8.2-apache-bullseye
@@ -90,26 +90,26 @@ php:8.2-bookworm
php:8.2-bullseye
php:8.2-cli
php:8.2-cli-alpine
-php:8.2-cli-alpine3.20
php:8.2-cli-alpine3.21
+php:8.2-cli-alpine3.22
php:8.2-cli-bookworm
php:8.2-cli-bullseye
php:8.2-fpm
php:8.2-fpm-alpine
-php:8.2-fpm-alpine3.20
php:8.2-fpm-alpine3.21
+php:8.2-fpm-alpine3.22
php:8.2-fpm-bookworm
php:8.2-fpm-bullseye
php:8.2-zts
php:8.2-zts-alpine
-php:8.2-zts-alpine3.20
php:8.2-zts-alpine3.21
+php:8.2-zts-alpine3.22
php:8.2-zts-bookworm
php:8.2-zts-bullseye
php:8.2.28
php:8.2.28-alpine
-php:8.2.28-alpine3.20
php:8.2.28-alpine3.21
+php:8.2.28-alpine3.22
php:8.2.28-apache
php:8.2.28-apache-bookworm
php:8.2.28-apache-bullseye
@@ -117,26 +117,26 @@ php:8.2.28-bookworm
php:8.2.28-bullseye
php:8.2.28-cli
php:8.2.28-cli-alpine
-php:8.2.28-cli-alpine3.20
php:8.2.28-cli-alpine3.21
+php:8.2.28-cli-alpine3.22
php:8.2.28-cli-bookworm
php:8.2.28-cli-bullseye
php:8.2.28-fpm
php:8.2.28-fpm-alpine
-php:8.2.28-fpm-alpine3.20
php:8.2.28-fpm-alpine3.21
+php:8.2.28-fpm-alpine3.22
php:8.2.28-fpm-bookworm
php:8.2.28-fpm-bullseye
php:8.2.28-zts
php:8.2.28-zts-alpine
-php:8.2.28-zts-alpine3.20
php:8.2.28-zts-alpine3.21
+php:8.2.28-zts-alpine3.22
php:8.2.28-zts-bookworm
php:8.2.28-zts-bullseye
php:8.3
php:8.3-alpine
-php:8.3-alpine3.20
php:8.3-alpine3.21
+php:8.3-alpine3.22
php:8.3-apache
php:8.3-apache-bookworm
php:8.3-apache-bullseye
@@ -144,26 +144,26 @@ php:8.3-bookworm
php:8.3-bullseye
php:8.3-cli
php:8.3-cli-alpine
-php:8.3-cli-alpine3.20
php:8.3-cli-alpine3.21
+php:8.3-cli-alpine3.22
php:8.3-cli-bookworm
php:8.3-cli-bullseye
php:8.3-fpm
php:8.3-fpm-alpine
-php:8.3-fpm-alpine3.20
php:8.3-fpm-alpine3.21
+php:8.3-fpm-alpine3.22
php:8.3-fpm-bookworm
php:8.3-fpm-bullseye
php:8.3-zts
php:8.3-zts-alpine
-php:8.3-zts-alpine3.20
php:8.3-zts-alpine3.21
+php:8.3-zts-alpine3.22
php:8.3-zts-bookworm
php:8.3-zts-bullseye
php:8.3.22
php:8.3.22-alpine
-php:8.3.22-alpine3.20
php:8.3.22-alpine3.21
+php:8.3.22-alpine3.22
php:8.3.22-apache
php:8.3.22-apache-bookworm
php:8.3.22-apache-bullseye
@@ -171,26 +171,26 @@ php:8.3.22-bookworm
php:8.3.22-bullseye
php:8.3.22-cli
php:8.3.22-cli-alpine
-php:8.3.22-cli-alpine3.20
php:8.3.22-cli-alpine3.21
+php:8.3.22-cli-alpine3.22
php:8.3.22-cli-bookworm
php:8.3.22-cli-bullseye
php:8.3.22-fpm
php:8.3.22-fpm-alpine
-php:8.3.22-fpm-alpine3.20
php:8.3.22-fpm-alpine3.21
+php:8.3.22-fpm-alpine3.22
php:8.3.22-fpm-bookworm
php:8.3.22-fpm-bullseye
php:8.3.22-zts
php:8.3.22-zts-alpine
-php:8.3.22-zts-alpine3.20
php:8.3.22-zts-alpine3.21
+php:8.3.22-zts-alpine3.22
php:8.3.22-zts-bookworm
php:8.3.22-zts-bullseye
php:8.4
php:8.4-alpine
-php:8.4-alpine3.20
php:8.4-alpine3.21
+php:8.4-alpine3.22
php:8.4-apache
php:8.4-apache-bookworm
php:8.4-apache-bullseye
@@ -198,26 +198,26 @@ php:8.4-bookworm
php:8.4-bullseye
php:8.4-cli
php:8.4-cli-alpine
-php:8.4-cli-alpine3.20
php:8.4-cli-alpine3.21
+php:8.4-cli-alpine3.22
php:8.4-cli-bookworm
php:8.4-cli-bullseye
php:8.4-fpm
php:8.4-fpm-alpine
-php:8.4-fpm-alpine3.20
php:8.4-fpm-alpine3.21
+php:8.4-fpm-alpine3.22
php:8.4-fpm-bookworm
php:8.4-fpm-bullseye
php:8.4-zts
php:8.4-zts-alpine
-php:8.4-zts-alpine3.20
php:8.4-zts-alpine3.21
+php:8.4-zts-alpine3.22
php:8.4-zts-bookworm
php:8.4-zts-bullseye
php:8.4.8
php:8.4.8-alpine
-php:8.4.8-alpine3.20
php:8.4.8-alpine3.21
+php:8.4.8-alpine3.22
php:8.4.8-apache
php:8.4.8-apache-bookworm
php:8.4.8-apache-bullseye
@@ -225,25 +225,25 @@ php:8.4.8-bookworm
php:8.4.8-bullseye
php:8.4.8-cli
php:8.4.8-cli-alpine
-php:8.4.8-cli-alpine3.20
php:8.4.8-cli-alpine3.21
+php:8.4.8-cli-alpine3.22
php:8.4.8-cli-bookworm
php:8.4.8-cli-bullseye
php:8.4.8-fpm
php:8.4.8-fpm-alpine
-php:8.4.8-fpm-alpine3.20
php:8.4.8-fpm-alpine3.21
+php:8.4.8-fpm-alpine3.22
php:8.4.8-fpm-bookworm
php:8.4.8-fpm-bullseye
php:8.4.8-zts
php:8.4.8-zts-alpine
-php:8.4.8-zts-alpine3.20
php:8.4.8-zts-alpine3.21
+php:8.4.8-zts-alpine3.22
php:8.4.8-zts-bookworm
php:8.4.8-zts-bullseye
php:alpine
-php:alpine3.20
php:alpine3.21
+php:alpine3.22
php:apache
php:apache-bookworm
php:apache-bullseye
@@ -251,20 +251,20 @@ php:bookworm
php:bullseye
php:cli
php:cli-alpine
-php:cli-alpine3.20
php:cli-alpine3.21
+php:cli-alpine3.22
php:cli-bookworm
php:cli-bullseye
php:fpm
php:fpm-alpine
-php:fpm-alpine3.20
php:fpm-alpine3.21
+php:fpm-alpine3.22
php:fpm-bookworm
php:fpm-bullseye
php:latest
php:zts
php:zts-alpine
-php:zts-alpine3.20
php:zts-alpine3.21
+php:zts-alpine3.22
php:zts-bookworm
php:zts-bullseye
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index a456f48..3ba845e 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,56 +1,56 @@
php:8.1
php:8.1-alpine
-php:8.1-alpine3.20
+php:8.1-alpine3.21
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.20
+php:8.1-fpm-alpine3.21
php:8.1-fpm-bullseye
php:8.1-zts
php:8.1-zts-alpine
-php:8.1-zts-alpine3.20
+php:8.1-zts-alpine3.21
php:8.1-zts-bullseye
php:8.2
php:8.2-alpine
-php:8.2-alpine3.20
+php:8.2-alpine3.21
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.20
+php:8.2-fpm-alpine3.21
php:8.2-fpm-bullseye
php:8.2-zts
php:8.2-zts-alpine
-php:8.2-zts-alpine3.20
+php:8.2-zts-alpine3.21
php:8.2-zts-bullseye
php:8.3
php:8.3-alpine
-php:8.3-alpine3.20
+php:8.3-alpine3.21
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.20
+php:8.3-fpm-alpine3.21
php:8.3-fpm-bullseye
php:8.3-zts
php:8.3-zts-alpine
-php:8.3-zts-alpine3.20
+php:8.3-zts-alpine3.21
php:8.3-zts-bullseye
php:alpine
-php:alpine3.20
+php:alpine3.21
php:apache
php:apache-bullseye
php:bullseye
php:fpm
php:fpm-alpine
-php:fpm-alpine3.20
+php:fpm-alpine3.21
php:fpm-bullseye
php:latest
php:zts
php:zts-alpine
-php:zts-alpine3.20
+php:zts-alpine3.21
php:zts-bullseye
diff --git a/php_8.1-alpine/Dockerfile b/php_8.1-alpine/Dockerfile
index 0f1c34a..c6271d3 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.21
+FROM alpine:3.22
# 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.1-alpine3.20/Dockerfile b/php_8.1-alpine3.20/Dockerfile
deleted file mode 100644
index 9c0f063..0000000
diff --git a/php_8.1-alpine/Dockerfile b/php_8.1-alpine3.21/Dockerfile
similarity index 100%
copy from php_8.1-alpine/Dockerfile
copy to php_8.1-alpine3.21/Dockerfile
diff --git a/php_8.1-alpine3.20/docker-php-entrypoint b/php_8.1-alpine3.21/docker-php-entrypoint
similarity index 100%
rename from php_8.1-alpine3.20/docker-php-entrypoint
rename to php_8.1-alpine3.21/docker-php-entrypoint
diff --git a/php_8.1-alpine3.20/docker-php-ext-configure b/php_8.1-alpine3.21/docker-php-ext-configure
similarity index 100%
rename from php_8.1-alpine3.20/docker-php-ext-configure
rename to php_8.1-alpine3.21/docker-php-ext-configure
diff --git a/php_8.1-alpine3.20/docker-php-ext-enable b/php_8.1-alpine3.21/docker-php-ext-enable
similarity index 100%
rename from php_8.1-alpine3.20/docker-php-ext-enable
rename to php_8.1-alpine3.21/docker-php-ext-enable
diff --git a/php_8.1-alpine3.20/docker-php-ext-install b/php_8.1-alpine3.21/docker-php-ext-install
similarity index 100%
rename from php_8.1-alpine3.20/docker-php-ext-install
rename to php_8.1-alpine3.21/docker-php-ext-install
diff --git a/php_8.1-alpine3.20/docker-php-source b/php_8.1-alpine3.21/docker-php-source
similarity index 100%
rename from php_8.1-alpine3.20/docker-php-source
rename to php_8.1-alpine3.21/docker-php-source
diff --git a/php_8.1-fpm-alpine/Dockerfile b/php_8.1-fpm-alpine/Dockerfile
index 73c7f78..89853a1 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.21
+FROM alpine:3.22
# 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.1-fpm-alpine3.20/Dockerfile b/php_8.1-fpm-alpine3.20/Dockerfile
deleted file mode 100644
index 0211935..0000000
diff --git a/php_8.1-fpm-alpine/Dockerfile b/php_8.1-fpm-alpine3.21/Dockerfile
similarity index 100%
copy from php_8.1-fpm-alpine/Dockerfile
copy to php_8.1-fpm-alpine3.21/Dockerfile
diff --git a/php_8.1-fpm-alpine3.20/docker-php-entrypoint b/php_8.1-fpm-alpine3.21/docker-php-entrypoint
similarity index 100%
rename from php_8.1-fpm-alpine3.20/docker-php-entrypoint
rename to php_8.1-fpm-alpine3.21/docker-php-entrypoint
diff --git a/php_8.1-fpm-alpine3.20/docker-php-ext-configure b/php_8.1-fpm-alpine3.21/docker-php-ext-configure
similarity index 100%
rename from php_8.1-fpm-alpine3.20/docker-php-ext-configure
rename to php_8.1-fpm-alpine3.21/docker-php-ext-configure
diff --git a/php_8.1-fpm-alpine3.20/docker-php-ext-enable b/php_8.1-fpm-alpine3.21/docker-php-ext-enable
similarity index 100%
rename from php_8.1-fpm-alpine3.20/docker-php-ext-enable
rename to php_8.1-fpm-alpine3.21/docker-php-ext-enable
diff --git a/php_8.1-fpm-alpine3.20/docker-php-ext-install b/php_8.1-fpm-alpine3.21/docker-php-ext-install
similarity index 100%
rename from php_8.1-fpm-alpine3.20/docker-php-ext-install
rename to php_8.1-fpm-alpine3.21/docker-php-ext-install
diff --git a/php_8.1-fpm-alpine3.20/docker-php-source b/php_8.1-fpm-alpine3.21/docker-php-source
similarity index 100%
rename from php_8.1-fpm-alpine3.20/docker-php-source
rename to php_8.1-fpm-alpine3.21/docker-php-source
diff --git a/php_8.1-zts-alpine/Dockerfile b/php_8.1-zts-alpine/Dockerfile
index 90d4c67..168800d 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.21
+FROM alpine:3.22
# dependencies required for running "phpize"
# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -130,6 +130,12 @@ RUN set -eux; \
echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
filterdiff -x '*/NEWS' 14834.patch | patch -p1; \
rm 14834.patch; \
+ # https://github.com/php/php-src/issues/18743 "Incompatibility in Inline TLS Assembly on Alpine 3.22 with zend_jit_ir.c"
+ # https://github.com/docker-library/php/pull/1580
+ curl -fL 'https://github.com/php/php-src/commit/6b105d4bc57e20a2472c9a6ff11fba32768556d4.patch?full_index=1' -o 18743.patch; \
+ echo '037e1610ae5d444e9a8c3ecd9d5f0cd215fd0aac90bdd7b9f0b259bffdf3566b *18743.patch' | sha256sum -c -; \
+ filterdiff -x '*/NEWS' 18743.patch | patch -p1; \
+ rm 18743.patch; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
./configure \
--build="$gnuArch" \
diff --git a/php_8.1-zts-alpine3.20/Dockerfile b/php_8.1-zts-alpine3.20/Dockerfile
deleted file mode 100644
index 03bab09..0000000
diff --git a/php_8.1-zts-alpine/Dockerfile b/php_8.1-zts-alpine3.21/Dockerfile
similarity index 100%
copy from php_8.1-zts-alpine/Dockerfile
copy to php_8.1-zts-alpine3.21/Dockerfile
diff --git a/php_8.1-zts-alpine3.20/docker-php-entrypoint b/php_8.1-zts-alpine3.21/docker-php-entrypoint
similarity index 100%
rename from php_8.1-zts-alpine3.20/docker-php-entrypoint
rename to php_8.1-zts-alpine3.21/docker-php-entrypoint
diff --git a/php_8.1-zts-alpine3.20/docker-php-ext-configure b/php_8.1-zts-alpine3.21/docker-php-ext-configure
similarity index 100%
rename from php_8.1-zts-alpine3.20/docker-php-ext-configure
rename to php_8.1-zts-alpine3.21/docker-php-ext-configure
diff --git a/php_8.1-zts-alpine3.20/docker-php-ext-enable b/php_8.1-zts-alpine3.21/docker-php-ext-enable
similarity index 100%
rename from php_8.1-zts-alpine3.20/docker-php-ext-enable
rename to php_8.1-zts-alpine3.21/docker-php-ext-enable
diff --git a/php_8.1-zts-alpine3.20/docker-php-ext-install b/php_8.1-zts-alpine3.21/docker-php-ext-install
similarity index 100%
rename from php_8.1-zts-alpine3.20/docker-php-ext-install
rename to php_8.1-zts-alpine3.21/docker-php-ext-install
diff --git a/php_8.1-zts-alpine3.20/docker-php-source b/php_8.1-zts-alpine3.21/docker-php-source
similarity index 100%
rename from php_8.1-zts-alpine3.20/docker-php-source
rename to php_8.1-zts-alpine3.21/docker-php-source
diff --git a/php_8.2-alpine/Dockerfile b/php_8.2-alpine/Dockerfile
index 4a77709..6df54d8 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.21
+FROM alpine:3.22
# 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.20/Dockerfile b/php_8.2-alpine3.20/Dockerfile
deleted file mode 100644
index e057e15..0000000
diff --git a/php_8.2-alpine/Dockerfile b/php_8.2-alpine3.21/Dockerfile
similarity index 100%
copy from php_8.2-alpine/Dockerfile
copy to php_8.2-alpine3.21/Dockerfile
diff --git a/php_8.2-alpine3.20/docker-php-entrypoint b/php_8.2-alpine3.21/docker-php-entrypoint
similarity index 100%
rename from php_8.2-alpine3.20/docker-php-entrypoint
rename to php_8.2-alpine3.21/docker-php-entrypoint
diff --git a/php_8.2-alpine3.20/docker-php-ext-configure b/php_8.2-alpine3.21/docker-php-ext-configure
similarity index 100%
rename from php_8.2-alpine3.20/docker-php-ext-configure
rename to php_8.2-alpine3.21/docker-php-ext-configure
diff --git a/php_8.2-alpine3.20/docker-php-ext-enable b/php_8.2-alpine3.21/docker-php-ext-enable
similarity index 100%
rename from php_8.2-alpine3.20/docker-php-ext-enable
rename to php_8.2-alpine3.21/docker-php-ext-enable
diff --git a/php_8.2-alpine3.20/docker-php-ext-install b/php_8.2-alpine3.21/docker-php-ext-install
similarity index 100%
rename from php_8.2-alpine3.20/docker-php-ext-install
rename to php_8.2-alpine3.21/docker-php-ext-install
diff --git a/php_8.2-alpine3.20/docker-php-source b/php_8.2-alpine3.21/docker-php-source
similarity index 100%
rename from php_8.2-alpine3.20/docker-php-source
rename to php_8.2-alpine3.21/docker-php-source
diff --git a/php_8.2-fpm-alpine/Dockerfile b/php_8.2-fpm-alpine/Dockerfile
index 3140493..fdcfe60 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.21
+FROM alpine:3.22
# 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.20/Dockerfile b/php_8.2-fpm-alpine3.20/Dockerfile
deleted file mode 100644
index 27414f5..0000000
diff --git a/php_8.2-fpm-alpine/Dockerfile b/php_8.2-fpm-alpine3.21/Dockerfile
similarity index 100%
copy from php_8.2-fpm-alpine/Dockerfile
copy to php_8.2-fpm-alpine3.21/Dockerfile
diff --git a/php_8.2-fpm-alpine3.20/docker-php-entrypoint b/php_8.2-fpm-alpine3.21/docker-php-entrypoint
similarity index 100%
rename from php_8.2-fpm-alpine3.20/docker-php-entrypoint
rename to php_8.2-fpm-alpine3.21/docker-php-entrypoint
diff --git a/php_8.2-fpm-alpine3.20/docker-php-ext-configure b/php_8.2-fpm-alpine3.21/docker-php-ext-configure
similarity index 100%
rename from php_8.2-fpm-alpine3.20/docker-php-ext-configure
rename to php_8.2-fpm-alpine3.21/docker-php-ext-configure
diff --git a/php_8.2-fpm-alpine3.20/docker-php-ext-enable b/php_8.2-fpm-alpine3.21/docker-php-ext-enable
similarity index 100%
rename from php_8.2-fpm-alpine3.20/docker-php-ext-enable
rename to php_8.2-fpm-alpine3.21/docker-php-ext-enable
diff --git a/php_8.2-fpm-alpine3.20/docker-php-ext-install b/php_8.2-fpm-alpine3.21/docker-php-ext-install
similarity index 100%
rename from php_8.2-fpm-alpine3.20/docker-php-ext-install
rename to php_8.2-fpm-alpine3.21/docker-php-ext-install
diff --git a/php_8.2-fpm-alpine3.20/docker-php-source b/php_8.2-fpm-alpine3.21/docker-php-source
similarity index 100%
rename from php_8.2-fpm-alpine3.20/docker-php-source
rename to php_8.2-fpm-alpine3.21/docker-php-source
diff --git a/php_8.2-zts-alpine/Dockerfile b/php_8.2-zts-alpine/Dockerfile
index 956e7a3..0932180 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.21
+FROM alpine:3.22
# 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,12 @@ RUN set -eux; \
; \
docker-php-source extract; \
cd /usr/src/php; \
+ # https://github.com/php/php-src/issues/18743 "Incompatibility in Inline TLS Assembly on Alpine 3.22 with zend_jit_ir.c"
+ # https://github.com/docker-library/php/pull/1580
+ curl -fL 'https://github.com/php/php-src/commit/b3c8afe272a6919248986c703c2e1defc73ff707.patch?full_index=1' -o 18743.patch; \
+ echo 'b334f73434c9732a4b27a42eb5d417e10df842e854c02a3e753b2479f8978bf5 *18743.patch' | sha256sum -c -; \
+ filterdiff -x '*/NEWS' 18743.patch | patch -p1; \
+ rm 18743.patch; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
./configure \
--build="$gnuArch" \
diff --git a/php_8.2-zts-alpine3.20/Dockerfile b/php_8.2-zts-alpine3.20/Dockerfile
deleted file mode 100644
index 101d681..0000000
diff --git a/php_8.2-zts-alpine/Dockerfile b/php_8.2-zts-alpine3.21/Dockerfile
similarity index 100%
copy from php_8.2-zts-alpine/Dockerfile
copy to php_8.2-zts-alpine3.21/Dockerfile
diff --git a/php_8.2-zts-alpine3.20/docker-php-entrypoint b/php_8.2-zts-alpine3.21/docker-php-entrypoint
similarity index 100%
rename from php_8.2-zts-alpine3.20/docker-php-entrypoint
rename to php_8.2-zts-alpine3.21/docker-php-entrypoint
diff --git a/php_8.2-zts-alpine3.20/docker-php-ext-configure b/php_8.2-zts-alpine3.21/docker-php-ext-configure
similarity index 100%
rename from php_8.2-zts-alpine3.20/docker-php-ext-configure
rename to php_8.2-zts-alpine3.21/docker-php-ext-configure
diff --git a/php_8.2-zts-alpine3.20/docker-php-ext-enable b/php_8.2-zts-alpine3.21/docker-php-ext-enable
similarity index 100%
rename from php_8.2-zts-alpine3.20/docker-php-ext-enable
rename to php_8.2-zts-alpine3.21/docker-php-ext-enable
diff --git a/php_8.2-zts-alpine3.20/docker-php-ext-install b/php_8.2-zts-alpine3.21/docker-php-ext-install
similarity index 100%
rename from php_8.2-zts-alpine3.20/docker-php-ext-install
rename to php_8.2-zts-alpine3.21/docker-php-ext-install
diff --git a/php_8.2-zts-alpine3.20/docker-php-source b/php_8.2-zts-alpine3.21/docker-php-source
similarity index 100%
rename from php_8.2-zts-alpine3.20/docker-php-source
rename to php_8.2-zts-alpine3.21/docker-php-source
diff --git a/php_8.3-alpine/Dockerfile b/php_8.3-alpine/Dockerfile
index 30e2fbf..adad4cb 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.21
+FROM alpine:3.22
# 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.20/Dockerfile b/php_8.3-alpine3.20/Dockerfile
deleted file mode 100644
index 4cfbc84..0000000
diff --git a/php_8.3-alpine/Dockerfile b/php_8.3-alpine3.21/Dockerfile
similarity index 100%
copy from php_8.3-alpine/Dockerfile
copy to php_8.3-alpine3.21/Dockerfile
diff --git a/php_8.3-alpine3.20/docker-php-entrypoint b/php_8.3-alpine3.21/docker-php-entrypoint
similarity index 100%
rename from php_8.3-alpine3.20/docker-php-entrypoint
rename to php_8.3-alpine3.21/docker-php-entrypoint
diff --git a/php_8.3-alpine3.20/docker-php-ext-configure b/php_8.3-alpine3.21/docker-php-ext-configure
similarity index 100%
rename from php_8.3-alpine3.20/docker-php-ext-configure
rename to php_8.3-alpine3.21/docker-php-ext-configure
diff --git a/php_8.3-alpine3.20/docker-php-ext-enable b/php_8.3-alpine3.21/docker-php-ext-enable
similarity index 100%
rename from php_8.3-alpine3.20/docker-php-ext-enable
rename to php_8.3-alpine3.21/docker-php-ext-enable
diff --git a/php_8.3-alpine3.20/docker-php-ext-install b/php_8.3-alpine3.21/docker-php-ext-install
similarity index 100%
rename from php_8.3-alpine3.20/docker-php-ext-install
rename to php_8.3-alpine3.21/docker-php-ext-install
diff --git a/php_8.3-alpine3.20/docker-php-source b/php_8.3-alpine3.21/docker-php-source
similarity index 100%
rename from php_8.3-alpine3.20/docker-php-source
rename to php_8.3-alpine3.21/docker-php-source
diff --git a/php_8.3-fpm-alpine/Dockerfile b/php_8.3-fpm-alpine/Dockerfile
index efe7408..1d280e5 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.21
+FROM alpine:3.22
# 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.20/Dockerfile b/php_8.3-fpm-alpine3.20/Dockerfile
deleted file mode 100644
index 2e9d6fe..0000000
diff --git a/php_8.3-fpm-alpine/Dockerfile b/php_8.3-fpm-alpine3.21/Dockerfile
similarity index 100%
copy from php_8.3-fpm-alpine/Dockerfile
copy to php_8.3-fpm-alpine3.21/Dockerfile
diff --git a/php_8.3-fpm-alpine3.20/docker-php-entrypoint b/php_8.3-fpm-alpine3.21/docker-php-entrypoint
similarity index 100%
rename from php_8.3-fpm-alpine3.20/docker-php-entrypoint
rename to php_8.3-fpm-alpine3.21/docker-php-entrypoint
diff --git a/php_8.3-fpm-alpine3.20/docker-php-ext-configure b/php_8.3-fpm-alpine3.21/docker-php-ext-configure
similarity index 100%
rename from php_8.3-fpm-alpine3.20/docker-php-ext-configure
rename to php_8.3-fpm-alpine3.21/docker-php-ext-configure
diff --git a/php_8.3-fpm-alpine3.20/docker-php-ext-enable b/php_8.3-fpm-alpine3.21/docker-php-ext-enable
similarity index 100%
rename from php_8.3-fpm-alpine3.20/docker-php-ext-enable
rename to php_8.3-fpm-alpine3.21/docker-php-ext-enable
diff --git a/php_8.3-fpm-alpine3.20/docker-php-ext-install b/php_8.3-fpm-alpine3.21/docker-php-ext-install
similarity index 100%
rename from php_8.3-fpm-alpine3.20/docker-php-ext-install
rename to php_8.3-fpm-alpine3.21/docker-php-ext-install
diff --git a/php_8.3-fpm-alpine3.20/docker-php-source b/php_8.3-fpm-alpine3.21/docker-php-source
similarity index 100%
rename from php_8.3-fpm-alpine3.20/docker-php-source
rename to php_8.3-fpm-alpine3.21/docker-php-source
diff --git a/php_8.3-zts-alpine/Dockerfile b/php_8.3-zts-alpine/Dockerfile
index b5a102b..816d9d4 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.21
+FROM alpine:3.22
# 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,12 @@ RUN set -eux; \
; \
docker-php-source extract; \
cd /usr/src/php; \
+ # https://github.com/php/php-src/issues/18743 "Incompatibility in Inline TLS Assembly on Alpine 3.22 with zend_jit_ir.c"
+ # https://github.com/docker-library/php/pull/1580
+ curl -fL 'https://github.com/php/php-src/commit/b3c8afe272a6919248986c703c2e1defc73ff707.patch?full_index=1' -o 18743.patch; \
+ echo 'b334f73434c9732a4b27a42eb5d417e10df842e854c02a3e753b2479f8978bf5 *18743.patch' | sha256sum -c -; \
+ filterdiff -x '*/NEWS' 18743.patch | patch -p1; \
+ rm 18743.patch; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
./configure \
--build="$gnuArch" \
diff --git a/php_8.3-zts-alpine3.20/Dockerfile b/php_8.3-zts-alpine3.20/Dockerfile
deleted file mode 100644
index fc60874..0000000
diff --git a/php_8.3-zts-alpine/Dockerfile b/php_8.3-zts-alpine3.21/Dockerfile
similarity index 100%
copy from php_8.3-zts-alpine/Dockerfile
copy to php_8.3-zts-alpine3.21/Dockerfile
diff --git a/php_8.3-zts-alpine3.20/docker-php-entrypoint b/php_8.3-zts-alpine3.21/docker-php-entrypoint
similarity index 100%
rename from php_8.3-zts-alpine3.20/docker-php-entrypoint
rename to php_8.3-zts-alpine3.21/docker-php-entrypoint
diff --git a/php_8.3-zts-alpine3.20/docker-php-ext-configure b/php_8.3-zts-alpine3.21/docker-php-ext-configure
similarity index 100%
rename from php_8.3-zts-alpine3.20/docker-php-ext-configure
rename to php_8.3-zts-alpine3.21/docker-php-ext-configure
diff --git a/php_8.3-zts-alpine3.20/docker-php-ext-enable b/php_8.3-zts-alpine3.21/docker-php-ext-enable
similarity index 100%
rename from php_8.3-zts-alpine3.20/docker-php-ext-enable
rename to php_8.3-zts-alpine3.21/docker-php-ext-enable
diff --git a/php_8.3-zts-alpine3.20/docker-php-ext-install b/php_8.3-zts-alpine3.21/docker-php-ext-install
similarity index 100%
rename from php_8.3-zts-alpine3.20/docker-php-ext-install
rename to php_8.3-zts-alpine3.21/docker-php-ext-install
diff --git a/php_8.3-zts-alpine3.20/docker-php-source b/php_8.3-zts-alpine3.21/docker-php-source
similarity index 100%
rename from php_8.3-zts-alpine3.20/docker-php-source
rename to php_8.3-zts-alpine3.21/docker-php-source
diff --git a/php_alpine/Dockerfile b/php_alpine/Dockerfile
index e405ac0..2afa8f2 100644
--- a/php_alpine/Dockerfile
+++ b/php_alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.21
+FROM alpine:3.22
# 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.20/Dockerfile b/php_alpine3.20/Dockerfile
deleted file mode 100644
index ef4dcb7..0000000
diff --git a/php_alpine/Dockerfile b/php_alpine3.21/Dockerfile
similarity index 100%
copy from php_alpine/Dockerfile
copy to php_alpine3.21/Dockerfile
diff --git a/php_alpine3.20/docker-php-entrypoint b/php_alpine3.21/docker-php-entrypoint
similarity index 100%
rename from php_alpine3.20/docker-php-entrypoint
rename to php_alpine3.21/docker-php-entrypoint
diff --git a/php_alpine3.20/docker-php-ext-configure b/php_alpine3.21/docker-php-ext-configure
similarity index 100%
rename from php_alpine3.20/docker-php-ext-configure
rename to php_alpine3.21/docker-php-ext-configure
diff --git a/php_alpine3.20/docker-php-ext-enable b/php_alpine3.21/docker-php-ext-enable
similarity index 100%
rename from php_alpine3.20/docker-php-ext-enable
rename to php_alpine3.21/docker-php-ext-enable
diff --git a/php_alpine3.20/docker-php-ext-install b/php_alpine3.21/docker-php-ext-install
similarity index 100%
rename from php_alpine3.20/docker-php-ext-install
rename to php_alpine3.21/docker-php-ext-install
diff --git a/php_alpine3.20/docker-php-source b/php_alpine3.21/docker-php-source
similarity index 100%
rename from php_alpine3.20/docker-php-source
rename to php_alpine3.21/docker-php-source
diff --git a/php_fpm-alpine/Dockerfile b/php_fpm-alpine/Dockerfile
index 3f9c2eb..dd4932b 100644
--- a/php_fpm-alpine/Dockerfile
+++ b/php_fpm-alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.21
+FROM alpine:3.22
# 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.20/Dockerfile b/php_fpm-alpine3.20/Dockerfile
deleted file mode 100644
index 15b4121..0000000
diff --git a/php_fpm-alpine/Dockerfile b/php_fpm-alpine3.21/Dockerfile
similarity index 100%
copy from php_fpm-alpine/Dockerfile
copy to php_fpm-alpine3.21/Dockerfile
diff --git a/php_fpm-alpine3.20/docker-php-entrypoint b/php_fpm-alpine3.21/docker-php-entrypoint
similarity index 100%
rename from php_fpm-alpine3.20/docker-php-entrypoint
rename to php_fpm-alpine3.21/docker-php-entrypoint
diff --git a/php_fpm-alpine3.20/docker-php-ext-configure b/php_fpm-alpine3.21/docker-php-ext-configure
similarity index 100%
rename from php_fpm-alpine3.20/docker-php-ext-configure
rename to php_fpm-alpine3.21/docker-php-ext-configure
diff --git a/php_fpm-alpine3.20/docker-php-ext-enable b/php_fpm-alpine3.21/docker-php-ext-enable
similarity index 100%
rename from php_fpm-alpine3.20/docker-php-ext-enable
rename to php_fpm-alpine3.21/docker-php-ext-enable
diff --git a/php_fpm-alpine3.20/docker-php-ext-install b/php_fpm-alpine3.21/docker-php-ext-install
similarity index 100%
rename from php_fpm-alpine3.20/docker-php-ext-install
rename to php_fpm-alpine3.21/docker-php-ext-install
diff --git a/php_fpm-alpine3.20/docker-php-source b/php_fpm-alpine3.21/docker-php-source
similarity index 100%
rename from php_fpm-alpine3.20/docker-php-source
rename to php_fpm-alpine3.21/docker-php-source
diff --git a/php_zts-alpine/Dockerfile b/php_zts-alpine/Dockerfile
index 955242e..f51a98b 100644
--- a/php_zts-alpine/Dockerfile
+++ b/php_zts-alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.21
+FROM alpine:3.22
# 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,12 @@ RUN set -eux; \
; \
docker-php-source extract; \
cd /usr/src/php; \
+ # https://github.com/php/php-src/issues/18743 "Incompatibility in Inline TLS Assembly on Alpine 3.22 with zend_jit_ir.c"
+ # https://github.com/docker-library/php/pull/1580
+ curl -fL 'https://github.com/php/php-src/commit/4c7220322bc74b0fc8416e1958cadd7bc51fe1b7.diff?full_index=1' -o 18743.patch; \
+ echo 'a19e795b24c52d4d1aa3d45b67339e1b62a5365b37cf4418b83e2709fc98bcb5 *18743.patch' | sha256sum -c -; \
+ filterdiff -x '*/NEWS' 18743.patch | patch -p1; \
+ rm 18743.patch; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
./configure \
--build="$gnuArch" \
diff --git a/php_zts-alpine3.20/Dockerfile b/php_zts-alpine3.20/Dockerfile
deleted file mode 100644
index dfde7fa..0000000
diff --git a/php_zts-alpine/Dockerfile b/php_zts-alpine3.21/Dockerfile
similarity index 100%
copy from php_zts-alpine/Dockerfile
copy to php_zts-alpine3.21/Dockerfile
diff --git a/php_zts-alpine3.20/docker-php-entrypoint b/php_zts-alpine3.21/docker-php-entrypoint
similarity index 100%
rename from php_zts-alpine3.20/docker-php-entrypoint
rename to php_zts-alpine3.21/docker-php-entrypoint
diff --git a/php_zts-alpine3.20/docker-php-ext-configure b/php_zts-alpine3.21/docker-php-ext-configure
similarity index 100%
rename from php_zts-alpine3.20/docker-php-ext-configure
rename to php_zts-alpine3.21/docker-php-ext-configure
diff --git a/php_zts-alpine3.20/docker-php-ext-enable b/php_zts-alpine3.21/docker-php-ext-enable
similarity index 100%
rename from php_zts-alpine3.20/docker-php-ext-enable
rename to php_zts-alpine3.21/docker-php-ext-enable
diff --git a/php_zts-alpine3.20/docker-php-ext-install b/php_zts-alpine3.21/docker-php-ext-install
similarity index 100%
rename from php_zts-alpine3.20/docker-php-ext-install
rename to php_zts-alpine3.21/docker-php-ext-install
diff --git a/php_zts-alpine3.20/docker-php-source b/php_zts-alpine3.21/docker-php-source
similarity index 100%
rename from php_zts-alpine3.20/docker-php-source
rename to php_zts-alpine3.21/docker-php-sourceRelevant Maintainers: |
tianon
approved these changes
Jun 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: