Merge pull request #63 from hschimpf/main

Author: mnapoli

.env.example

@@ -12,3 +12,7 @@ MAX_PARALLEL_PUBLISH=3
 # as it is much faster to build cross-platform images.
 # Do not uncomment this line, unless you have a depot.dev account.
 #USE_DEPOT=1
+
+# Uncomment this line if you want to add custom flags to the PHP compilation process.
+# For example, you can add the flag --enable-zts to complile PHP with ZTS enabled
+#PHP_COMPILATION_FLAGS=

docker-bake.hcl

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

php-80/Dockerfile

@@ -364,6 +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 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" \
@@ -398,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; \

php-81/Dockerfile

@@ -365,6 +365,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 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" \
@@ -399,7 +400,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; \

php-82/Dockerfile

@@ -365,6 +365,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 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" \
@@ -399,7 +400,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; \