From 5842c49fd978372a676b068337912a86152cc90a Mon Sep 17 00:00:00 2001
From: Alex Wilson <a@ax.gy>
Date: Thu, 28 Jul 2016 14:31:33 +0100
Subject: [PATCH 1/6] 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; } \

From 59200d11b1ea494019d06ff170495c460d414723 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Fri, 29 Jul 2016 09:36:54 -0700
Subject: [PATCH 2/6] Apply update.sh

---
 5.5/Dockerfile            | 2 +-
 5.5/alpine/Dockerfile     | 2 +-
 5.5/apache/Dockerfile     | 2 +-
 5.5/fpm/Dockerfile        | 2 +-
 5.5/fpm/alpine/Dockerfile | 2 +-
 5.5/zts/Dockerfile        | 2 +-
 5.5/zts/alpine/Dockerfile | 2 +-
 5.6/Dockerfile            | 2 +-
 5.6/alpine/Dockerfile     | 2 +-
 5.6/apache/Dockerfile     | 2 +-
 5.6/fpm/Dockerfile        | 2 +-
 5.6/fpm/alpine/Dockerfile | 2 +-
 5.6/zts/Dockerfile        | 2 +-
 5.6/zts/alpine/Dockerfile | 2 +-
 7.0/Dockerfile            | 2 +-
 7.0/alpine/Dockerfile     | 2 +-
 7.0/apache/Dockerfile     | 2 +-
 7.0/fpm/Dockerfile        | 2 +-
 7.0/fpm/alpine/Dockerfile | 2 +-
 7.0/zts/Dockerfile        | 2 +-
 7.0/zts/alpine/Dockerfile | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/5.5/Dockerfile b/5.5/Dockerfile
index 2c6ca52086..01e7e7a9e0 100644
--- a/5.5/Dockerfile
+++ b/5.5/Dockerfile
@@ -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; } \
diff --git a/5.5/alpine/Dockerfile b/5.5/alpine/Dockerfile
index bf78e92001..454ba98559 100644
--- a/5.5/alpine/Dockerfile
+++ b/5.5/alpine/Dockerfile
@@ -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/5.5/apache/Dockerfile b/5.5/apache/Dockerfile
index df7b5ee028..3a151764e3 100644
--- a/5.5/apache/Dockerfile
+++ b/5.5/apache/Dockerfile
@@ -108,7 +108,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 \
@@ -118,6 +117,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; } \
diff --git a/5.5/fpm/Dockerfile b/5.5/fpm/Dockerfile
index 0b4d2af47f..b7a8913818 100644
--- a/5.5/fpm/Dockerfile
+++ b/5.5/fpm/Dockerfile
@@ -62,7 +62,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 \
@@ -72,6 +71,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; } \
diff --git a/5.5/fpm/alpine/Dockerfile b/5.5/fpm/alpine/Dockerfile
index b3eaf835e1..603f4ef9bb 100644
--- a/5.5/fpm/alpine/Dockerfile
+++ b/5.5/fpm/alpine/Dockerfile
@@ -69,7 +69,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 \
@@ -79,6 +78,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/5.5/zts/Dockerfile b/5.5/zts/Dockerfile
index d8cc6629c8..3b1406d975 100644
--- a/5.5/zts/Dockerfile
+++ b/5.5/zts/Dockerfile
@@ -62,7 +62,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 \
@@ -72,6 +71,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; } \
diff --git a/5.5/zts/alpine/Dockerfile b/5.5/zts/alpine/Dockerfile
index 081e7ba10f..a47ef0a531 100644
--- a/5.5/zts/alpine/Dockerfile
+++ b/5.5/zts/alpine/Dockerfile
@@ -69,7 +69,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 \
@@ -79,6 +78,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/5.6/Dockerfile b/5.6/Dockerfile
index 86404364ce..28b9d38333 100644
--- a/5.6/Dockerfile
+++ b/5.6/Dockerfile
@@ -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; } \
diff --git a/5.6/alpine/Dockerfile b/5.6/alpine/Dockerfile
index aeee3d2b41..c9c42f4fea 100644
--- a/5.6/alpine/Dockerfile
+++ b/5.6/alpine/Dockerfile
@@ -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/5.6/apache/Dockerfile b/5.6/apache/Dockerfile
index 44ff8365bd..8d7192afee 100644
--- a/5.6/apache/Dockerfile
+++ b/5.6/apache/Dockerfile
@@ -108,7 +108,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 \
@@ -118,6 +117,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; } \
diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile
index 950e18eda7..9e6987fc77 100644
--- a/5.6/fpm/Dockerfile
+++ b/5.6/fpm/Dockerfile
@@ -62,7 +62,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 \
@@ -72,6 +71,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; } \
diff --git a/5.6/fpm/alpine/Dockerfile b/5.6/fpm/alpine/Dockerfile
index b6440657ae..f79e74493d 100644
--- a/5.6/fpm/alpine/Dockerfile
+++ b/5.6/fpm/alpine/Dockerfile
@@ -69,7 +69,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 \
@@ -79,6 +78,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/5.6/zts/Dockerfile b/5.6/zts/Dockerfile
index ce7d95e0a3..61acf9fcd1 100644
--- a/5.6/zts/Dockerfile
+++ b/5.6/zts/Dockerfile
@@ -62,7 +62,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 \
@@ -72,6 +71,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; } \
diff --git a/5.6/zts/alpine/Dockerfile b/5.6/zts/alpine/Dockerfile
index 8f37bcd6ea..b12fd969de 100644
--- a/5.6/zts/alpine/Dockerfile
+++ b/5.6/zts/alpine/Dockerfile
@@ -69,7 +69,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 \
@@ -79,6 +78,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/7.0/Dockerfile b/7.0/Dockerfile
index fe62a2c615..1f7a99d135 100644
--- a/7.0/Dockerfile
+++ b/7.0/Dockerfile
@@ -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; } \
diff --git a/7.0/alpine/Dockerfile b/7.0/alpine/Dockerfile
index b363cfeafb..2c0c00dfbb 100644
--- a/7.0/alpine/Dockerfile
+++ b/7.0/alpine/Dockerfile
@@ -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/7.0/apache/Dockerfile b/7.0/apache/Dockerfile
index fc2b77cbd5..af391b9005 100644
--- a/7.0/apache/Dockerfile
+++ b/7.0/apache/Dockerfile
@@ -108,7 +108,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 \
@@ -118,6 +117,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; } \
diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile
index be0bbe4340..9bb1385146 100644
--- a/7.0/fpm/Dockerfile
+++ b/7.0/fpm/Dockerfile
@@ -62,7 +62,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 \
@@ -72,6 +71,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; } \
diff --git a/7.0/fpm/alpine/Dockerfile b/7.0/fpm/alpine/Dockerfile
index 66a9322055..06ca33c0d8 100644
--- a/7.0/fpm/alpine/Dockerfile
+++ b/7.0/fpm/alpine/Dockerfile
@@ -69,7 +69,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 \
@@ -79,6 +78,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/7.0/zts/Dockerfile b/7.0/zts/Dockerfile
index 425a00f2db..ff0527cb79 100644
--- a/7.0/zts/Dockerfile
+++ b/7.0/zts/Dockerfile
@@ -62,7 +62,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 \
@@ -72,6 +71,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; } \
diff --git a/7.0/zts/alpine/Dockerfile b/7.0/zts/alpine/Dockerfile
index 8f1acc37ea..3a99addfed 100644
--- a/7.0/zts/alpine/Dockerfile
+++ b/7.0/zts/alpine/Dockerfile
@@ -69,7 +69,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 \
@@ -79,6 +78,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; } \

From e36077f85c5302f46e9c55bf1f9164e9dae7992d Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Mon, 1 Aug 2016 09:55:39 -0700
Subject: [PATCH 3/6] Update generated Dockerfiles to note the source of their
 generated contents

---
 update.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/update.sh b/update.sh
index 2f747df33a..2b5eadb4f0 100755
--- a/update.sh
+++ b/update.sh
@@ -17,6 +17,17 @@ if [ ${#versions[@]} -eq 0 ]; then
 fi
 versions=( "${versions[@]%/}" )
 
+generated_warning() {
+	cat <<-EOH
+		#
+		# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+		#
+		# PLEASE DO NOT EDIT IT DIRECTLY.
+		#
+
+	EOH
+}
+
 jsonSh="$(curl -fsSL 'https://raw.githubusercontent.com/dominictarr/JSON.sh/ed3f9dd285ebd4183934adb54ea5a2fda6b25a98/JSON.sh')"
 
 travisEnv=
@@ -66,13 +77,13 @@ for version in "${versions[@]}"; do
 	
 	dockerfiles=()
 	
-	cp -v Dockerfile-debian.template "$version/Dockerfile"
+	{ generated_warning; cat Dockerfile-debian.template; } > "$version/Dockerfile"
 	cp -v docker-php-ext-* "$version/"
 	cp -v docker-php-source "$version/"
 	dockerfiles+=( "$version/Dockerfile" )
 	
 	if [ -d "$version/alpine" ]; then
-		cp -v Dockerfile-alpine.template "$version/alpine/Dockerfile"
+		{ generated_warning; cat Dockerfile-alpine.template; } > "$version/alpine/Dockerfile"
 		cp -v docker-php-ext-* "$version/alpine/"
 		cp -v docker-php-source "$version/alpine/"
 		dockerfiles+=( "$version/alpine/Dockerfile" )

From 2cc40ce1de4206a9bc55e38331937b4bd7d58700 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Mon, 1 Aug 2016 09:55:58 -0700
Subject: [PATCH 4/6] Apply update.sh

---
 5.5/Dockerfile            | 6 ++++++
 5.5/alpine/Dockerfile     | 6 ++++++
 5.5/apache/Dockerfile     | 6 ++++++
 5.5/fpm/Dockerfile        | 6 ++++++
 5.5/fpm/alpine/Dockerfile | 6 ++++++
 5.5/zts/Dockerfile        | 6 ++++++
 5.5/zts/alpine/Dockerfile | 6 ++++++
 5.6/Dockerfile            | 6 ++++++
 5.6/alpine/Dockerfile     | 6 ++++++
 5.6/apache/Dockerfile     | 6 ++++++
 5.6/fpm/Dockerfile        | 6 ++++++
 5.6/fpm/alpine/Dockerfile | 6 ++++++
 5.6/zts/Dockerfile        | 6 ++++++
 5.6/zts/alpine/Dockerfile | 6 ++++++
 7.0/Dockerfile            | 6 ++++++
 7.0/alpine/Dockerfile     | 6 ++++++
 7.0/apache/Dockerfile     | 6 ++++++
 7.0/fpm/Dockerfile        | 6 ++++++
 7.0/fpm/alpine/Dockerfile | 6 ++++++
 7.0/zts/Dockerfile        | 6 ++++++
 7.0/zts/alpine/Dockerfile | 6 ++++++
 21 files changed, 126 insertions(+)

diff --git a/5.5/Dockerfile b/5.5/Dockerfile
index 01e7e7a9e0..a23c5e7879 100644
--- a/5.5/Dockerfile
+++ b/5.5/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM debian:jessie
 
 # persistent / runtime deps
diff --git a/5.5/alpine/Dockerfile b/5.5/alpine/Dockerfile
index 454ba98559..bfc7ae1253 100644
--- a/5.5/alpine/Dockerfile
+++ b/5.5/alpine/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM alpine:3.4
 
 # persistent / runtime deps
diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile
index 3a151764e3..61b8856cbe 100644
--- a/5.5/apache/Dockerfile
+++ b/5.5/apache/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM debian:jessie
 
 # persistent / runtime deps
diff --git a/5.5/fpm/Dockerfile b/5.5/fpm/Dockerfile
index b7a8913818..40d3e32215 100644
--- a/5.5/fpm/Dockerfile
+++ b/5.5/fpm/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM debian:jessie
 
 # persistent / runtime deps
diff --git a/5.5/fpm/alpine/Dockerfile b/5.5/fpm/alpine/Dockerfile
index 603f4ef9bb..650a830299 100644
--- a/5.5/fpm/alpine/Dockerfile
+++ b/5.5/fpm/alpine/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM alpine:3.4
 
 # persistent / runtime deps
diff --git a/5.5/zts/Dockerfile b/5.5/zts/Dockerfile
index 3b1406d975..4b72b0c4ce 100644
--- a/5.5/zts/Dockerfile
+++ b/5.5/zts/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM debian:jessie
 
 # persistent / runtime deps
diff --git a/5.5/zts/alpine/Dockerfile b/5.5/zts/alpine/Dockerfile
index a47ef0a531..1c649e2abb 100644
--- a/5.5/zts/alpine/Dockerfile
+++ b/5.5/zts/alpine/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM alpine:3.4
 
 # persistent / runtime deps
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
index 28b9d38333..3f1bd7bc32 100644
--- a/5.6/Dockerfile
+++ b/5.6/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM debian:jessie
 
 # persistent / runtime deps
diff --git a/5.6/alpine/Dockerfile b/5.6/alpine/Dockerfile
index c9c42f4fea..fb36fbba1a 100644
--- a/5.6/alpine/Dockerfile
+++ b/5.6/alpine/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM alpine:3.4
 
 # persistent / runtime deps
diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile
index 8d7192afee..47537490f2 100644
--- a/5.6/apache/Dockerfile
+++ b/5.6/apache/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM debian:jessie
 
 # persistent / runtime deps
diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile
index 9e6987fc77..a6fc1787e2 100644
--- a/5.6/fpm/Dockerfile
+++ b/5.6/fpm/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM debian:jessie
 
 # persistent / runtime deps
diff --git a/5.6/fpm/alpine/Dockerfile b/5.6/fpm/alpine/Dockerfile
index f79e74493d..6e53331cb5 100644
--- a/5.6/fpm/alpine/Dockerfile
+++ b/5.6/fpm/alpine/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM alpine:3.4
 
 # persistent / runtime deps
diff --git a/5.6/zts/Dockerfile b/5.6/zts/Dockerfile
index 61acf9fcd1..eebd731f7d 100644
--- a/5.6/zts/Dockerfile
+++ b/5.6/zts/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM debian:jessie
 
 # persistent / runtime deps
diff --git a/5.6/zts/alpine/Dockerfile b/5.6/zts/alpine/Dockerfile
index b12fd969de..f8709c0808 100644
--- a/5.6/zts/alpine/Dockerfile
+++ b/5.6/zts/alpine/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM alpine:3.4
 
 # persistent / runtime deps
diff --git a/7.0/Dockerfile b/7.0/Dockerfile
index 1f7a99d135..766d24a021 100644
--- a/7.0/Dockerfile
+++ b/7.0/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM debian:jessie
 
 # persistent / runtime deps
diff --git a/7.0/alpine/Dockerfile b/7.0/alpine/Dockerfile
index 2c0c00dfbb..5fc91c76cb 100644
--- a/7.0/alpine/Dockerfile
+++ b/7.0/alpine/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM alpine:3.4
 
 # persistent / runtime deps
diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile
index af391b9005..4683c1cbc0 100644
--- a/7.0/apache/Dockerfile
+++ b/7.0/apache/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM debian:jessie
 
 # persistent / runtime deps
diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile
index 9bb1385146..b9654c1d0d 100644
--- a/7.0/fpm/Dockerfile
+++ b/7.0/fpm/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM debian:jessie
 
 # persistent / runtime deps
diff --git a/7.0/fpm/alpine/Dockerfile b/7.0/fpm/alpine/Dockerfile
index 06ca33c0d8..076fd33d43 100644
--- a/7.0/fpm/alpine/Dockerfile
+++ b/7.0/fpm/alpine/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM alpine:3.4
 
 # persistent / runtime deps
diff --git a/7.0/zts/Dockerfile b/7.0/zts/Dockerfile
index ff0527cb79..21bc54d357 100644
--- a/7.0/zts/Dockerfile
+++ b/7.0/zts/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM debian:jessie
 
 # persistent / runtime deps
diff --git a/7.0/zts/alpine/Dockerfile b/7.0/zts/alpine/Dockerfile
index 3a99addfed..308c150069 100644
--- a/7.0/zts/alpine/Dockerfile
+++ b/7.0/zts/alpine/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM alpine:3.4
 
 # persistent / runtime deps

From bb2c469018ad92749e0d9a3068099dd1b21accf3 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Mon, 1 Aug 2016 17:03:07 -0700
Subject: [PATCH 5/6] Convert explicit "export A=B" lines of Apache's envvars
 file into "${A:=B}" such that we can override them at runtime easily

Before:

```sh
unset HOME

if [ "${APACHE_CONFDIR##/etc/apache2-}" != "${APACHE_CONFDIR}" ] ; then
	SUFFIX="-${APACHE_CONFDIR##/etc/apache2-}"
else
	SUFFIX=
fi

export APACHE_RUN_USER=www-data
export APACHE_RUN_GROUP=www-data
export APACHE_PID_FILE=/var/run/apache2/apache2$SUFFIX.pid
export APACHE_RUN_DIR=/var/run/apache2$SUFFIX
export APACHE_LOCK_DIR=/var/lock/apache2$SUFFIX
export APACHE_LOG_DIR=/var/log/apache2$SUFFIX

export LANG=C

export LANG
```

After:

```sh
unset HOME

if [ "${APACHE_CONFDIR##/etc/apache2-}" != "${APACHE_CONFDIR}" ] ; then
	SUFFIX="-${APACHE_CONFDIR##/etc/apache2-}"
else
	SUFFIX=
fi

: ${APACHE_RUN_USER:=www-data}
export APACHE_RUN_USER
: ${APACHE_RUN_GROUP:=www-data}
export APACHE_RUN_GROUP
: ${APACHE_PID_FILE:=/var/run/apache2/apache2$SUFFIX.pid}
export APACHE_PID_FILE
: ${APACHE_RUN_DIR:=/var/run/apache2$SUFFIX}
export APACHE_RUN_DIR
: ${APACHE_LOCK_DIR:=/var/lock/apache2$SUFFIX}
export APACHE_LOCK_DIR
: ${APACHE_LOG_DIR:=/var/log/apache2$SUFFIX}
export APACHE_LOG_DIR

: ${LANG:=C}
export LANG

export LANG
```

(minus comments)
---
 apache-Dockerfile-block-1 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/apache-Dockerfile-block-1 b/apache-Dockerfile-block-1
index 5ca4024312..f0a1699c37 100644
--- a/apache-Dockerfile-block-1
+++ b/apache-Dockerfile-block-1
@@ -3,8 +3,17 @@ RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-insta
 ENV APACHE_CONFDIR /etc/apache2
 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
 
-# setup directories and permissions
 RUN set -ex \
+	\
+# generically convert lines like
+#   export APACHE_RUN_USER=www-data
+# into
+#   : ${APACHE_RUN_USER:=www-data}
+#   export APACHE_RUN_USER
+# so that they can be overridden at runtime ("-e APACHE_RUN_USER=...")
+	&& sed -r 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \
+	\
+# setup directories and permissions
 	&& . "$APACHE_ENVVARS" \
 	&& for dir in \
 		"$APACHE_LOCK_DIR" \

From aea63e358f5e903376fe0f43fd4c8f27b586511c Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Mon, 8 Aug 2016 10:06:26 -0700
Subject: [PATCH 6/6] Apply update.sh

---
 5.5/apache/Dockerfile | 11 ++++++++++-
 5.6/apache/Dockerfile | 11 ++++++++++-
 7.0/apache/Dockerfile | 11 ++++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile
index 61b8856cbe..8d187728ee 100644
--- a/5.5/apache/Dockerfile
+++ b/5.5/apache/Dockerfile
@@ -35,8 +35,17 @@ RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-insta
 ENV APACHE_CONFDIR /etc/apache2
 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
 
-# setup directories and permissions
 RUN set -ex \
+	\
+# generically convert lines like
+#   export APACHE_RUN_USER=www-data
+# into
+#   : ${APACHE_RUN_USER:=www-data}
+#   export APACHE_RUN_USER
+# so that they can be overridden at runtime ("-e APACHE_RUN_USER=...")
+	&& sed -r 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \
+	\
+# setup directories and permissions
 	&& . "$APACHE_ENVVARS" \
 	&& for dir in \
 		"$APACHE_LOCK_DIR" \
diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile
index 47537490f2..c5b50c5e55 100644
--- a/5.6/apache/Dockerfile
+++ b/5.6/apache/Dockerfile
@@ -35,8 +35,17 @@ RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-insta
 ENV APACHE_CONFDIR /etc/apache2
 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
 
-# setup directories and permissions
 RUN set -ex \
+	\
+# generically convert lines like
+#   export APACHE_RUN_USER=www-data
+# into
+#   : ${APACHE_RUN_USER:=www-data}
+#   export APACHE_RUN_USER
+# so that they can be overridden at runtime ("-e APACHE_RUN_USER=...")
+	&& sed -r 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \
+	\
+# setup directories and permissions
 	&& . "$APACHE_ENVVARS" \
 	&& for dir in \
 		"$APACHE_LOCK_DIR" \
diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile
index 4683c1cbc0..98f21e22e4 100644
--- a/7.0/apache/Dockerfile
+++ b/7.0/apache/Dockerfile
@@ -35,8 +35,17 @@ RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-insta
 ENV APACHE_CONFDIR /etc/apache2
 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
 
-# setup directories and permissions
 RUN set -ex \
+	\
+# generically convert lines like
+#   export APACHE_RUN_USER=www-data
+# into
+#   : ${APACHE_RUN_USER:=www-data}
+#   export APACHE_RUN_USER
+# so that they can be overridden at runtime ("-e APACHE_RUN_USER=...")
+	&& sed -r 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \
+	\
+# setup directories and permissions
 	&& . "$APACHE_ENVVARS" \
 	&& for dir in \
 		"$APACHE_LOCK_DIR" \