From e1803961cdeab9b87de2995c20f611ba12e3c10a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20HOUZ=C3=89?= <cto@verylastroom.com>
Date: Thu, 23 Jun 2016 15:54:11 +0200
Subject: [PATCH 1/4] Remove php src the right way for lightweight containers.

---
 Dockerfile-alpine.template | 10 +++++-----
 Dockerfile-debian.template |  9 +++++----
 docker-php-ext-configure   |  2 ++
 docker-php-ext-install     |  3 +++
 docker-php-source          | 40 ++++++++++++++++++++++++++++++++++++++
 update.sh                  |  3 +++
 6 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100755 docker-php-source

diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 4a97edb434..8a3339a59c 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -35,6 +35,8 @@ ENV PHP_VERSION %%PHP_VERSION%%
 ENV PHP_FILENAME %%PHP_FILENAME%%
 ENV PHP_SHA256 %%PHP_SHA256%%
 
+COPY docker-php-source /usr/local/bin/
+
 RUN set -xe \
 	&& apk add --no-cache --virtual .build-deps \
 		$PHPIZE_DEPS \
@@ -53,10 +55,7 @@ RUN set -xe \
 	done \
 	&& gpg --batch --verify "$PHP_FILENAME.asc" "$PHP_FILENAME" \
 	&& rm -r "$GNUPGHOME" "$PHP_FILENAME.asc" \
-	&& mkdir -p /usr/src \
-	&& tar -Jxf "$PHP_FILENAME" -C /usr/src \
-	&& mv "/usr/src/php-$PHP_VERSION" /usr/src/php \
-	&& rm "$PHP_FILENAME" \
+	&& docker-php-source extract \
 	&& cd /usr/src/php \
 	&& ./configure \
 		--with-config-file-path="$PHP_INI_DIR" \
@@ -83,7 +82,8 @@ RUN set -xe \
 			| sort -u \
 	)" \
 	&& apk add --no-cache --virtual .php-rundeps $runDeps \
-	&& apk del .build-deps
+	&& apk del .build-deps \
+	&& docker-php-source delete
 
 COPY docker-php-ext-* /usr/local/bin/
 
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 397eee5f33..fbc330b410 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -31,6 +31,8 @@ ENV PHP_VERSION %%PHP_VERSION%%
 ENV PHP_FILENAME %%PHP_FILENAME%%
 ENV PHP_SHA256 %%PHP_SHA256%%
 
+COPY docker-php-source /usr/local/bin/
+
 RUN set -xe \
 	&& buildDeps=" \
 		$PHP_EXTRA_BUILD_DEPS \
@@ -51,9 +53,7 @@ RUN set -xe \
 	done \
 	&& gpg --batch --verify "$PHP_FILENAME.asc" "$PHP_FILENAME" \
 	&& rm -r "$GNUPGHOME" "$PHP_FILENAME.asc" \
-	&& mkdir -p /usr/src/php \
-	&& tar -xf "$PHP_FILENAME" -C /usr/src/php --strip-components=1 \
-	&& rm "$PHP_FILENAME" \
+	&& docker-php-source extract \
 	&& cd /usr/src/php \
 	&& ./configure \
 		--with-config-file-path="$PHP_INI_DIR" \
@@ -72,7 +72,8 @@ RUN set -xe \
 	&& make install \
 	&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
 	&& make clean \
-	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false $buildDeps
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false $buildDeps \
+	&& docker-php-source delete
 
 COPY docker-php-ext-* /usr/local/bin/
 
diff --git a/docker-php-ext-configure b/docker-php-ext-configure
index dd56be1471..f5f6d9cf49 100755
--- a/docker-php-ext-configure
+++ b/docker-php-ext-configure
@@ -28,6 +28,8 @@ if [ "$pm" = 'apk' ]; then
 	fi
 fi
 
+docker-php-source extract
+
 set -x
 cd "$extDir"
 phpize
diff --git a/docker-php-ext-install b/docker-php-ext-install
index 43927b4148..57dd78a3c7 100755
--- a/docker-php-ext-install
+++ b/docker-php-ext-install
@@ -72,6 +72,8 @@ if [ "$pm" = 'apk' ]; then
 	fi
 fi
 
+docker-php-source extract
+
 for ext in $exts; do
 	(
 		cd "$ext"
@@ -90,3 +92,4 @@ done
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
 	apk del $apkDel
 fi
+docker-php-source delete
diff --git a/docker-php-source b/docker-php-source
new file mode 100755
index 0000000000..78eaf7dc43
--- /dev/null
+++ b/docker-php-source
@@ -0,0 +1,40 @@
+#!/bin/sh
+set -e
+SRC_DIR=/usr/src
+PHP_SRC_DIR=$SRC_DIR/php
+
+usage() {
+    echo "usage: $0 COMMAND"
+    echo
+    echo "Manage php source tarball lifecycle."
+    echo
+    echo "Commands:"
+    echo "   extract  extract php source tarball into directory $PHP_SRC_DIR if not already done."
+    echo "   delete   delete extracted php source located into $PHP_SRC_DIR if not already done."
+    echo
+}
+
+case "$1" in
+    extract)
+        if [ -f "$PHP_SRC_DIR" ] ; then
+            echo "php source tarball already extracted, skipping extract step."
+        else
+            mkdir -p $SRC_DIR
+            tar -Jxf "/$PHP_FILENAME" -C $SRC_DIR
+            mv "$PHP_SRC_DIR-$PHP_VERSION" $PHP_SRC_DIR
+            echo "php source tarball successfully extracted."
+        fi
+        ;;
+    delete)
+        if [ -d "$PHP_SRC_DIR" ] ; then
+            rm -rf $PHP_SRC_DIR \
+            && echo "php extracted source successfully deleted."
+        else
+            echo "php extracted source already deleted, skipping delete extracted source step."
+        fi
+        ;;
+    *)
+        usage
+        exit 1
+        ;;
+esac
diff --git a/update.sh b/update.sh
index 08a6564e97..2f747df33a 100755
--- a/update.sh
+++ b/update.sh
@@ -68,11 +68,13 @@ for version in "${versions[@]}"; do
 	
 	cp -v 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"
 		cp -v docker-php-ext-* "$version/alpine/"
+		cp -v docker-php-source "$version/alpine/"
 		dockerfiles+=( "$version/alpine/Dockerfile" )
 	fi
 	
@@ -98,6 +100,7 @@ for version in "${versions[@]}"; do
 			ia && ac == 1 { system("cat '$variant'-Dockerfile-block-" ab) }
 		' "$base" > "$version/$target/Dockerfile"
 		cp -v docker-php-ext-* "$version/$target/"
+		cp -v docker-php-source "$version/$target/"
 		dockerfiles+=( "$version/$target/Dockerfile" )
 	done
 	

From cd0d7b75c5d265d9ca0caad199b60bd68aad5ff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20HOUZ=C3=89?= <cto@verylastroom.com>
Date: Sun, 3 Jul 2016 11:22:02 +0200
Subject: [PATCH 2/4] Adapt docker-php-ext-* scripts to check exts against
 /available-exts generated file.

---
 docker-php-ext-configure |  7 +++----
 docker-php-ext-install   | 10 +++++-----
 docker-php-source        |  1 +
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docker-php-ext-configure b/docker-php-ext-configure
index f5f6d9cf49..d9c7f11ef6 100755
--- a/docker-php-ext-configure
+++ b/docker-php-ext-configure
@@ -2,13 +2,12 @@
 set -e
 
 ext="$1"
-extDir="/usr/src/php/ext/$ext"
-if [ -z "$ext" ] || ! [ -d "$extDir" ]; then
+if [ -z "$ext" ] || ! [ $(grep -c " $ext " /available-exts) -eq 1 ]; then
 	echo >&2 "usage: $0 ext-name [configure flags]"
 	echo >&2 "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
 	echo >&2
 	echo >&2 'Possible values for ext-name:'
-	echo >&2 $(find /usr/src/php/ext -mindepth 2 -maxdepth 2 -type f -name 'config.m4' | cut -d/ -f6 | sort)
+	echo $(cat /available-exts)
 	exit 1
 fi
 shift
@@ -31,6 +30,6 @@ fi
 docker-php-source extract
 
 set -x
-cd "$extDir"
+cd "/usr/src/php/ext/$ext"
 phpize
 ./configure "$@"
diff --git a/docker-php-ext-install b/docker-php-ext-install
index 57dd78a3c7..e8656fb051 100755
--- a/docker-php-ext-install
+++ b/docker-php-ext-install
@@ -1,7 +1,6 @@
 #!/bin/sh
 set -e
-
-cd /usr/src/php/ext
+PHP_SRC_DIR=/usr/src/php
 
 usage() {
 	echo "usage: $0 [-jN] ext-name [ext-name ...]"
@@ -12,7 +11,7 @@ usage() {
 	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
 	echo
 	echo 'Possible values for ext-name:'
-	echo $(find /usr/src/php/ext -mindepth 2 -maxdepth 2 -type f -name 'config.m4' | cut -d/ -f6 | sort)
+	echo $(cat /available-exts)
 }
 
 opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
@@ -41,8 +40,8 @@ for ext; do
 	if [ -z "$ext" ]; then
 		continue
 	fi
-	if [ ! -d "$ext" ]; then
-		echo >&2 "error: $(pwd -P)/$ext does not exist"
+    if [ ! $(grep -c " $ext " /available-exts) -eq 1 ]; then
+		echo >&2 "error: $PHP_SRC_DIR/$ext does not exist"
 		echo >&2
 		usage >&2
 		exit 1
@@ -73,6 +72,7 @@ if [ "$pm" = 'apk' ]; then
 fi
 
 docker-php-source extract
+cd $PHP_SRC_DIR/ext
 
 for ext in $exts; do
 	(
diff --git a/docker-php-source b/docker-php-source
index 78eaf7dc43..bf121a5965 100755
--- a/docker-php-source
+++ b/docker-php-source
@@ -22,6 +22,7 @@ case "$1" in
             mkdir -p $SRC_DIR
             tar -Jxf "/$PHP_FILENAME" -C $SRC_DIR
             mv "$PHP_SRC_DIR-$PHP_VERSION" $PHP_SRC_DIR
+            echo " "$(find $PHP_SRC_DIR/ext -mindepth 2 -maxdepth 2 -type f -name 'config.m4' | cut -d/ -f6 | sort)" " > /available-exts
             echo "php source tarball successfully extracted."
         fi
         ;;

From e1267b317196cb13aadf5fd1981fcb7b6b3503fb Mon Sep 17 00:00:00 2001
From: Joe Ferguson <joe@infosiftr.com>
Date: Fri, 8 Jul 2016 15:07:02 -0700
Subject: [PATCH 3/4] Improve docker-php-source script

 - swap spaces to tabs to match
 - use gnu tar for `--strip-components`
 - cache known extension list in `/usr/src/`
 - remove extra output
---
 Dockerfile-alpine.template | 18 ++++++----
 Dockerfile-debian.template | 17 +++++-----
 docker-php-ext-configure   |  4 +--
 docker-php-ext-install     |  9 +++--
 docker-php-source          | 67 +++++++++++++++++++-------------------
 5 files changed, 60 insertions(+), 55 deletions(-)

diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 8a3339a59c..393fd5461e 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -12,7 +12,9 @@ ENV PHPIZE_DEPS \
 		re2c
 RUN apk add --no-cache --virtual .persistent-deps \
 		ca-certificates \
-		curl
+		curl \
+		tar \
+		xz
 
 # ensure www-data user exists
 RUN set -x \
@@ -46,17 +48,19 @@ RUN set -xe \
 		libxml2-dev \
 		openssl-dev \
 		sqlite-dev \
-	&& curl -fSL "http://php.net/get/$PHP_FILENAME/from/this/mirror" -o "$PHP_FILENAME" \
-	&& echo "$PHP_SHA256 *$PHP_FILENAME" | sha256sum -c - \
-	&& curl -fSL "http://php.net/get/$PHP_FILENAME.asc/from/this/mirror" -o "$PHP_FILENAME.asc" \
+	&& mkdir -p /usr/src \
+	&& cd /usr/src/ \
+	&& curl -fSL "http://php.net/get/$PHP_FILENAME/from/this/mirror" -o php.tar.xz \
+	&& echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c - \
+	&& curl -fSL "http://php.net/get/$PHP_FILENAME.asc/from/this/mirror" -o php.tar.xz.asc \
 	&& export GNUPGHOME="$(mktemp -d)" \
 	&& for key in $GPG_KEYS; do \
 		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
 	done \
-	&& gpg --batch --verify "$PHP_FILENAME.asc" "$PHP_FILENAME" \
-	&& rm -r "$GNUPGHOME" "$PHP_FILENAME.asc" \
+	&& gpg --batch --verify php.tar.xz.asc php.tar.xz \
+	&& rm -r "$GNUPGHOME" \
 	&& docker-php-source extract \
-	&& cd /usr/src/php \
+	&& cd php \
 	&& ./configure \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index fbc330b410..246a846adc 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -17,6 +17,7 @@ RUN apt-get update && apt-get install -y \
 		libedit2 \
 		libsqlite3-0 \
 		libxml2 \
+		xz-utils \
 	--no-install-recommends && rm -r /var/lib/apt/lists/*
 
 ENV PHP_INI_DIR /usr/local/etc/php
@@ -41,20 +42,20 @@ RUN set -xe \
 		libsqlite3-dev \
 		libssl-dev \
 		libxml2-dev \
-		xz-utils \
 	" \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
-	&& curl -fSL "http://php.net/get/$PHP_FILENAME/from/this/mirror" -o "$PHP_FILENAME" \
-	&& echo "$PHP_SHA256 *$PHP_FILENAME" | sha256sum -c - \
-	&& curl -fSL "http://php.net/get/$PHP_FILENAME.asc/from/this/mirror" -o "$PHP_FILENAME.asc" \
+	&& cd /usr/src/ \
+	&& curl -fSL "http://php.net/get/$PHP_FILENAME/from/this/mirror" -o php.tar.xz \
+	&& echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c - \
+	&& curl -fSL "http://php.net/get/$PHP_FILENAME.asc/from/this/mirror" -o php.tar.xz.asc \
 	&& export GNUPGHOME="$(mktemp -d)" \
 	&& for key in $GPG_KEYS; do \
 		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
 	done \
-	&& gpg --batch --verify "$PHP_FILENAME.asc" "$PHP_FILENAME" \
-	&& rm -r "$GNUPGHOME" "$PHP_FILENAME.asc" \
+	&& gpg --batch --verify php.tar.xz.asc php.tar.xz \
+	&& rm -r "$GNUPGHOME" \
 	&& docker-php-source extract \
-	&& cd /usr/src/php \
+	&& cd php \
 	&& ./configure \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
@@ -72,7 +73,7 @@ RUN set -xe \
 	&& make install \
 	&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
 	&& make clean \
-	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false $buildDeps \
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps \
 	&& docker-php-source delete
 
 COPY docker-php-ext-* /usr/local/bin/
diff --git a/docker-php-ext-configure b/docker-php-ext-configure
index d9c7f11ef6..e768556949 100755
--- a/docker-php-ext-configure
+++ b/docker-php-ext-configure
@@ -2,12 +2,12 @@
 set -e
 
 ext="$1"
-if [ -z "$ext" ] || ! [ $(grep -c " $ext " /available-exts) -eq 1 ]; then
+if [ -z "$ext" ] || ! grep -qE "^$ext$" /usr/src/available-php-exts; then
 	echo >&2 "usage: $0 ext-name [configure flags]"
 	echo >&2 "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
 	echo >&2
 	echo >&2 'Possible values for ext-name:'
-	echo $(cat /available-exts)
+	echo $(cat /usr/src/available-php-exts)
 	exit 1
 fi
 shift
diff --git a/docker-php-ext-install b/docker-php-ext-install
index e8656fb051..6819d437b6 100755
--- a/docker-php-ext-install
+++ b/docker-php-ext-install
@@ -1,6 +1,5 @@
 #!/bin/sh
 set -e
-PHP_SRC_DIR=/usr/src/php
 
 usage() {
 	echo "usage: $0 [-jN] ext-name [ext-name ...]"
@@ -11,7 +10,7 @@ usage() {
 	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
 	echo
 	echo 'Possible values for ext-name:'
-	echo $(cat /available-exts)
+	echo $(cat /usr/src/available-php-exts)
 }
 
 opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
@@ -40,8 +39,8 @@ for ext; do
 	if [ -z "$ext" ]; then
 		continue
 	fi
-    if [ ! $(grep -c " $ext " /available-exts) -eq 1 ]; then
-		echo >&2 "error: $PHP_SRC_DIR/$ext does not exist"
+	if ! grep -qE "^$ext$" /usr/src/available-php-exts; then
+		echo >&2 "error: /usr/src/php/ext/$ext does not exist"
 		echo >&2
 		usage >&2
 		exit 1
@@ -72,7 +71,7 @@ if [ "$pm" = 'apk' ]; then
 fi
 
 docker-php-source extract
-cd $PHP_SRC_DIR/ext
+cd /usr/src/php/ext
 
 for ext in $exts; do
 	(
diff --git a/docker-php-source b/docker-php-source
index bf121a5965..68e35f1c77 100755
--- a/docker-php-source
+++ b/docker-php-source
@@ -1,41 +1,42 @@
 #!/bin/sh
 set -e
-SRC_DIR=/usr/src
-PHP_SRC_DIR=$SRC_DIR/php
+PHP_SRC_DIR=/usr/src/php
 
 usage() {
-    echo "usage: $0 COMMAND"
-    echo
-    echo "Manage php source tarball lifecycle."
-    echo
-    echo "Commands:"
-    echo "   extract  extract php source tarball into directory $PHP_SRC_DIR if not already done."
-    echo "   delete   delete extracted php source located into $PHP_SRC_DIR if not already done."
-    echo
+	echo "usage: $0 COMMAND"
+	echo
+	echo "Manage php source tarball lifecycle."
+	echo
+	echo "Commands:"
+	echo "   extract  extract php source tarball into directory $PHP_SRC_DIR if not already done."
+	echo "   delete   delete extracted php source located into $PHP_SRC_DIR if not already done."
+	echo
 }
 
 case "$1" in
-    extract)
-        if [ -f "$PHP_SRC_DIR" ] ; then
-            echo "php source tarball already extracted, skipping extract step."
-        else
-            mkdir -p $SRC_DIR
-            tar -Jxf "/$PHP_FILENAME" -C $SRC_DIR
-            mv "$PHP_SRC_DIR-$PHP_VERSION" $PHP_SRC_DIR
-            echo " "$(find $PHP_SRC_DIR/ext -mindepth 2 -maxdepth 2 -type f -name 'config.m4' | cut -d/ -f6 | sort)" " > /available-exts
-            echo "php source tarball successfully extracted."
-        fi
-        ;;
-    delete)
-        if [ -d "$PHP_SRC_DIR" ] ; then
-            rm -rf $PHP_SRC_DIR \
-            && echo "php extracted source successfully deleted."
-        else
-            echo "php extracted source already deleted, skipping delete extracted source step."
-        fi
-        ;;
-    *)
-        usage
-        exit 1
-        ;;
+	extract)
+		if [ -e "$PHP_SRC_DIR" -a ! -d "$PHP_SRC_DIR" ] ; then
+			echo >&2 "$PHP_SRC_DIR exists and is not a directory"
+			exit 1
+		fi
+		if [ ! -d "$PHP_SRC_DIR" ]; then
+			mkdir -p $PHP_SRC_DIR
+			tar -Jxf /usr/src/php.tar.xz -C "$PHP_SRC_DIR" --strip-components=1
+
+			if [ ! -f /usr/src/available-php-exts ]; then
+				find "$PHP_SRC_DIR"/ext \
+						-mindepth 2 -maxdepth 2 \
+						-type f -name 'config.m4' \
+					| cut -d/ -f6 | sort \
+				> /usr/src/available-php-exts
+			fi
+		fi
+		;;
+	delete)
+		rm -rf "$PHP_SRC_DIR"
+		;;
+	*)
+		usage
+		exit 1
+		;;
 esac

From 11d7384eacebc592ae741c5ac09c9a5cb5cf4863 Mon Sep 17 00:00:00 2001
From: Joe Ferguson <joe@infosiftr.com>
Date: Tue, 12 Jul 2016 15:07:22 -0700
Subject: [PATCH 4/4] Changes per tianon's comments

---
 Dockerfile-alpine.template | 24 ++++++++++++++----------
 Dockerfile-debian.template | 24 +++++++++++++-----------
 docker-php-ext-configure   |  4 ++--
 docker-php-ext-install     |  4 ++--
 docker-php-source          | 32 +++++++++++++++++---------------
 5 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 393fd5461e..82361bf2c9 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -37,17 +37,9 @@ ENV PHP_VERSION %%PHP_VERSION%%
 ENV PHP_FILENAME %%PHP_FILENAME%%
 ENV PHP_SHA256 %%PHP_SHA256%%
 
-COPY docker-php-source /usr/local/bin/
-
 RUN set -xe \
-	&& apk add --no-cache --virtual .build-deps \
-		$PHPIZE_DEPS \
-		curl-dev \
+	&& apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		libedit-dev \
-		libxml2-dev \
-		openssl-dev \
-		sqlite-dev \
 	&& mkdir -p /usr/src \
 	&& cd /usr/src/ \
 	&& curl -fSL "http://php.net/get/$PHP_FILENAME/from/this/mirror" -o php.tar.xz \
@@ -59,8 +51,20 @@ RUN set -xe \
 	done \
 	&& gpg --batch --verify php.tar.xz.asc php.tar.xz \
 	&& rm -r "$GNUPGHOME" \
+	&& apk del .fetch-deps
+
+COPY docker-php-source /usr/local/bin/
+
+RUN set -xe \
+	&& apk add --no-cache --virtual .build-deps \
+		$PHPIZE_DEPS \
+		curl-dev \
+		libedit-dev \
+		libxml2-dev \
+		openssl-dev \
+		sqlite-dev \
 	&& docker-php-source extract \
-	&& cd php \
+	&& cd /usr/src/php \
 	&& ./configure \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 246a846adc..f341c93f69 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -32,6 +32,18 @@ ENV PHP_VERSION %%PHP_VERSION%%
 ENV PHP_FILENAME %%PHP_FILENAME%%
 ENV PHP_SHA256 %%PHP_SHA256%%
 
+RUN set -xe \
+	&& cd /usr/src/ \
+	&& curl -fSL "http://php.net/get/$PHP_FILENAME/from/this/mirror" -o php.tar.xz \
+	&& echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c - \
+	&& curl -fSL "http://php.net/get/$PHP_FILENAME.asc/from/this/mirror" -o php.tar.xz.asc \
+	&& export GNUPGHOME="$(mktemp -d)" \
+	&& for key in $GPG_KEYS; do \
+		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+	done \
+	&& gpg --batch --verify php.tar.xz.asc php.tar.xz \
+	&& rm -r "$GNUPGHOME"
+
 COPY docker-php-source /usr/local/bin/
 
 RUN set -xe \
@@ -44,18 +56,8 @@ RUN set -xe \
 		libxml2-dev \
 	" \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
-	&& cd /usr/src/ \
-	&& curl -fSL "http://php.net/get/$PHP_FILENAME/from/this/mirror" -o php.tar.xz \
-	&& echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c - \
-	&& curl -fSL "http://php.net/get/$PHP_FILENAME.asc/from/this/mirror" -o php.tar.xz.asc \
-	&& export GNUPGHOME="$(mktemp -d)" \
-	&& for key in $GPG_KEYS; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-	done \
-	&& gpg --batch --verify php.tar.xz.asc php.tar.xz \
-	&& rm -r "$GNUPGHOME" \
 	&& docker-php-source extract \
-	&& cd php \
+	&& cd /usr/src/php \
 	&& ./configure \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
diff --git a/docker-php-ext-configure b/docker-php-ext-configure
index e768556949..ac3e899003 100755
--- a/docker-php-ext-configure
+++ b/docker-php-ext-configure
@@ -2,12 +2,12 @@
 set -e
 
 ext="$1"
-if [ -z "$ext" ] || ! grep -qE "^$ext$" /usr/src/available-php-exts; then
+if [ -z "$ext" ] || ! grep -qE "^$ext$" /usr/src/php-available-exts; then
 	echo >&2 "usage: $0 ext-name [configure flags]"
 	echo >&2 "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
 	echo >&2
 	echo >&2 'Possible values for ext-name:'
-	echo $(cat /usr/src/available-php-exts)
+	echo $(cat /usr/src/php-available-exts)
 	exit 1
 fi
 shift
diff --git a/docker-php-ext-install b/docker-php-ext-install
index 6819d437b6..f7fc78ddd9 100755
--- a/docker-php-ext-install
+++ b/docker-php-ext-install
@@ -10,7 +10,7 @@ usage() {
 	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
 	echo
 	echo 'Possible values for ext-name:'
-	echo $(cat /usr/src/available-php-exts)
+	echo $(cat /usr/src/php-available-exts)
 }
 
 opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
@@ -39,7 +39,7 @@ for ext; do
 	if [ -z "$ext" ]; then
 		continue
 	fi
-	if ! grep -qE "^$ext$" /usr/src/available-php-exts; then
+	if ! grep -qE "^$ext$" /usr/src/php-available-exts; then
 		echo >&2 "error: /usr/src/php/ext/$ext does not exist"
 		echo >&2
 		usage >&2
diff --git a/docker-php-source b/docker-php-source
index 68e35f1c77..9020385b42 100755
--- a/docker-php-source
+++ b/docker-php-source
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
-PHP_SRC_DIR=/usr/src/php
+dir=/usr/src/php
 
 usage() {
 	echo "usage: $0 COMMAND"
@@ -8,32 +8,34 @@ usage() {
 	echo "Manage php source tarball lifecycle."
 	echo
 	echo "Commands:"
-	echo "   extract  extract php source tarball into directory $PHP_SRC_DIR if not already done."
-	echo "   delete   delete extracted php source located into $PHP_SRC_DIR if not already done."
+	echo "   extract  extract php source tarball into directory $dir if not already done."
+	echo "   delete   delete extracted php source located into $dir if not already done."
 	echo
 }
 
 case "$1" in
 	extract)
-		if [ -e "$PHP_SRC_DIR" -a ! -d "$PHP_SRC_DIR" ] ; then
-			echo >&2 "$PHP_SRC_DIR exists and is not a directory"
+		if [ -e "$dir" -a ! -d "$dir" ] ; then
+			echo >&2 "$dir exists and is not a directory"
 			exit 1
 		fi
-		if [ ! -d "$PHP_SRC_DIR" ]; then
-			mkdir -p $PHP_SRC_DIR
-			tar -Jxf /usr/src/php.tar.xz -C "$PHP_SRC_DIR" --strip-components=1
+		if [ ! -d "$dir" ]; then
+			mkdir -p "$dir"
+			tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
 
-			if [ ! -f /usr/src/available-php-exts ]; then
-				find "$PHP_SRC_DIR"/ext \
-						-mindepth 2 -maxdepth 2 \
-						-type f -name 'config.m4' \
-					| cut -d/ -f6 | sort \
-				> /usr/src/available-php-exts
+			if [ ! -f /usr/src/php-available-exts ]; then
+				find "$dir/ext" \
+						-mindepth 2 \
+						-maxdepth 2 \
+						-type f \
+						-name 'config.m4' \
+					| xargs -n1 dirname | xargs -n1 basename | sort \
+				> /usr/src/php-available-exts
 			fi
 		fi
 		;;
 	delete)
-		rm -rf "$PHP_SRC_DIR"
+		rm -rf "$dir"
 		;;
 	*)
 		usage