From 5842c49fd978372a676b068337912a86152cc90a Mon Sep 17 00:00:00 2001 From: Alex Wilson Date: Thu, 28 Jul 2016 14:31:33 +0100 Subject: [PATCH] Shuffling around order of optional arguments so as to override default configure options. --- Dockerfile-alpine.template | 2 +- Dockerfile-debian.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 82361bf2c9..664547ab13 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -68,7 +68,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -78,6 +77,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(getconf _NPROCESSORS_ONLN)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index f341c93f69..abb4ba15df 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -61,7 +61,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -71,6 +70,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(nproc)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \