Renamed to PHP_COMPILATION_FLAGS as suggested by @mnapoli

hschimpf · hschimpf · commit fb0344f39145 · 2023-03-27T08:47:41.000-04:00
This allows full control over the compilation flags for every need
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -17,7 +17,7 @@ variable "IMAGE_VERSION_SUFFIX" {
 variable "DOCKER_PLATFORM" {
     default = "linux/amd64"
 }
-variable "ENABLE_ZTS" {
+variable "PHP_COMPILATION_FLAGS" {
   default = ""
 }
 
@@ -27,7 +27,7 @@ target "build-php" {
     tags       = ["bref/${CPU_PREFIX}build-php-${PHP_VERSION}"]
     args       = {
         "IMAGE_VERSION_SUFFIX" = "${IMAGE_VERSION_SUFFIX}"
-        "ENABLE_ZTS" = "${ENABLE_ZTS}"
+        "PHP_COMPILATION_FLAGS" = "${PHP_COMPILATION_FLAGS}"
     }
     platforms = ["${DOCKER_PLATFORM}"]
 }
@@ -38,7 +38,7 @@ target "php" {
     tags       = ["bref/${CPU_PREFIX}php-${PHP_VERSION}"]
     args       = {
         "IMAGE_VERSION_SUFFIX" = "${IMAGE_VERSION_SUFFIX}"
-        "ENABLE_ZTS" = "${ENABLE_ZTS}"
+        "PHP_COMPILATION_FLAGS" = "${PHP_COMPILATION_FLAGS}"
     }
     contexts = {
         "bref/${CPU_PREFIX}build-php-${PHP_VERSION}" = "target:build-php"
diff --git a/php-80/Dockerfile b/php-80/Dockerfile
@@ -364,7 +364,7 @@ RUN curl --location --silent --show-error --fail https://www.php.net/get/php-${V
 # --enable-ftp: because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 # --enable-mbstring: because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
 # --with-zlib and --with-zlib-dir: See https://stackoverflow.com/a/42978649/245552
-ARG ENABLE_ZTS
+ARG PHP_COMPILATION_FLAGS
 RUN ./buildconf --force
 RUN CFLAGS="-fstack-protector-strong -fpic -fpie -O3 -I${INSTALL_DIR}/include -I/usr/include -ffunction-sections -fdata-sections" \
         CPPFLAGS="-fstack-protector-strong -fpic -fpie -O3 -I${INSTALL_DIR}/include -I/usr/include -ffunction-sections -fdata-sections" \
@@ -378,7 +378,6 @@ RUN CFLAGS="-fstack-protector-strong -fpic -fpie -O3 -I${INSTALL_DIR}/include -I
         --enable-fpm \
         --disable-cgi \
         --enable-cli \
-        ${ENABLE_ZTS} \
         --disable-phpdbg \
         --with-sodium \
         --with-readline \
@@ -400,7 +399,9 @@ RUN CFLAGS="-fstack-protector-strong -fpic -fpie -O3 -I${INSTALL_DIR}/include -I
         --enable-soap \
         --with-xsl=${INSTALL_DIR} \
         # necessary for `pecl` to work (to install PHP extensions)
-        --with-pear
+        --with-pear \
+        # extra compilation flags
+        ${PHP_COMPILATION_FLAGS}
 RUN make -j $(nproc)
 # Run `make install` and override PEAR's PHAR URL because pear.php.net is down
 RUN set -xe; \
diff --git a/php-81/Dockerfile b/php-81/Dockerfile
@@ -364,7 +364,7 @@ RUN curl --location --silent --show-error --fail https://www.php.net/get/php-${V
 # --enable-ftp: because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 # --enable-mbstring: because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
 # --with-zlib and --with-zlib-dir: See https://stackoverflow.com/a/42978649/245552
-ARG ENABLE_ZTS
+ARG PHP_COMPILATION_FLAGS
 RUN ./buildconf --force
 RUN CFLAGS="-fstack-protector-strong -fpic -fpie -O3 -I${INSTALL_DIR}/include -I/usr/include -ffunction-sections -fdata-sections" \
         CPPFLAGS="-fstack-protector-strong -fpic -fpie -O3 -I${INSTALL_DIR}/include -I/usr/include -ffunction-sections -fdata-sections" \
@@ -378,7 +378,6 @@ RUN CFLAGS="-fstack-protector-strong -fpic -fpie -O3 -I${INSTALL_DIR}/include -I
         --enable-fpm \
         --disable-cgi \
         --enable-cli \
-        ${ENABLE_ZTS} \
         --disable-phpdbg \
         --with-sodium \
         --with-readline \
@@ -400,7 +399,9 @@ RUN CFLAGS="-fstack-protector-strong -fpic -fpie -O3 -I${INSTALL_DIR}/include -I
         --enable-soap \
         --with-xsl=${INSTALL_DIR} \
         # necessary for `pecl` to work (to install PHP extensions)
-        --with-pear
+        --with-pear \
+        # extra compilation flags
+        ${PHP_COMPILATION_FLAGS}
 RUN make -j $(nproc)
 # Run `make install` and override PEAR's PHAR URL because pear.php.net is down
 RUN set -xe; \
diff --git a/php-82/Dockerfile b/php-82/Dockerfile
@@ -364,7 +364,7 @@ RUN curl --location --silent --show-error --fail https://www.php.net/get/php-${V
 # --enable-ftp: because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 # --enable-mbstring: because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
 # --with-zlib and --with-zlib-dir: See https://stackoverflow.com/a/42978649/245552
-ARG ENABLE_ZTS
+ARG PHP_COMPILATION_FLAGS
 RUN ./buildconf --force
 RUN CFLAGS="-fstack-protector-strong -fpic -fpie -O3 -I${INSTALL_DIR}/include -I/usr/include -ffunction-sections -fdata-sections" \
         CPPFLAGS="-fstack-protector-strong -fpic -fpie -O3 -I${INSTALL_DIR}/include -I/usr/include -ffunction-sections -fdata-sections" \
@@ -378,7 +378,6 @@ RUN CFLAGS="-fstack-protector-strong -fpic -fpie -O3 -I${INSTALL_DIR}/include -I
         --enable-fpm \
         --disable-cgi \
         --enable-cli \
-        ${ENABLE_ZTS} \
         --disable-phpdbg \
         --with-sodium \
         --with-readline \
@@ -400,7 +399,9 @@ RUN CFLAGS="-fstack-protector-strong -fpic -fpie -O3 -I${INSTALL_DIR}/include -I
         --enable-soap \
         --with-xsl=${INSTALL_DIR} \
         # necessary for `pecl` to work (to install PHP extensions)
-        --with-pear
+        --with-pear \
+        # extra compilation flags
+        ${PHP_COMPILATION_FLAGS}
 RUN make -j $(nproc)
 # Run `make install` and override PEAR's PHAR URL because pear.php.net is down
 RUN set -xe; \

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ variable "IMAGE_VERSION_SUFFIX" {`
`17`	`17`	`variable "DOCKER_PLATFORM" {`
`18`	`18`	`default = "linux/amd64"`
`19`	`19`	`}`
`20`		`-variable "ENABLE_ZTS" {`
	`20`	`+variable "PHP_COMPILATION_FLAGS" {`
`21`	`21`	`default = ""`
`22`	`22`	`}`
`23`	`23`
`@@ -27,7 +27,7 @@ target "build-php" {`
`27`	`27`	`tags = ["bref/${CPU_PREFIX}build-php-${PHP_VERSION}"]`
`28`	`28`	`args = {`
`29`	`29`	`"IMAGE_VERSION_SUFFIX" = "${IMAGE_VERSION_SUFFIX}"`
`30`		`- "ENABLE_ZTS" = "${ENABLE_ZTS}"`
	`30`	`+ "PHP_COMPILATION_FLAGS" = "${PHP_COMPILATION_FLAGS}"`
`31`	`31`	`}`
`32`	`32`	`platforms = ["${DOCKER_PLATFORM}"]`
`33`	`33`	`}`
`@@ -38,7 +38,7 @@ target "php" {`
`38`	`38`	`tags = ["bref/${CPU_PREFIX}php-${PHP_VERSION}"]`
`39`	`39`	`args = {`
`40`	`40`	`"IMAGE_VERSION_SUFFIX" = "${IMAGE_VERSION_SUFFIX}"`
`41`		`- "ENABLE_ZTS" = "${ENABLE_ZTS}"`
	`41`	`+ "PHP_COMPILATION_FLAGS" = "${PHP_COMPILATION_FLAGS}"`
`42`	`42`	`}`
`43`	`43`	`contexts = {`
`44`	`44`	`"bref/${CPU_PREFIX}build-php-${PHP_VERSION}" = "target:build-php"`