Load flag into bake config file

Author: hschimpf

docker-bake.hcl

@@ -17,6 +17,9 @@ variable "IMAGE_VERSION_SUFFIX" {
 variable "DOCKER_PLATFORM" {
     default = "linux/amd64"
 }
+variable "ENABLE_ZTS" {
+  default = ""
+}
 
 target "build-php" {
     dockerfile = "php-${PHP_VERSION}/Dockerfile"
@@ -34,6 +37,7 @@ target "php" {
     tags       = ["bref/${CPU_PREFIX}php-${PHP_VERSION}"]
     args       = {
         "IMAGE_VERSION_SUFFIX" = "${IMAGE_VERSION_SUFFIX}"
+        "ENABLE_ZTS" = "${ENABLE_ZTS}"
     }
     contexts = {
         "bref/${CPU_PREFIX}build-php-${PHP_VERSION}" = "target:build-php"

php-80/Dockerfile

@@ -378,6 +378,7 @@ 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 \
@@ -397,7 +398,6 @@ RUN CFLAGS="-fstack-protector-strong -fpic -fpie -O3 -I${INSTALL_DIR}/include -I
         --with-pdo-pgsql=shared,${INSTALL_DIR} \
         --enable-intl=shared \
         --enable-soap \
-        ${ENABLE_ZTS} \
         --with-xsl=${INSTALL_DIR} \
         # necessary for `pecl` to work (to install PHP extensions)
         --with-pear

php-81/Dockerfile

@@ -378,6 +378,7 @@ 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 \
@@ -397,7 +398,6 @@ RUN CFLAGS="-fstack-protector-strong -fpic -fpie -O3 -I${INSTALL_DIR}/include -I
         --with-pdo-pgsql=shared,${INSTALL_DIR} \
         --enable-intl=shared \
         --enable-soap \
-        ${ENABLE_ZTS} \
         --with-xsl=${INSTALL_DIR} \
         # necessary for `pecl` to work (to install PHP extensions)
         --with-pear

php-82/Dockerfile

@@ -378,6 +378,7 @@ 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 \
@@ -397,7 +398,6 @@ RUN CFLAGS="-fstack-protector-strong -fpic -fpie -O3 -I${INSTALL_DIR}/include -I
         --with-pdo-pgsql=shared,${INSTALL_DIR} \
         --enable-intl=shared \
         --enable-soap \
-        ${ENABLE_ZTS} \
         --with-xsl=${INSTALL_DIR} \
         # necessary for `pecl` to work (to install PHP extensions)
         --with-pear