From e74c167aa25bfbd895c7c43b9d146264b4507930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Tue, 18 Oct 2022 13:24:49 +0200 Subject: [PATCH 1/3] fix: disable Zend Signals for ZTS builds --- Dockerfile-linux.template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 37280177d..a0c60a3bb 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -393,6 +393,8 @@ RUN set -eux; \ {{ ) else ( -}} --enable-maintainer-zts \ {{ ) end -}} +# https://github.com/php/php-src/issues/9649#issuecomment-1264330874 + --disable-zend-signals \ {{ ) else "" end -}} ; \ make -j "$(nproc)"; \ From 89323ffac3963f45109f04c2b7fdf2240f18e603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Sat, 29 Oct 2022 09:50:32 +0200 Subject: [PATCH 2/3] update link --- Dockerfile-linux.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index a0c60a3bb..1fb9b1e38 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -393,7 +393,7 @@ RUN set -eux; \ {{ ) else ( -}} --enable-maintainer-zts \ {{ ) end -}} -# https://github.com/php/php-src/issues/9649#issuecomment-1264330874 +# https://externals.io/message/118859 --disable-zend-signals \ {{ ) else "" end -}} ; \ From d2c837062086700505e67efa5a04833681622524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Sat, 29 Oct 2022 10:35:49 +0200 Subject: [PATCH 3/3] update templates --- 7.4/alpine3.15/zts/Dockerfile | 2 ++ 7.4/alpine3.16/zts/Dockerfile | 2 ++ 7.4/bullseye/zts/Dockerfile | 2 ++ 7.4/buster/zts/Dockerfile | 2 ++ 8.0/alpine3.15/zts/Dockerfile | 2 ++ 8.0/alpine3.16/zts/Dockerfile | 2 ++ 8.0/bullseye/zts/Dockerfile | 2 ++ 8.0/buster/zts/Dockerfile | 2 ++ 8.1/alpine3.15/zts/Dockerfile | 2 ++ 8.1/alpine3.16/zts/Dockerfile | 2 ++ 8.1/bullseye/zts/Dockerfile | 2 ++ 8.1/buster/zts/Dockerfile | 2 ++ 8.2-rc/alpine3.15/zts/Dockerfile | 2 ++ 8.2-rc/alpine3.16/zts/Dockerfile | 2 ++ 8.2-rc/bullseye/zts/Dockerfile | 2 ++ 8.2-rc/buster/zts/Dockerfile | 2 ++ 16 files changed, 32 insertions(+) diff --git a/7.4/alpine3.15/zts/Dockerfile b/7.4/alpine3.15/zts/Dockerfile index b5bfa1c14..0ad94f8ed 100644 --- a/7.4/alpine3.15/zts/Dockerfile +++ b/7.4/alpine3.15/zts/Dockerfile @@ -165,6 +165,8 @@ RUN set -eux; \ --disable-cgi \ \ --enable-maintainer-zts \ +# https://externals.io/message/118859 + --disable-zend-signals \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/7.4/alpine3.16/zts/Dockerfile b/7.4/alpine3.16/zts/Dockerfile index 829252233..ac9155abf 100644 --- a/7.4/alpine3.16/zts/Dockerfile +++ b/7.4/alpine3.16/zts/Dockerfile @@ -165,6 +165,8 @@ RUN set -eux; \ --disable-cgi \ \ --enable-maintainer-zts \ +# https://externals.io/message/118859 + --disable-zend-signals \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/7.4/bullseye/zts/Dockerfile b/7.4/bullseye/zts/Dockerfile index f503cf252..bdcdf169e 100644 --- a/7.4/bullseye/zts/Dockerfile +++ b/7.4/bullseye/zts/Dockerfile @@ -177,6 +177,8 @@ RUN set -eux; \ --enable-embed \ \ --enable-maintainer-zts \ +# https://externals.io/message/118859 + --disable-zend-signals \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/7.4/buster/zts/Dockerfile b/7.4/buster/zts/Dockerfile index 3e59d9e2f..56173b45d 100644 --- a/7.4/buster/zts/Dockerfile +++ b/7.4/buster/zts/Dockerfile @@ -177,6 +177,8 @@ RUN set -eux; \ --enable-embed \ \ --enable-maintainer-zts \ +# https://externals.io/message/118859 + --disable-zend-signals \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.0/alpine3.15/zts/Dockerfile b/8.0/alpine3.15/zts/Dockerfile index 038734701..a69f0e8a4 100644 --- a/8.0/alpine3.15/zts/Dockerfile +++ b/8.0/alpine3.15/zts/Dockerfile @@ -163,6 +163,8 @@ RUN set -eux; \ --disable-cgi \ \ --enable-zts \ +# https://externals.io/message/118859 + --disable-zend-signals \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.0/alpine3.16/zts/Dockerfile b/8.0/alpine3.16/zts/Dockerfile index d8fe5ac15..8e10bdd74 100644 --- a/8.0/alpine3.16/zts/Dockerfile +++ b/8.0/alpine3.16/zts/Dockerfile @@ -163,6 +163,8 @@ RUN set -eux; \ --disable-cgi \ \ --enable-zts \ +# https://externals.io/message/118859 + --disable-zend-signals \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.0/bullseye/zts/Dockerfile b/8.0/bullseye/zts/Dockerfile index f1a5e7d05..1e5d533d8 100644 --- a/8.0/bullseye/zts/Dockerfile +++ b/8.0/bullseye/zts/Dockerfile @@ -177,6 +177,8 @@ RUN set -eux; \ --enable-embed \ \ --enable-zts \ +# https://externals.io/message/118859 + --disable-zend-signals \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.0/buster/zts/Dockerfile b/8.0/buster/zts/Dockerfile index dc7e5b071..902c93e83 100644 --- a/8.0/buster/zts/Dockerfile +++ b/8.0/buster/zts/Dockerfile @@ -177,6 +177,8 @@ RUN set -eux; \ --enable-embed \ \ --enable-zts \ +# https://externals.io/message/118859 + --disable-zend-signals \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.1/alpine3.15/zts/Dockerfile b/8.1/alpine3.15/zts/Dockerfile index a7510bbe0..7040dd855 100644 --- a/8.1/alpine3.15/zts/Dockerfile +++ b/8.1/alpine3.15/zts/Dockerfile @@ -163,6 +163,8 @@ RUN set -eux; \ --disable-cgi \ \ --enable-zts \ +# https://externals.io/message/118859 + --disable-zend-signals \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.1/alpine3.16/zts/Dockerfile b/8.1/alpine3.16/zts/Dockerfile index 9c9dfe248..654b131bb 100644 --- a/8.1/alpine3.16/zts/Dockerfile +++ b/8.1/alpine3.16/zts/Dockerfile @@ -163,6 +163,8 @@ RUN set -eux; \ --disable-cgi \ \ --enable-zts \ +# https://externals.io/message/118859 + --disable-zend-signals \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.1/bullseye/zts/Dockerfile b/8.1/bullseye/zts/Dockerfile index ab1fb1fd2..6592a41b2 100644 --- a/8.1/bullseye/zts/Dockerfile +++ b/8.1/bullseye/zts/Dockerfile @@ -177,6 +177,8 @@ RUN set -eux; \ --enable-embed \ \ --enable-zts \ +# https://externals.io/message/118859 + --disable-zend-signals \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.1/buster/zts/Dockerfile b/8.1/buster/zts/Dockerfile index f6c0065a6..ed161d9db 100644 --- a/8.1/buster/zts/Dockerfile +++ b/8.1/buster/zts/Dockerfile @@ -177,6 +177,8 @@ RUN set -eux; \ --enable-embed \ \ --enable-zts \ +# https://externals.io/message/118859 + --disable-zend-signals \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.2-rc/alpine3.15/zts/Dockerfile b/8.2-rc/alpine3.15/zts/Dockerfile index d971aaecb..018282f78 100644 --- a/8.2-rc/alpine3.15/zts/Dockerfile +++ b/8.2-rc/alpine3.15/zts/Dockerfile @@ -163,6 +163,8 @@ RUN set -eux; \ --disable-cgi \ \ --enable-zts \ +# https://externals.io/message/118859 + --disable-zend-signals \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.2-rc/alpine3.16/zts/Dockerfile b/8.2-rc/alpine3.16/zts/Dockerfile index 1473b0ab1..45da2bacc 100644 --- a/8.2-rc/alpine3.16/zts/Dockerfile +++ b/8.2-rc/alpine3.16/zts/Dockerfile @@ -163,6 +163,8 @@ RUN set -eux; \ --disable-cgi \ \ --enable-zts \ +# https://externals.io/message/118859 + --disable-zend-signals \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.2-rc/bullseye/zts/Dockerfile b/8.2-rc/bullseye/zts/Dockerfile index 40c4cb18a..89b328640 100644 --- a/8.2-rc/bullseye/zts/Dockerfile +++ b/8.2-rc/bullseye/zts/Dockerfile @@ -177,6 +177,8 @@ RUN set -eux; \ --enable-embed \ \ --enable-zts \ +# https://externals.io/message/118859 + --disable-zend-signals \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ diff --git a/8.2-rc/buster/zts/Dockerfile b/8.2-rc/buster/zts/Dockerfile index 26fc858bd..95e5568d2 100644 --- a/8.2-rc/buster/zts/Dockerfile +++ b/8.2-rc/buster/zts/Dockerfile @@ -177,6 +177,8 @@ RUN set -eux; \ --enable-embed \ \ --enable-zts \ +# https://externals.io/message/118859 + --disable-zend-signals \ ; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \