From 6f5e448c78bf9c587ac244b87c083370d0f78237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Sun, 13 Nov 2022 14:18:22 +0100 Subject: [PATCH 1/2] feat: generate libphp for the Alpine variant of ZTS builds --- Dockerfile-linux.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 1fb9b1e38..a4a9ae0eb 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -373,7 +373,7 @@ RUN set -eux; \ \ --disable-cgi \ {{ ) end -}} -{{ if (env.variant == "cli" or env.variant == "zts") and (is_alpine | not) then ( -}} +{{ if (env.variant == "zts") or (env.variant == "cli" and (is_alpine | not)) then ( -}} \ # https://github.com/docker-library/php/pull/939#issuecomment-730501748 --enable-embed \ From b311ff619b7b7fa1e6a4c25a25c671574fcf68dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Sun, 13 Nov 2022 14:25:13 +0100 Subject: [PATCH 2/2] apply template --- 7.4/alpine3.15/zts/Dockerfile | 3 +++ 7.4/alpine3.16/zts/Dockerfile | 3 +++ 8.0-rc/alpine3.15/zts/Dockerfile | 3 +++ 8.0-rc/alpine3.16/zts/Dockerfile | 3 +++ 8.0/alpine3.15/zts/Dockerfile | 3 +++ 8.0/alpine3.16/zts/Dockerfile | 3 +++ 8.1/alpine3.15/zts/Dockerfile | 3 +++ 8.1/alpine3.16/zts/Dockerfile | 3 +++ 8.2-rc/alpine3.15/zts/Dockerfile | 3 +++ 8.2-rc/alpine3.16/zts/Dockerfile | 3 +++ 10 files changed, 30 insertions(+) diff --git a/7.4/alpine3.15/zts/Dockerfile b/7.4/alpine3.15/zts/Dockerfile index 262b77c0c..e013c65f5 100644 --- a/7.4/alpine3.15/zts/Dockerfile +++ b/7.4/alpine3.15/zts/Dockerfile @@ -164,6 +164,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/pull/939#issuecomment-730501748 + --enable-embed \ + \ --enable-maintainer-zts \ # https://externals.io/message/118859 --disable-zend-signals \ diff --git a/7.4/alpine3.16/zts/Dockerfile b/7.4/alpine3.16/zts/Dockerfile index c3f29e838..2d63b6b3a 100644 --- a/7.4/alpine3.16/zts/Dockerfile +++ b/7.4/alpine3.16/zts/Dockerfile @@ -164,6 +164,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/pull/939#issuecomment-730501748 + --enable-embed \ + \ --enable-maintainer-zts \ # https://externals.io/message/118859 --disable-zend-signals \ diff --git a/8.0-rc/alpine3.15/zts/Dockerfile b/8.0-rc/alpine3.15/zts/Dockerfile index f4d5e9039..84136fed1 100644 --- a/8.0-rc/alpine3.15/zts/Dockerfile +++ b/8.0-rc/alpine3.15/zts/Dockerfile @@ -162,6 +162,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/pull/939#issuecomment-730501748 + --enable-embed \ + \ --enable-zts \ # https://externals.io/message/118859 --disable-zend-signals \ diff --git a/8.0-rc/alpine3.16/zts/Dockerfile b/8.0-rc/alpine3.16/zts/Dockerfile index 9d345a8f2..b3947cb1a 100644 --- a/8.0-rc/alpine3.16/zts/Dockerfile +++ b/8.0-rc/alpine3.16/zts/Dockerfile @@ -162,6 +162,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/pull/939#issuecomment-730501748 + --enable-embed \ + \ --enable-zts \ # https://externals.io/message/118859 --disable-zend-signals \ diff --git a/8.0/alpine3.15/zts/Dockerfile b/8.0/alpine3.15/zts/Dockerfile index a69f0e8a4..7bad81193 100644 --- a/8.0/alpine3.15/zts/Dockerfile +++ b/8.0/alpine3.15/zts/Dockerfile @@ -162,6 +162,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/pull/939#issuecomment-730501748 + --enable-embed \ + \ --enable-zts \ # https://externals.io/message/118859 --disable-zend-signals \ diff --git a/8.0/alpine3.16/zts/Dockerfile b/8.0/alpine3.16/zts/Dockerfile index 8e10bdd74..dade68391 100644 --- a/8.0/alpine3.16/zts/Dockerfile +++ b/8.0/alpine3.16/zts/Dockerfile @@ -162,6 +162,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/pull/939#issuecomment-730501748 + --enable-embed \ + \ --enable-zts \ # https://externals.io/message/118859 --disable-zend-signals \ diff --git a/8.1/alpine3.15/zts/Dockerfile b/8.1/alpine3.15/zts/Dockerfile index 7040dd855..62e904051 100644 --- a/8.1/alpine3.15/zts/Dockerfile +++ b/8.1/alpine3.15/zts/Dockerfile @@ -162,6 +162,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/pull/939#issuecomment-730501748 + --enable-embed \ + \ --enable-zts \ # https://externals.io/message/118859 --disable-zend-signals \ diff --git a/8.1/alpine3.16/zts/Dockerfile b/8.1/alpine3.16/zts/Dockerfile index 654b131bb..55f407a11 100644 --- a/8.1/alpine3.16/zts/Dockerfile +++ b/8.1/alpine3.16/zts/Dockerfile @@ -162,6 +162,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/pull/939#issuecomment-730501748 + --enable-embed \ + \ --enable-zts \ # https://externals.io/message/118859 --disable-zend-signals \ diff --git a/8.2-rc/alpine3.15/zts/Dockerfile b/8.2-rc/alpine3.15/zts/Dockerfile index 450e2713e..412187b7d 100644 --- a/8.2-rc/alpine3.15/zts/Dockerfile +++ b/8.2-rc/alpine3.15/zts/Dockerfile @@ -162,6 +162,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/pull/939#issuecomment-730501748 + --enable-embed \ + \ --enable-zts \ # https://externals.io/message/118859 --disable-zend-signals \ diff --git a/8.2-rc/alpine3.16/zts/Dockerfile b/8.2-rc/alpine3.16/zts/Dockerfile index 3375406d5..e002bb890 100644 --- a/8.2-rc/alpine3.16/zts/Dockerfile +++ b/8.2-rc/alpine3.16/zts/Dockerfile @@ -162,6 +162,9 @@ RUN set -eux; \ \ --disable-cgi \ \ +# https://github.com/docker-library/php/pull/939#issuecomment-730501748 + --enable-embed \ + \ --enable-zts \ # https://externals.io/message/118859 --disable-zend-signals \