docker-php74/php

Enable "embed" for the Alpine variant of ZTS builds (#1342)

Commit 7894e034 · Kévin Dunglas · 2022-11-15T00:26:28+01:00

Changeset

7894e0343ab4adc6e0e101e13b2363615f4143f8

Parents

4844a928c9cbb8b4c9bf005ff7069edd2a04539c

View source at this commit

Comments

No comments yet.

Log in to comment

Diff

diff --git a/7.4/alpine3.15/zts/Dockerfile b/7.4/alpine3.15/zts/Dockerfile
index 262b77c0..e013c65f 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 c3f29e83..2d63b6b3 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 f4d5e903..84136fed 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 9d345a8f..b3947cb1 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 a69f0e8a..7bad8119 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 8e10bdd7..dade6839 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 7040dd85..62e90405 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 654b131b..55f407a1 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 450e2713..412187b7 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 3375406d..e002bb89 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 \
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
index 1fb9b1e3..a4a9ae0e 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 \