Repository navigation
Update php - #22384
Merged
Merged
Update php#22384
Conversation
Changes: - docker-library/php@2e430cd1: remove zts, instead all images are always built as zts (8.6+) (docker-library/php#1686)
Diff for 53a8a70:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8b8e2d1..52910e9 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -283,70 +283,50 @@ Directory: 8.5/trixie/zts
Tags: 8.6.0RC2-apache-bookworm, 8.6-rc-apache-bookworm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le
-GitCommit: fd3ac6997128d2140664ba6298ebb5bf307a02f3
+GitCommit: 2e430cd1a7e33368cb6917b689bbb5b9bf43c75c
Directory: 8.6-rc/bookworm/apache
Tags: 8.6.0RC2-apache-trixie, 8.6-rc-apache-trixie, 8.6.0RC2-apache, 8.6-rc-apache
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: fd3ac6997128d2140664ba6298ebb5bf307a02f3
+GitCommit: 2e430cd1a7e33368cb6917b689bbb5b9bf43c75c
Directory: 8.6-rc/trixie/apache
Tags: 8.6.0RC2-cli-alpine3.23, 8.6-rc-cli-alpine3.23, 8.6.0RC2-alpine3.23, 8.6-rc-alpine3.23
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: fd3ac6997128d2140664ba6298ebb5bf307a02f3
+GitCommit: 2e430cd1a7e33368cb6917b689bbb5b9bf43c75c
Directory: 8.6-rc/alpine3.23/cli
Tags: 8.6.0RC2-cli-alpine3.24, 8.6-rc-cli-alpine3.24, 8.6.0RC2-alpine3.24, 8.6-rc-alpine3.24, 8.6.0RC2-cli-alpine, 8.6-rc-cli-alpine, 8.6.0RC2-alpine, 8.6-rc-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: fd3ac6997128d2140664ba6298ebb5bf307a02f3
+GitCommit: 2e430cd1a7e33368cb6917b689bbb5b9bf43c75c
Directory: 8.6-rc/alpine3.24/cli
Tags: 8.6.0RC2-cli-bookworm, 8.6-rc-cli-bookworm, 8.6.0RC2-bookworm, 8.6-rc-bookworm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le
-GitCommit: fd3ac6997128d2140664ba6298ebb5bf307a02f3
+GitCommit: 2e430cd1a7e33368cb6917b689bbb5b9bf43c75c
Directory: 8.6-rc/bookworm/cli
Tags: 8.6.0RC2-cli-trixie, 8.6-rc-cli-trixie, 8.6.0RC2-trixie, 8.6-rc-trixie, 8.6.0RC2-cli, 8.6-rc-cli, 8.6.0RC2, 8.6-rc
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: fd3ac6997128d2140664ba6298ebb5bf307a02f3
+GitCommit: 2e430cd1a7e33368cb6917b689bbb5b9bf43c75c
Directory: 8.6-rc/trixie/cli
Tags: 8.6.0RC2-fpm-alpine3.23, 8.6-rc-fpm-alpine3.23
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: fd3ac6997128d2140664ba6298ebb5bf307a02f3
+GitCommit: 2e430cd1a7e33368cb6917b689bbb5b9bf43c75c
Directory: 8.6-rc/alpine3.23/fpm
Tags: 8.6.0RC2-fpm-alpine3.24, 8.6-rc-fpm-alpine3.24, 8.6.0RC2-fpm-alpine, 8.6-rc-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: fd3ac6997128d2140664ba6298ebb5bf307a02f3
+GitCommit: 2e430cd1a7e33368cb6917b689bbb5b9bf43c75c
Directory: 8.6-rc/alpine3.24/fpm
Tags: 8.6.0RC2-fpm-bookworm, 8.6-rc-fpm-bookworm
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le
-GitCommit: fd3ac6997128d2140664ba6298ebb5bf307a02f3
+GitCommit: 2e430cd1a7e33368cb6917b689bbb5b9bf43c75c
Directory: 8.6-rc/bookworm/fpm
Tags: 8.6.0RC2-fpm-trixie, 8.6-rc-fpm-trixie, 8.6.0RC2-fpm, 8.6-rc-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: fd3ac6997128d2140664ba6298ebb5bf307a02f3
+GitCommit: 2e430cd1a7e33368cb6917b689bbb5b9bf43c75c
Directory: 8.6-rc/trixie/fpm
-
-Tags: 8.6.0RC2-zts-alpine3.23, 8.6-rc-zts-alpine3.23
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: fd3ac6997128d2140664ba6298ebb5bf307a02f3
-Directory: 8.6-rc/alpine3.23/zts
-
-Tags: 8.6.0RC2-zts-alpine3.24, 8.6-rc-zts-alpine3.24, 8.6.0RC2-zts-alpine, 8.6-rc-zts-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: fd3ac6997128d2140664ba6298ebb5bf307a02f3
-Directory: 8.6-rc/alpine3.24/zts
-
-Tags: 8.6.0RC2-zts-bookworm, 8.6-rc-zts-bookworm
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le
-GitCommit: fd3ac6997128d2140664ba6298ebb5bf307a02f3
-Directory: 8.6-rc/bookworm/zts
-
-Tags: 8.6.0RC2-zts-trixie, 8.6-rc-zts-trixie, 8.6.0RC2-zts, 8.6-rc-zts
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: fd3ac6997128d2140664ba6298ebb5bf307a02f3
-Directory: 8.6-rc/trixie/zts
diff --git a/_bashbrew-list b/_bashbrew-list
index 942069f..b30a8f2 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -262,12 +262,6 @@ php:8.6-rc-fpm-alpine3.24
php:8.6-rc-fpm-bookworm
php:8.6-rc-fpm-trixie
php:8.6-rc-trixie
-php:8.6-rc-zts
-php:8.6-rc-zts-alpine
-php:8.6-rc-zts-alpine3.23
-php:8.6-rc-zts-alpine3.24
-php:8.6-rc-zts-bookworm
-php:8.6-rc-zts-trixie
php:8.6.0RC2
php:8.6.0RC2-alpine
php:8.6.0RC2-alpine3.23
@@ -289,12 +283,6 @@ php:8.6.0RC2-fpm-alpine3.24
php:8.6.0RC2-fpm-bookworm
php:8.6.0RC2-fpm-trixie
php:8.6.0RC2-trixie
-php:8.6.0RC2-zts
-php:8.6.0RC2-zts-alpine
-php:8.6.0RC2-zts-alpine3.23
-php:8.6.0RC2-zts-alpine3.24
-php:8.6.0RC2-zts-bookworm
-php:8.6.0RC2-zts-trixie
php:alpine
php:alpine3.23
php:alpine3.24
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 468d8c3..c6e968e 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -50,10 +50,6 @@ php:8.6-rc-fpm
php:8.6-rc-fpm-alpine
php:8.6-rc-fpm-alpine3.23
php:8.6-rc-fpm-bookworm
-php:8.6-rc-zts
-php:8.6-rc-zts-alpine
-php:8.6-rc-zts-alpine3.23
-php:8.6-rc-zts-bookworm
php:alpine
php:alpine3.23
php:apache
diff --git a/php_8.6-rc-alpine/Dockerfile b/php_8.6-rc-alpine/Dockerfile
index 5e99fe0..ef6e203 100644
--- a/php_8.6-rc-alpine/Dockerfile
+++ b/php_8.6-rc-alpine/Dockerfile
@@ -163,6 +163,13 @@ RUN set -eux; \
--enable-phpdbg \
--enable-phpdbg-readline \
\
+ \
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+ --enable-embed \
+ \
+ --enable-zts \
+# https://externals.io/message/118859
+ --disable-zend-signals \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
diff --git a/php_8.6-rc-alpine3.23/Dockerfile b/php_8.6-rc-alpine3.23/Dockerfile
index 8b7a7b3..a9f1f88 100644
--- a/php_8.6-rc-alpine3.23/Dockerfile
+++ b/php_8.6-rc-alpine3.23/Dockerfile
@@ -163,6 +163,13 @@ RUN set -eux; \
--enable-phpdbg \
--enable-phpdbg-readline \
\
+ \
+# https://github.com/docker-library/php/pull/939#issuecomment-730501748
+ --enable-embed \
+ \
+ --enable-zts \
+# https://externals.io/message/118859
+ --disable-zend-signals \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
diff --git a/php_8.6-rc-apache-bookworm/Dockerfile b/php_8.6-rc-apache-bookworm/Dockerfile
index 0b8be7d..9a04fdf 100644
--- a/php_8.6-rc-apache-bookworm/Dockerfile
+++ b/php_8.6-rc-apache-bookworm/Dockerfile
@@ -239,6 +239,10 @@ RUN set -eux; \
--disable-cgi \
\
--with-apxs2 \
+ \
+ --enable-zts \
+# https://externals.io/message/118859
+ --disable-zend-signals \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
diff --git a/php_8.6-rc-apache/Dockerfile b/php_8.6-rc-apache/Dockerfile
index a9fef94..0e6c256 100644
--- a/php_8.6-rc-apache/Dockerfile
+++ b/php_8.6-rc-apache/Dockerfile
@@ -239,6 +239,10 @@ RUN set -eux; \
--disable-cgi \
\
--with-apxs2 \
+ \
+ --enable-zts \
+# https://externals.io/message/118859
+ --disable-zend-signals \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
diff --git a/php_8.6-rc-bookworm/Dockerfile b/php_8.6-rc-bookworm/Dockerfile
index bc01130..4234168 100644
--- a/php_8.6-rc-bookworm/Dockerfile
+++ b/php_8.6-rc-bookworm/Dockerfile
@@ -178,6 +178,10 @@ RUN set -eux; \
\
# https://github.com/docker-library/php/pull/939#issuecomment-730501748
--enable-embed \
+ \
+ --enable-zts \
+# https://externals.io/message/118859
+ --disable-zend-signals \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
diff --git a/php_8.6-rc-fpm-alpine/Dockerfile b/php_8.6-rc-fpm-alpine/Dockerfile
index 26148a1..9234873 100644
--- a/php_8.6-rc-fpm-alpine/Dockerfile
+++ b/php_8.6-rc-fpm-alpine/Dockerfile
@@ -168,6 +168,10 @@ RUN set -eux; \
--enable-fpm \
--with-fpm-user=www-data \
--with-fpm-group=www-data \
+ \
+ --enable-zts \
+# https://externals.io/message/118859
+ --disable-zend-signals \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
diff --git a/php_8.6-rc-fpm-alpine3.23/Dockerfile b/php_8.6-rc-fpm-alpine3.23/Dockerfile
index 3236922..38a21ab 100644
--- a/php_8.6-rc-fpm-alpine3.23/Dockerfile
+++ b/php_8.6-rc-fpm-alpine3.23/Dockerfile
@@ -168,6 +168,10 @@ RUN set -eux; \
--enable-fpm \
--with-fpm-user=www-data \
--with-fpm-group=www-data \
+ \
+ --enable-zts \
+# https://externals.io/message/118859
+ --disable-zend-signals \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
diff --git a/php_8.6-rc-fpm-bookworm/Dockerfile b/php_8.6-rc-fpm-bookworm/Dockerfile
index 6ca864c..2c115a1 100644
--- a/php_8.6-rc-fpm-bookworm/Dockerfile
+++ b/php_8.6-rc-fpm-bookworm/Dockerfile
@@ -180,6 +180,10 @@ RUN set -eux; \
--enable-fpm \
--with-fpm-user=www-data \
--with-fpm-group=www-data \
+ \
+ --enable-zts \
+# https://externals.io/message/118859
+ --disable-zend-signals \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
diff --git a/php_8.6-rc-fpm/Dockerfile b/php_8.6-rc-fpm/Dockerfile
index 68ceaf5..df452ef 100644
--- a/php_8.6-rc-fpm/Dockerfile
+++ b/php_8.6-rc-fpm/Dockerfile
@@ -180,6 +180,10 @@ RUN set -eux; \
--enable-fpm \
--with-fpm-user=www-data \
--with-fpm-group=www-data \
+ \
+ --enable-zts \
+# https://externals.io/message/118859
+ --disable-zend-signals \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
diff --git a/php_8.6-rc-zts-alpine/Dockerfile b/php_8.6-rc-zts-alpine/Dockerfile
deleted file mode 100644
index ef6e203..0000000
diff --git a/php_8.6-rc-zts-alpine/docker-php-entrypoint b/php_8.6-rc-zts-alpine/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_8.6-rc-zts-alpine/docker-php-ext-configure b/php_8.6-rc-zts-alpine/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.6-rc-zts-alpine/docker-php-ext-enable b/php_8.6-rc-zts-alpine/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.6-rc-zts-alpine/docker-php-ext-install b/php_8.6-rc-zts-alpine/docker-php-ext-install
deleted file mode 100755
index fbf4484..0000000
diff --git a/php_8.6-rc-zts-alpine/docker-php-source b/php_8.6-rc-zts-alpine/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.6-rc-zts-alpine3.23/Dockerfile b/php_8.6-rc-zts-alpine3.23/Dockerfile
deleted file mode 100644
index a9f1f88..0000000
diff --git a/php_8.6-rc-zts-alpine3.23/docker-php-entrypoint b/php_8.6-rc-zts-alpine3.23/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_8.6-rc-zts-alpine3.23/docker-php-ext-configure b/php_8.6-rc-zts-alpine3.23/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.6-rc-zts-alpine3.23/docker-php-ext-enable b/php_8.6-rc-zts-alpine3.23/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.6-rc-zts-alpine3.23/docker-php-ext-install b/php_8.6-rc-zts-alpine3.23/docker-php-ext-install
deleted file mode 100755
index fbf4484..0000000
diff --git a/php_8.6-rc-zts-alpine3.23/docker-php-source b/php_8.6-rc-zts-alpine3.23/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.6-rc-zts-bookworm/Dockerfile b/php_8.6-rc-zts-bookworm/Dockerfile
deleted file mode 100644
index 4234168..0000000
diff --git a/php_8.6-rc-zts-bookworm/docker-php-entrypoint b/php_8.6-rc-zts-bookworm/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_8.6-rc-zts-bookworm/docker-php-ext-configure b/php_8.6-rc-zts-bookworm/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.6-rc-zts-bookworm/docker-php-ext-enable b/php_8.6-rc-zts-bookworm/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.6-rc-zts-bookworm/docker-php-ext-install b/php_8.6-rc-zts-bookworm/docker-php-ext-install
deleted file mode 100755
index fbf4484..0000000
diff --git a/php_8.6-rc-zts-bookworm/docker-php-source b/php_8.6-rc-zts-bookworm/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.6-rc-zts/Dockerfile b/php_8.6-rc-zts/Dockerfile
deleted file mode 100644
index 7511a3e..0000000
diff --git a/php_8.6-rc-zts/docker-php-entrypoint b/php_8.6-rc-zts/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_8.6-rc-zts/docker-php-ext-configure b/php_8.6-rc-zts/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.6-rc-zts/docker-php-ext-enable b/php_8.6-rc-zts/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.6-rc-zts/docker-php-ext-install b/php_8.6-rc-zts/docker-php-ext-install
deleted file mode 100755
index fbf4484..0000000
diff --git a/php_8.6-rc-zts/docker-php-source b/php_8.6-rc-zts/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.6-rc/Dockerfile b/php_8.6-rc/Dockerfile
index 4d1e70f..7511a3e 100644
--- a/php_8.6-rc/Dockerfile
+++ b/php_8.6-rc/Dockerfile
@@ -178,6 +178,10 @@ RUN set -eux; \
\
# https://github.com/docker-library/php/pull/939#issuecomment-730501748
--enable-embed \
+ \
+ --enable-zts \
+# https://externals.io/message/118859
+ --disable-zend-signals \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \Relevant Maintainers: |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes: