Update php #19270
Merged
Update php #19270
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@10441340: Merge pull request docker-library/php#1586 from infosiftr/8.1-alpine - docker-library/php@3f6d4a37: Change default Alpine image for 8.1
yosifkit
approved these changes
Jun 13, 2025
Diff for a5d5423:diff --git a/_bashbrew-cat b/_bashbrew-cat
index f7230a2..1e2dbf1 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -11,12 +11,12 @@ Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: aada98fe2ddd5df2b73e25ecf552c954b299f928
Directory: 8.1/bullseye/apache
-Tags: 8.1.32-cli-alpine3.21, 8.1-cli-alpine3.21, 8.1.32-alpine3.21, 8.1-alpine3.21
+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
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: aada98fe2ddd5df2b73e25ecf552c954b299f928
Directory: 8.1/alpine3.21/cli
-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
+Tags: 8.1.32-cli-alpine3.22, 8.1-cli-alpine3.22, 8.1.32-alpine3.22, 8.1-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 904a84a176cea22942566d52335794314c3b2aed
Directory: 8.1/alpine3.22/cli
@@ -31,12 +31,12 @@ Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: aada98fe2ddd5df2b73e25ecf552c954b299f928
Directory: 8.1/bullseye/cli
-Tags: 8.1.32-fpm-alpine3.21, 8.1-fpm-alpine3.21
+Tags: 8.1.32-fpm-alpine3.21, 8.1-fpm-alpine3.21, 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
-Tags: 8.1.32-fpm-alpine3.22, 8.1-fpm-alpine3.22, 8.1.32-fpm-alpine, 8.1-fpm-alpine
+Tags: 8.1.32-fpm-alpine3.22, 8.1-fpm-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 904a84a176cea22942566d52335794314c3b2aed
Directory: 8.1/alpine3.22/fpm
@@ -51,12 +51,12 @@ Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: aada98fe2ddd5df2b73e25ecf552c954b299f928
Directory: 8.1/bullseye/fpm
-Tags: 8.1.32-zts-alpine3.21, 8.1-zts-alpine3.21
+Tags: 8.1.32-zts-alpine3.21, 8.1-zts-alpine3.21, 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
-Tags: 8.1.32-zts-alpine3.22, 8.1-zts-alpine3.22, 8.1.32-zts-alpine, 8.1-zts-alpine
+Tags: 8.1.32-zts-alpine3.22, 8.1-zts-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 9c90483c2bb64195cc9c55cb06a4830955015830
Directory: 8.1/alpine3.22/zts
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 3ba845e..1ce9803 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,16 +1,16 @@
php:8.1
php:8.1-alpine
-php:8.1-alpine3.21
+php:8.1-alpine3.22
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.21
+php:8.1-fpm-alpine3.22
php:8.1-fpm-bullseye
php:8.1-zts
php:8.1-zts-alpine
-php:8.1-zts-alpine3.21
+php:8.1-zts-alpine3.22
php:8.1-zts-bullseye
php:8.2
php:8.2-alpine
diff --git a/php_8.1-alpine/Dockerfile b/php_8.1-alpine/Dockerfile
index c6271d3..0f1c34a 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.22
+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.1-alpine3.21/Dockerfile b/php_8.1-alpine3.21/Dockerfile
deleted file mode 100644
index 0f1c34a..0000000
diff --git a/php_8.1-alpine/Dockerfile b/php_8.1-alpine3.22/Dockerfile
similarity index 100%
copy from php_8.1-alpine/Dockerfile
copy to php_8.1-alpine3.22/Dockerfile
diff --git a/php_8.1-alpine3.21/docker-php-entrypoint b/php_8.1-alpine3.22/docker-php-entrypoint
similarity index 100%
rename from php_8.1-alpine3.21/docker-php-entrypoint
rename to php_8.1-alpine3.22/docker-php-entrypoint
diff --git a/php_8.1-alpine3.21/docker-php-ext-configure b/php_8.1-alpine3.22/docker-php-ext-configure
similarity index 100%
rename from php_8.1-alpine3.21/docker-php-ext-configure
rename to php_8.1-alpine3.22/docker-php-ext-configure
diff --git a/php_8.1-alpine3.21/docker-php-ext-enable b/php_8.1-alpine3.22/docker-php-ext-enable
similarity index 100%
rename from php_8.1-alpine3.21/docker-php-ext-enable
rename to php_8.1-alpine3.22/docker-php-ext-enable
diff --git a/php_8.1-alpine3.21/docker-php-ext-install b/php_8.1-alpine3.22/docker-php-ext-install
similarity index 100%
rename from php_8.1-alpine3.21/docker-php-ext-install
rename to php_8.1-alpine3.22/docker-php-ext-install
diff --git a/php_8.1-alpine3.21/docker-php-source b/php_8.1-alpine3.22/docker-php-source
similarity index 100%
rename from php_8.1-alpine3.21/docker-php-source
rename to php_8.1-alpine3.22/docker-php-source
diff --git a/php_8.1-fpm-alpine/Dockerfile b/php_8.1-fpm-alpine/Dockerfile
index 89853a1..73c7f78 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.22
+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.1-fpm-alpine3.21/Dockerfile b/php_8.1-fpm-alpine3.21/Dockerfile
deleted file mode 100644
index 73c7f78..0000000
diff --git a/php_8.1-fpm-alpine/Dockerfile b/php_8.1-fpm-alpine3.22/Dockerfile
similarity index 100%
copy from php_8.1-fpm-alpine/Dockerfile
copy to php_8.1-fpm-alpine3.22/Dockerfile
diff --git a/php_8.1-fpm-alpine3.21/docker-php-entrypoint b/php_8.1-fpm-alpine3.22/docker-php-entrypoint
similarity index 100%
rename from php_8.1-fpm-alpine3.21/docker-php-entrypoint
rename to php_8.1-fpm-alpine3.22/docker-php-entrypoint
diff --git a/php_8.1-fpm-alpine3.21/docker-php-ext-configure b/php_8.1-fpm-alpine3.22/docker-php-ext-configure
similarity index 100%
rename from php_8.1-fpm-alpine3.21/docker-php-ext-configure
rename to php_8.1-fpm-alpine3.22/docker-php-ext-configure
diff --git a/php_8.1-fpm-alpine3.21/docker-php-ext-enable b/php_8.1-fpm-alpine3.22/docker-php-ext-enable
similarity index 100%
rename from php_8.1-fpm-alpine3.21/docker-php-ext-enable
rename to php_8.1-fpm-alpine3.22/docker-php-ext-enable
diff --git a/php_8.1-fpm-alpine3.21/docker-php-ext-install b/php_8.1-fpm-alpine3.22/docker-php-ext-install
similarity index 100%
rename from php_8.1-fpm-alpine3.21/docker-php-ext-install
rename to php_8.1-fpm-alpine3.22/docker-php-ext-install
diff --git a/php_8.1-fpm-alpine3.21/docker-php-source b/php_8.1-fpm-alpine3.22/docker-php-source
similarity index 100%
rename from php_8.1-fpm-alpine3.21/docker-php-source
rename to php_8.1-fpm-alpine3.22/docker-php-source
diff --git a/php_8.1-zts-alpine/Dockerfile b/php_8.1-zts-alpine/Dockerfile
index 168800d..90d4c67 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.22
+FROM alpine:3.21
# dependencies required for running "phpize"
# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -130,12 +130,6 @@ 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.21/Dockerfile b/php_8.1-zts-alpine3.21/Dockerfile
deleted file mode 100644
index 90d4c67..0000000
diff --git a/php_8.1-zts-alpine/Dockerfile b/php_8.1-zts-alpine3.22/Dockerfile
similarity index 100%
copy from php_8.1-zts-alpine/Dockerfile
copy to php_8.1-zts-alpine3.22/Dockerfile
diff --git a/php_8.1-zts-alpine3.21/docker-php-entrypoint b/php_8.1-zts-alpine3.22/docker-php-entrypoint
similarity index 100%
rename from php_8.1-zts-alpine3.21/docker-php-entrypoint
rename to php_8.1-zts-alpine3.22/docker-php-entrypoint
diff --git a/php_8.1-zts-alpine3.21/docker-php-ext-configure b/php_8.1-zts-alpine3.22/docker-php-ext-configure
similarity index 100%
rename from php_8.1-zts-alpine3.21/docker-php-ext-configure
rename to php_8.1-zts-alpine3.22/docker-php-ext-configure
diff --git a/php_8.1-zts-alpine3.21/docker-php-ext-enable b/php_8.1-zts-alpine3.22/docker-php-ext-enable
similarity index 100%
rename from php_8.1-zts-alpine3.21/docker-php-ext-enable
rename to php_8.1-zts-alpine3.22/docker-php-ext-enable
diff --git a/php_8.1-zts-alpine3.21/docker-php-ext-install b/php_8.1-zts-alpine3.22/docker-php-ext-install
similarity index 100%
rename from php_8.1-zts-alpine3.21/docker-php-ext-install
rename to php_8.1-zts-alpine3.22/docker-php-ext-install
diff --git a/php_8.1-zts-alpine3.21/docker-php-source b/php_8.1-zts-alpine3.22/docker-php-source
similarity index 100%
rename from php_8.1-zts-alpine3.21/docker-php-source
rename to php_8.1-zts-alpine3.22/docker-php-sourceRelevant Maintainers: |
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: