diff --git a/.travis.yml b/.travis.yml
index 498af65b4..0390d3116 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,50 +5,37 @@ env:
   - VERSION=7.3-rc VARIANT=stretch/cli
   - VERSION=7.3-rc VARIANT=stretch/apache
   - VERSION=7.3-rc VARIANT=stretch/fpm
-  - VERSION=7.3-rc VARIANT=stretch/zts
   - VERSION=7.3-rc VARIANT=alpine3.8/cli
   - VERSION=7.3-rc VARIANT=alpine3.8/fpm
-  - VERSION=7.3-rc VARIANT=alpine3.8/zts
   - VERSION=7.2 VARIANT=stretch/cli
   - VERSION=7.2 VARIANT=stretch/apache
   - VERSION=7.2 VARIANT=stretch/fpm
-  - VERSION=7.2 VARIANT=stretch/zts
   - VERSION=7.2 VARIANT=alpine3.8/cli
   - VERSION=7.2 VARIANT=alpine3.8/fpm
-  - VERSION=7.2 VARIANT=alpine3.8/zts
   - VERSION=7.1 VARIANT=stretch/cli
   - VERSION=7.1 VARIANT=stretch/apache
   - VERSION=7.1 VARIANT=stretch/fpm
-  - VERSION=7.1 VARIANT=stretch/zts
   - VERSION=7.1 VARIANT=jessie/cli
   - VERSION=7.1 VARIANT=jessie/apache
   - VERSION=7.1 VARIANT=jessie/fpm
-  - VERSION=7.1 VARIANT=jessie/zts
   - VERSION=7.1 VARIANT=alpine3.8/cli
   - VERSION=7.1 VARIANT=alpine3.8/fpm
-  - VERSION=7.1 VARIANT=alpine3.8/zts
   - VERSION=7.0 VARIANT=stretch/cli
   - VERSION=7.0 VARIANT=stretch/apache
   - VERSION=7.0 VARIANT=stretch/fpm
-  - VERSION=7.0 VARIANT=stretch/zts
   - VERSION=7.0 VARIANT=jessie/cli
   - VERSION=7.0 VARIANT=jessie/apache
   - VERSION=7.0 VARIANT=jessie/fpm
-  - VERSION=7.0 VARIANT=jessie/zts
   - VERSION=7.0 VARIANT=alpine3.7/cli
   - VERSION=7.0 VARIANT=alpine3.7/fpm
-  - VERSION=7.0 VARIANT=alpine3.7/zts
   - VERSION=5.6 VARIANT=stretch/cli
   - VERSION=5.6 VARIANT=stretch/apache
   - VERSION=5.6 VARIANT=stretch/fpm
-  - VERSION=5.6 VARIANT=stretch/zts
   - VERSION=5.6 VARIANT=jessie/cli
   - VERSION=5.6 VARIANT=jessie/apache
   - VERSION=5.6 VARIANT=jessie/fpm
-  - VERSION=5.6 VARIANT=jessie/zts
   - VERSION=5.6 VARIANT=alpine3.8/cli
   - VERSION=5.6 VARIANT=alpine3.8/fpm
-  - VERSION=5.6 VARIANT=alpine3.8/zts
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images
diff --git a/5.6/alpine3.8/zts/Dockerfile b/5.6/alpine3.8/zts/Dockerfile
deleted file mode 100644
index dd13ebd8d..000000000
--- a/5.6/alpine3.8/zts/Dockerfile
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM alpine:3.8
-
-# dependencies required for running "phpize"
-# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
-ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev dpkg \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkgconf \
-		re2c
-
-# persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
-		ca-certificates \
-		curl \
-		tar \
-		xz \
-# https://github.com/docker-library/php/issues/494
-		libressl
-
-# ensure www-data user exists
-RUN set -x \
-	&& addgroup -g 82 -S www-data \
-	&& adduser -u 82 -D -S -G www-data www-data
-# 82 is the standard uid/gid for "www-data" in Alpine
-# http://git.alpinelinux.org/cgit/aports/tree/main/apache2/apache2.pre-install?h=v3.3.2
-# http://git.alpinelinux.org/cgit/aports/tree/main/lighttpd/lighttpd.pre-install?h=v3.3.2
-# http://git.alpinelinux.org/cgit/aports/tree/main/nginx-initscripts/nginx-initscripts.pre-install?h=v3.3.2
-
-ENV PHP_INI_DIR /usr/local/etc/php
-RUN mkdir -p $PHP_INI_DIR/conf.d
-
-##<autogenerated>##
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
-
-# Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
-# Enable optimization (-O2)
-# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
-# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
-# https://github.com/docker-library/php/issues/272
-ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
-ENV PHP_CPPFLAGS="$PHP_CFLAGS"
-ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
-
-ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
-
-ENV PHP_VERSION 5.6.38
-ENV PHP_URL="https://secure.php.net/get/php-5.6.38.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.38.tar.xz.asc/from/this/mirror"
-ENV PHP_SHA256="c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e" PHP_MD5=""
-
-RUN set -xe; \
-	\
-	apk add --no-cache --virtual .fetch-deps \
-		gnupg \
-		wget \
-	; \
-	\
-	mkdir -p /usr/src; \
-	cd /usr/src; \
-	\
-	wget -O php.tar.xz "$PHP_URL"; \
-	\
-	if [ -n "$PHP_SHA256" ]; then \
-		echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
-	fi; \
-	if [ -n "$PHP_MD5" ]; then \
-		echo "$PHP_MD5 *php.tar.xz" | md5sum -c -; \
-	fi; \
-	\
-	if [ -n "$PHP_ASC_URL" ]; then \
-		wget -O php.tar.xz.asc "$PHP_ASC_URL"; \
-		export GNUPGHOME="$(mktemp -d)"; \
-		for key in $GPG_KEYS; do \
-			gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-		done; \
-		gpg --batch --verify php.tar.xz.asc php.tar.xz; \
-		command -v gpgconf > /dev/null && gpgconf --kill all; \
-		rm -rf "$GNUPGHOME"; \
-	fi; \
-	\
-	apk del .fetch-deps
-
-COPY docker-php-source /usr/local/bin/
-
-RUN set -xe \
-	&& apk add --no-cache --virtual .build-deps \
-		$PHPIZE_DEPS \
-		coreutils \
-		curl-dev \
-		libedit-dev \
-		libressl-dev \
-		libxml2-dev \
-		sqlite-dev \
-	\
-	&& export CFLAGS="$PHP_CFLAGS" \
-		CPPFLAGS="$PHP_CPPFLAGS" \
-		LDFLAGS="$PHP_LDFLAGS" \
-	&& docker-php-source extract \
-	&& cd /usr/src/php \
-	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
-	&& ./configure \
-		--build="$gnuArch" \
-		--with-config-file-path="$PHP_INI_DIR" \
-		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
-		\
-# make sure invalid --configure-flags are fatal errors intead of just warnings
-		--enable-option-checking=fatal \
-		\
-# https://github.com/docker-library/php/issues/439
-		--with-mhash \
-		\
-# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
-		--enable-ftp \
-# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
-		--enable-mbstring \
-# --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 \
-		\
-		--with-curl \
-		--with-libedit \
-		--with-openssl \
-		--with-zlib \
-		\
-# bundled pcre does not support JIT on s390x
-# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
-		\
-		$PHP_EXTRA_CONFIGURE_ARGS \
-	&& make -j "$(nproc)" \
-	&& make install \
-	&& { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
-	&& make clean \
-	\
-# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
-	&& cp -v php.ini-* "$PHP_INI_DIR/" \
-	\
-	&& cd / \
-	&& docker-php-source delete \
-	\
-	&& runDeps="$( \
-		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
-			| tr ',' '\n' \
-			| sort -u \
-			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
-	\
-	&& apk del .build-deps \
-	\
-# https://github.com/docker-library/php/issues/443
-	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
-
-COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
-
-ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
-CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/5.6/alpine3.8/zts/docker-php-entrypoint b/5.6/alpine3.8/zts/docker-php-entrypoint
deleted file mode 100755
index 88a016c16..000000000
--- a/5.6/alpine3.8/zts/docker-php-entrypoint
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# first arg is `-f` or `--some-option`
-if [ "${1#-}" != "$1" ]; then
-	set -- php "$@"
-fi
-
-exec "$@"
diff --git a/5.6/alpine3.8/zts/docker-php-ext-configure b/5.6/alpine3.8/zts/docker-php-ext-configure
deleted file mode 100755
index 9e949e1e1..000000000
--- a/5.6/alpine3.8/zts/docker-php-ext-configure
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 ext-name [configure flags]"
-	echo "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-ext="$1"
-if [ -z "$ext" ] || [ ! -d "$ext" ]; then
-	usage >&2
-	exit 1
-fi
-shift
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual .phpize-deps-configure $PHPIZE_DEPS
-	fi
-fi
-
-if command -v dpkg-architecture > /dev/null; then
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"
-	set -- --build="$gnuArch" "$@"
-fi
-
-cd "$ext"
-phpize
-./configure "$@"
diff --git a/5.6/alpine3.8/zts/docker-php-ext-enable b/5.6/alpine3.8/zts/docker-php-ext-enable
deleted file mode 100755
index 2b067f039..000000000
--- a/5.6/alpine3.8/zts/docker-php-ext-enable
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-set -e
-
-extDir="$(php -r 'echo ini_get("extension_dir");')"
-cd "$extDir"
-
-usage() {
-	echo "usage: $0 [options] module-name [module-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 --ini-name 0-apc.ini apcu apc"
-	echo
-	echo 'Possible values for module-name:'
-	find -maxdepth 1 \
-			-type f \
-			-name '*.so' \
-			-exec basename '{}' ';' \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-iniName=
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--ini-name) iniName="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-modules=
-for module; do
-	if [ -z "$module" ]; then
-		continue
-	fi
-	if [ -f "$module.so" ] && ! [ -f "$module" ]; then
-		# allow ".so" to be optional
-		module="$module.so"
-	fi
-	if ! [ -f "$module" ]; then
-		echo >&2 "error: '$module' does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	modules="$modules $module"
-done
-
-if [ -z "$modules" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual '.docker-php-ext-enable-deps' binutils
-		apkDel='.docker-php-ext-enable-deps'
-	fi
-fi
-
-for module in $modules; do
-	if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
-		# https://wiki.php.net/internals/extensions#loading_zend_extensions
-		absModule="$(readlink -f "$module")"
-		line="zend_extension=$absModule"
-	else
-		line="extension=$module"
-	fi
-
-	ext="$(basename "$module")"
-	ext="${ext%.*}"
-	if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
-		# this isn't perfect, but it's better than nothing
-		# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
-		echo >&2
-		echo >&2 "warning: $ext ($module) is already loaded!"
-		echo >&2
-		continue
-	fi
-
-	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
-	if ! grep -q "$line" "$ini" 2>/dev/null; then
-		echo "$line" >> "$ini"
-	fi
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
diff --git a/5.6/alpine3.8/zts/docker-php-ext-install b/5.6/alpine3.8/zts/docker-php-ext-install
deleted file mode 100755
index d75d6d793..000000000
--- a/5.6/alpine3.8/zts/docker-php-ext-install
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 [-jN] ext-name [ext-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop"
-	echo
-	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-j=1
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--jobs|-j) j="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-exts=
-for ext; do
-	if [ -z "$ext" ]; then
-		continue
-	fi
-	if [ ! -d "$ext" ]; then
-		echo >&2 "error: $PWD/$ext does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	exts="$exts $ext"
-done
-
-if [ -z "$exts" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if [ -n "$PHPIZE_DEPS" ]; then
-		if apk info --installed .phpize-deps-configure > /dev/null; then
-			apkDel='.phpize-deps-configure'
-		elif ! apk info --installed .phpize-deps > /dev/null; then
-			apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS
-			apkDel='.phpize-deps'
-		fi
-	fi
-fi
-
-popDir="$PWD"
-for ext in $exts; do
-	cd "$ext"
-	[ -e Makefile ] || docker-php-ext-configure "$ext"
-	make -j"$j"
-	make -j"$j" install
-	find modules \
-		-maxdepth 1 \
-		-name '*.so' \
-		-exec basename '{}' ';' \
-			| xargs -r docker-php-ext-enable
-	make -j"$j" clean
-	cd "$popDir"
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
-
-if [ -e /usr/src/php/.docker-delete-me ]; then
-	docker-php-source delete
-fi
diff --git a/5.6/alpine3.8/zts/docker-php-source b/5.6/alpine3.8/zts/docker-php-source
deleted file mode 100755
index 9033d243d..000000000
--- a/5.6/alpine3.8/zts/docker-php-source
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-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 $dir if not already done."
-	echo "   delete   delete extracted php source located into $dir if not already done."
-	echo
-}
-
-case "$1" in
-	extract)
-		mkdir -p "$dir"
-		if [ ! -f "$dir/.docker-extracted" ]; then
-			tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
-			touch "$dir/.docker-extracted"
-		fi
-		;;
-
-	delete)
-		rm -rf "$dir"
-		;;
-
-	*)
-		usage
-		exit 1
-		;;
-esac
diff --git a/5.6/jessie/apache/Dockerfile b/5.6/jessie/apache/Dockerfile
index b4032a5f7..dd59cd2d2 100644
--- a/5.6/jessie/apache/Dockerfile
+++ b/5.6/jessie/apache/Dockerfile
@@ -100,7 +100,7 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
diff --git a/5.6/jessie/zts/Dockerfile b/5.6/jessie/zts/Dockerfile
deleted file mode 100644
index b2a76c9c7..000000000
--- a/5.6/jessie/zts/Dockerfile
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM debian:jessie
-
-# prevent Debian's PHP packages from being installed
-# https://github.com/docker-library/php/pull/542
-RUN set -eux; \
-	{ \
-		echo 'Package: php*'; \
-		echo 'Pin: release *'; \
-		echo 'Pin-Priority: -1'; \
-	} > /etc/apt/preferences.d/no-debian-php
-
-# dependencies required for running "phpize"
-# (see persistent deps below)
-ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkg-config \
-		re2c
-
-# persistent / runtime deps
-RUN apt-get update && apt-get install -y \
-		$PHPIZE_DEPS \
-		ca-certificates \
-		curl \
-		xz-utils \
-	--no-install-recommends && rm -r /var/lib/apt/lists/*
-
-ENV PHP_INI_DIR /usr/local/etc/php
-RUN mkdir -p $PHP_INI_DIR/conf.d
-
-##<autogenerated>##
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
-
-# Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
-# Enable optimization (-O2)
-# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
-# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
-# https://github.com/docker-library/php/issues/272
-ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
-ENV PHP_CPPFLAGS="$PHP_CFLAGS"
-ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
-
-ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
-
-ENV PHP_VERSION 5.6.38
-ENV PHP_URL="https://secure.php.net/get/php-5.6.38.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.38.tar.xz.asc/from/this/mirror"
-ENV PHP_SHA256="c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e" PHP_MD5=""
-
-RUN set -xe; \
-	\
-	fetchDeps=' \
-		wget \
-	'; \
-	if ! command -v gpg > /dev/null; then \
-		fetchDeps="$fetchDeps \
-			dirmngr \
-			gnupg \
-		"; \
-	fi; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends $fetchDeps; \
-	rm -rf /var/lib/apt/lists/*; \
-	\
-	mkdir -p /usr/src; \
-	cd /usr/src; \
-	\
-	wget -O php.tar.xz "$PHP_URL"; \
-	\
-	if [ -n "$PHP_SHA256" ]; then \
-		echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
-	fi; \
-	if [ -n "$PHP_MD5" ]; then \
-		echo "$PHP_MD5 *php.tar.xz" | md5sum -c -; \
-	fi; \
-	\
-	if [ -n "$PHP_ASC_URL" ]; then \
-		wget -O php.tar.xz.asc "$PHP_ASC_URL"; \
-		export GNUPGHOME="$(mktemp -d)"; \
-		for key in $GPG_KEYS; do \
-			gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-		done; \
-		gpg --batch --verify php.tar.xz.asc php.tar.xz; \
-		command -v gpgconf > /dev/null && gpgconf --kill all; \
-		rm -rf "$GNUPGHOME"; \
-	fi; \
-	\
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps
-
-COPY docker-php-source /usr/local/bin/
-
-RUN set -eux; \
-	\
-	savedAptMark="$(apt-mark showmanual)"; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		libcurl4-openssl-dev \
-		libedit-dev \
-		libsqlite3-dev \
-		libssl-dev \
-		libxml2-dev \
-		zlib1g-dev \
-		${PHP_EXTRA_BUILD_DEPS:-} \
-	; \
-	rm -rf /var/lib/apt/lists/*; \
-	\
-	export \
-		CFLAGS="$PHP_CFLAGS" \
-		CPPFLAGS="$PHP_CPPFLAGS" \
-		LDFLAGS="$PHP_LDFLAGS" \
-	; \
-	docker-php-source extract; \
-	cd /usr/src/php; \
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
-	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-# https://bugs.php.net/bug.php?id=74125
-	if [ ! -d /usr/include/curl ]; then \
-		ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
-	fi; \
-	./configure \
-		--build="$gnuArch" \
-		--with-config-file-path="$PHP_INI_DIR" \
-		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
-		\
-# make sure invalid --configure-flags are fatal errors intead of just warnings
-		--enable-option-checking=fatal \
-		\
-# https://github.com/docker-library/php/issues/439
-		--with-mhash \
-		\
-# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
-		--enable-ftp \
-# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
-		--enable-mbstring \
-# --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 \
-		\
-		--with-curl \
-		--with-libedit \
-		--with-openssl \
-		--with-zlib \
-		\
-# bundled pcre does not support JIT on s390x
-# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
-		--with-libdir="lib/$debMultiarch" \
-		\
-		${PHP_EXTRA_CONFIGURE_ARGS:-} \
-	; \
-	make -j "$(nproc)"; \
-	make install; \
-	find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \
-	make clean; \
-	\
-# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
-	cp -v php.ini-* "$PHP_INI_DIR/"; \
-	\
-	cd /; \
-	docker-php-source delete; \
-	\
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-	apt-mark auto '.*' > /dev/null; \
-	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
-	find /usr/local -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { print $(NF-1) }' \
-		| sort -u \
-		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
-		| sort -u \
-		| xargs -r apt-mark manual \
-	; \
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
-	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
-
-COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
-
-ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
-CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/5.6/jessie/zts/docker-php-entrypoint b/5.6/jessie/zts/docker-php-entrypoint
deleted file mode 100755
index 88a016c16..000000000
--- a/5.6/jessie/zts/docker-php-entrypoint
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# first arg is `-f` or `--some-option`
-if [ "${1#-}" != "$1" ]; then
-	set -- php "$@"
-fi
-
-exec "$@"
diff --git a/5.6/jessie/zts/docker-php-ext-configure b/5.6/jessie/zts/docker-php-ext-configure
deleted file mode 100755
index 9e949e1e1..000000000
--- a/5.6/jessie/zts/docker-php-ext-configure
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 ext-name [configure flags]"
-	echo "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-ext="$1"
-if [ -z "$ext" ] || [ ! -d "$ext" ]; then
-	usage >&2
-	exit 1
-fi
-shift
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual .phpize-deps-configure $PHPIZE_DEPS
-	fi
-fi
-
-if command -v dpkg-architecture > /dev/null; then
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"
-	set -- --build="$gnuArch" "$@"
-fi
-
-cd "$ext"
-phpize
-./configure "$@"
diff --git a/5.6/jessie/zts/docker-php-ext-enable b/5.6/jessie/zts/docker-php-ext-enable
deleted file mode 100755
index 2b067f039..000000000
--- a/5.6/jessie/zts/docker-php-ext-enable
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-set -e
-
-extDir="$(php -r 'echo ini_get("extension_dir");')"
-cd "$extDir"
-
-usage() {
-	echo "usage: $0 [options] module-name [module-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 --ini-name 0-apc.ini apcu apc"
-	echo
-	echo 'Possible values for module-name:'
-	find -maxdepth 1 \
-			-type f \
-			-name '*.so' \
-			-exec basename '{}' ';' \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-iniName=
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--ini-name) iniName="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-modules=
-for module; do
-	if [ -z "$module" ]; then
-		continue
-	fi
-	if [ -f "$module.so" ] && ! [ -f "$module" ]; then
-		# allow ".so" to be optional
-		module="$module.so"
-	fi
-	if ! [ -f "$module" ]; then
-		echo >&2 "error: '$module' does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	modules="$modules $module"
-done
-
-if [ -z "$modules" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual '.docker-php-ext-enable-deps' binutils
-		apkDel='.docker-php-ext-enable-deps'
-	fi
-fi
-
-for module in $modules; do
-	if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
-		# https://wiki.php.net/internals/extensions#loading_zend_extensions
-		absModule="$(readlink -f "$module")"
-		line="zend_extension=$absModule"
-	else
-		line="extension=$module"
-	fi
-
-	ext="$(basename "$module")"
-	ext="${ext%.*}"
-	if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
-		# this isn't perfect, but it's better than nothing
-		# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
-		echo >&2
-		echo >&2 "warning: $ext ($module) is already loaded!"
-		echo >&2
-		continue
-	fi
-
-	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
-	if ! grep -q "$line" "$ini" 2>/dev/null; then
-		echo "$line" >> "$ini"
-	fi
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
diff --git a/5.6/jessie/zts/docker-php-ext-install b/5.6/jessie/zts/docker-php-ext-install
deleted file mode 100755
index d75d6d793..000000000
--- a/5.6/jessie/zts/docker-php-ext-install
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 [-jN] ext-name [ext-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop"
-	echo
-	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-j=1
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--jobs|-j) j="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-exts=
-for ext; do
-	if [ -z "$ext" ]; then
-		continue
-	fi
-	if [ ! -d "$ext" ]; then
-		echo >&2 "error: $PWD/$ext does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	exts="$exts $ext"
-done
-
-if [ -z "$exts" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if [ -n "$PHPIZE_DEPS" ]; then
-		if apk info --installed .phpize-deps-configure > /dev/null; then
-			apkDel='.phpize-deps-configure'
-		elif ! apk info --installed .phpize-deps > /dev/null; then
-			apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS
-			apkDel='.phpize-deps'
-		fi
-	fi
-fi
-
-popDir="$PWD"
-for ext in $exts; do
-	cd "$ext"
-	[ -e Makefile ] || docker-php-ext-configure "$ext"
-	make -j"$j"
-	make -j"$j" install
-	find modules \
-		-maxdepth 1 \
-		-name '*.so' \
-		-exec basename '{}' ';' \
-			| xargs -r docker-php-ext-enable
-	make -j"$j" clean
-	cd "$popDir"
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
-
-if [ -e /usr/src/php/.docker-delete-me ]; then
-	docker-php-source delete
-fi
diff --git a/5.6/jessie/zts/docker-php-source b/5.6/jessie/zts/docker-php-source
deleted file mode 100755
index 9033d243d..000000000
--- a/5.6/jessie/zts/docker-php-source
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-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 $dir if not already done."
-	echo "   delete   delete extracted php source located into $dir if not already done."
-	echo
-}
-
-case "$1" in
-	extract)
-		mkdir -p "$dir"
-		if [ ! -f "$dir/.docker-extracted" ]; then
-			tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
-			touch "$dir/.docker-extracted"
-		fi
-		;;
-
-	delete)
-		rm -rf "$dir"
-		;;
-
-	*)
-		usage
-		exit 1
-		;;
-esac
diff --git a/5.6/stretch/apache/Dockerfile b/5.6/stretch/apache/Dockerfile
index ff5b32488..790170182 100644
--- a/5.6/stretch/apache/Dockerfile
+++ b/5.6/stretch/apache/Dockerfile
@@ -100,7 +100,7 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
diff --git a/5.6/stretch/zts/Dockerfile b/5.6/stretch/zts/Dockerfile
deleted file mode 100644
index 069c9c62e..000000000
--- a/5.6/stretch/zts/Dockerfile
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM debian:stretch-slim
-
-# prevent Debian's PHP packages from being installed
-# https://github.com/docker-library/php/pull/542
-RUN set -eux; \
-	{ \
-		echo 'Package: php*'; \
-		echo 'Pin: release *'; \
-		echo 'Pin-Priority: -1'; \
-	} > /etc/apt/preferences.d/no-debian-php
-
-# dependencies required for running "phpize"
-# (see persistent deps below)
-ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkg-config \
-		re2c
-
-# persistent / runtime deps
-RUN apt-get update && apt-get install -y \
-		$PHPIZE_DEPS \
-		ca-certificates \
-		curl \
-		xz-utils \
-	--no-install-recommends && rm -r /var/lib/apt/lists/*
-
-ENV PHP_INI_DIR /usr/local/etc/php
-RUN mkdir -p $PHP_INI_DIR/conf.d
-
-##<autogenerated>##
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
-
-# Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
-# Enable optimization (-O2)
-# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
-# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
-# https://github.com/docker-library/php/issues/272
-ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
-ENV PHP_CPPFLAGS="$PHP_CFLAGS"
-ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
-
-ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
-
-ENV PHP_VERSION 5.6.38
-ENV PHP_URL="https://secure.php.net/get/php-5.6.38.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.38.tar.xz.asc/from/this/mirror"
-ENV PHP_SHA256="c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e" PHP_MD5=""
-
-RUN set -xe; \
-	\
-	fetchDeps=' \
-		wget \
-	'; \
-	if ! command -v gpg > /dev/null; then \
-		fetchDeps="$fetchDeps \
-			dirmngr \
-			gnupg \
-		"; \
-	fi; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends $fetchDeps; \
-	rm -rf /var/lib/apt/lists/*; \
-	\
-	mkdir -p /usr/src; \
-	cd /usr/src; \
-	\
-	wget -O php.tar.xz "$PHP_URL"; \
-	\
-	if [ -n "$PHP_SHA256" ]; then \
-		echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
-	fi; \
-	if [ -n "$PHP_MD5" ]; then \
-		echo "$PHP_MD5 *php.tar.xz" | md5sum -c -; \
-	fi; \
-	\
-	if [ -n "$PHP_ASC_URL" ]; then \
-		wget -O php.tar.xz.asc "$PHP_ASC_URL"; \
-		export GNUPGHOME="$(mktemp -d)"; \
-		for key in $GPG_KEYS; do \
-			gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-		done; \
-		gpg --batch --verify php.tar.xz.asc php.tar.xz; \
-		command -v gpgconf > /dev/null && gpgconf --kill all; \
-		rm -rf "$GNUPGHOME"; \
-	fi; \
-	\
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps
-
-COPY docker-php-source /usr/local/bin/
-
-RUN set -eux; \
-	\
-	savedAptMark="$(apt-mark showmanual)"; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		libcurl4-openssl-dev \
-		libedit-dev \
-		libsqlite3-dev \
-		libssl1.0-dev \
-		libxml2-dev \
-		zlib1g-dev \
-		${PHP_EXTRA_BUILD_DEPS:-} \
-	; \
-	rm -rf /var/lib/apt/lists/*; \
-	\
-	export \
-		CFLAGS="$PHP_CFLAGS" \
-		CPPFLAGS="$PHP_CPPFLAGS" \
-		LDFLAGS="$PHP_LDFLAGS" \
-	; \
-	docker-php-source extract; \
-	cd /usr/src/php; \
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
-	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-# https://bugs.php.net/bug.php?id=74125
-	if [ ! -d /usr/include/curl ]; then \
-		ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
-	fi; \
-	./configure \
-		--build="$gnuArch" \
-		--with-config-file-path="$PHP_INI_DIR" \
-		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
-		\
-# make sure invalid --configure-flags are fatal errors intead of just warnings
-		--enable-option-checking=fatal \
-		\
-# https://github.com/docker-library/php/issues/439
-		--with-mhash \
-		\
-# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
-		--enable-ftp \
-# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
-		--enable-mbstring \
-# --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 \
-		\
-		--with-curl \
-		--with-libedit \
-		--with-openssl \
-		--with-zlib \
-		\
-# bundled pcre does not support JIT on s390x
-# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
-		--with-libdir="lib/$debMultiarch" \
-		\
-		${PHP_EXTRA_CONFIGURE_ARGS:-} \
-	; \
-	make -j "$(nproc)"; \
-	make install; \
-	find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \
-	make clean; \
-	\
-# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
-	cp -v php.ini-* "$PHP_INI_DIR/"; \
-	\
-	cd /; \
-	docker-php-source delete; \
-	\
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-	apt-mark auto '.*' > /dev/null; \
-	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
-	find /usr/local -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { print $(NF-1) }' \
-		| sort -u \
-		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
-		| sort -u \
-		| xargs -r apt-mark manual \
-	; \
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
-	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
-
-COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
-
-ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
-CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/5.6/stretch/zts/docker-php-entrypoint b/5.6/stretch/zts/docker-php-entrypoint
deleted file mode 100755
index 88a016c16..000000000
--- a/5.6/stretch/zts/docker-php-entrypoint
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# first arg is `-f` or `--some-option`
-if [ "${1#-}" != "$1" ]; then
-	set -- php "$@"
-fi
-
-exec "$@"
diff --git a/5.6/stretch/zts/docker-php-ext-configure b/5.6/stretch/zts/docker-php-ext-configure
deleted file mode 100755
index 9e949e1e1..000000000
--- a/5.6/stretch/zts/docker-php-ext-configure
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 ext-name [configure flags]"
-	echo "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-ext="$1"
-if [ -z "$ext" ] || [ ! -d "$ext" ]; then
-	usage >&2
-	exit 1
-fi
-shift
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual .phpize-deps-configure $PHPIZE_DEPS
-	fi
-fi
-
-if command -v dpkg-architecture > /dev/null; then
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"
-	set -- --build="$gnuArch" "$@"
-fi
-
-cd "$ext"
-phpize
-./configure "$@"
diff --git a/5.6/stretch/zts/docker-php-ext-enable b/5.6/stretch/zts/docker-php-ext-enable
deleted file mode 100755
index 2b067f039..000000000
--- a/5.6/stretch/zts/docker-php-ext-enable
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-set -e
-
-extDir="$(php -r 'echo ini_get("extension_dir");')"
-cd "$extDir"
-
-usage() {
-	echo "usage: $0 [options] module-name [module-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 --ini-name 0-apc.ini apcu apc"
-	echo
-	echo 'Possible values for module-name:'
-	find -maxdepth 1 \
-			-type f \
-			-name '*.so' \
-			-exec basename '{}' ';' \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-iniName=
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--ini-name) iniName="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-modules=
-for module; do
-	if [ -z "$module" ]; then
-		continue
-	fi
-	if [ -f "$module.so" ] && ! [ -f "$module" ]; then
-		# allow ".so" to be optional
-		module="$module.so"
-	fi
-	if ! [ -f "$module" ]; then
-		echo >&2 "error: '$module' does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	modules="$modules $module"
-done
-
-if [ -z "$modules" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual '.docker-php-ext-enable-deps' binutils
-		apkDel='.docker-php-ext-enable-deps'
-	fi
-fi
-
-for module in $modules; do
-	if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
-		# https://wiki.php.net/internals/extensions#loading_zend_extensions
-		absModule="$(readlink -f "$module")"
-		line="zend_extension=$absModule"
-	else
-		line="extension=$module"
-	fi
-
-	ext="$(basename "$module")"
-	ext="${ext%.*}"
-	if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
-		# this isn't perfect, but it's better than nothing
-		# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
-		echo >&2
-		echo >&2 "warning: $ext ($module) is already loaded!"
-		echo >&2
-		continue
-	fi
-
-	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
-	if ! grep -q "$line" "$ini" 2>/dev/null; then
-		echo "$line" >> "$ini"
-	fi
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
diff --git a/5.6/stretch/zts/docker-php-ext-install b/5.6/stretch/zts/docker-php-ext-install
deleted file mode 100755
index d75d6d793..000000000
--- a/5.6/stretch/zts/docker-php-ext-install
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 [-jN] ext-name [ext-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop"
-	echo
-	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-j=1
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--jobs|-j) j="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-exts=
-for ext; do
-	if [ -z "$ext" ]; then
-		continue
-	fi
-	if [ ! -d "$ext" ]; then
-		echo >&2 "error: $PWD/$ext does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	exts="$exts $ext"
-done
-
-if [ -z "$exts" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if [ -n "$PHPIZE_DEPS" ]; then
-		if apk info --installed .phpize-deps-configure > /dev/null; then
-			apkDel='.phpize-deps-configure'
-		elif ! apk info --installed .phpize-deps > /dev/null; then
-			apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS
-			apkDel='.phpize-deps'
-		fi
-	fi
-fi
-
-popDir="$PWD"
-for ext in $exts; do
-	cd "$ext"
-	[ -e Makefile ] || docker-php-ext-configure "$ext"
-	make -j"$j"
-	make -j"$j" install
-	find modules \
-		-maxdepth 1 \
-		-name '*.so' \
-		-exec basename '{}' ';' \
-			| xargs -r docker-php-ext-enable
-	make -j"$j" clean
-	cd "$popDir"
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
-
-if [ -e /usr/src/php/.docker-delete-me ]; then
-	docker-php-source delete
-fi
diff --git a/5.6/stretch/zts/docker-php-source b/5.6/stretch/zts/docker-php-source
deleted file mode 100755
index 9033d243d..000000000
--- a/5.6/stretch/zts/docker-php-source
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-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 $dir if not already done."
-	echo "   delete   delete extracted php source located into $dir if not already done."
-	echo
-}
-
-case "$1" in
-	extract)
-		mkdir -p "$dir"
-		if [ ! -f "$dir/.docker-extracted" ]; then
-			tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
-			touch "$dir/.docker-extracted"
-		fi
-		;;
-
-	delete)
-		rm -rf "$dir"
-		;;
-
-	*)
-		usage
-		exit 1
-		;;
-esac
diff --git a/7.0/alpine3.7/zts/Dockerfile b/7.0/alpine3.7/zts/Dockerfile
deleted file mode 100644
index a236b7ea1..000000000
--- a/7.0/alpine3.7/zts/Dockerfile
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM alpine:3.7
-
-# dependencies required for running "phpize"
-# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
-ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev dpkg \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkgconf \
-		re2c
-
-# persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
-		ca-certificates \
-		curl \
-		tar \
-		xz \
-# https://github.com/docker-library/php/issues/494
-		libressl
-
-# ensure www-data user exists
-RUN set -x \
-	&& addgroup -g 82 -S www-data \
-	&& adduser -u 82 -D -S -G www-data www-data
-# 82 is the standard uid/gid for "www-data" in Alpine
-# http://git.alpinelinux.org/cgit/aports/tree/main/apache2/apache2.pre-install?h=v3.3.2
-# http://git.alpinelinux.org/cgit/aports/tree/main/lighttpd/lighttpd.pre-install?h=v3.3.2
-# http://git.alpinelinux.org/cgit/aports/tree/main/nginx-initscripts/nginx-initscripts.pre-install?h=v3.3.2
-
-ENV PHP_INI_DIR /usr/local/etc/php
-RUN mkdir -p $PHP_INI_DIR/conf.d
-
-##<autogenerated>##
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
-
-# Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
-# Enable optimization (-O2)
-# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
-# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
-# https://github.com/docker-library/php/issues/272
-ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
-ENV PHP_CPPFLAGS="$PHP_CFLAGS"
-ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
-
-ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
-
-ENV PHP_VERSION 7.0.32
-ENV PHP_URL="https://secure.php.net/get/php-7.0.32.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.0.32.tar.xz.asc/from/this/mirror"
-ENV PHP_SHA256="ff6f62afeb32c71b3b89ecbd42950ef6c5e0c329cc6e1c58ffac47e6f1f883c4" PHP_MD5=""
-
-RUN set -xe; \
-	\
-	apk add --no-cache --virtual .fetch-deps \
-		gnupg \
-		wget \
-	; \
-	\
-	mkdir -p /usr/src; \
-	cd /usr/src; \
-	\
-	wget -O php.tar.xz "$PHP_URL"; \
-	\
-	if [ -n "$PHP_SHA256" ]; then \
-		echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
-	fi; \
-	if [ -n "$PHP_MD5" ]; then \
-		echo "$PHP_MD5 *php.tar.xz" | md5sum -c -; \
-	fi; \
-	\
-	if [ -n "$PHP_ASC_URL" ]; then \
-		wget -O php.tar.xz.asc "$PHP_ASC_URL"; \
-		export GNUPGHOME="$(mktemp -d)"; \
-		for key in $GPG_KEYS; do \
-			gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-		done; \
-		gpg --batch --verify php.tar.xz.asc php.tar.xz; \
-		command -v gpgconf > /dev/null && gpgconf --kill all; \
-		rm -rf "$GNUPGHOME"; \
-	fi; \
-	\
-	apk del .fetch-deps
-
-COPY docker-php-source /usr/local/bin/
-
-RUN set -xe \
-	&& apk add --no-cache --virtual .build-deps \
-		$PHPIZE_DEPS \
-		coreutils \
-		curl-dev \
-		libedit-dev \
-		libressl-dev \
-		libxml2-dev \
-		sqlite-dev \
-	\
-	&& export CFLAGS="$PHP_CFLAGS" \
-		CPPFLAGS="$PHP_CPPFLAGS" \
-		LDFLAGS="$PHP_LDFLAGS" \
-	&& docker-php-source extract \
-	&& cd /usr/src/php \
-	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
-	&& ./configure \
-		--build="$gnuArch" \
-		--with-config-file-path="$PHP_INI_DIR" \
-		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
-		\
-# make sure invalid --configure-flags are fatal errors intead of just warnings
-		--enable-option-checking=fatal \
-		\
-# https://github.com/docker-library/php/issues/439
-		--with-mhash \
-		\
-# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
-		--enable-ftp \
-# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
-		--enable-mbstring \
-# --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 \
-		\
-		--with-curl \
-		--with-libedit \
-		--with-openssl \
-		--with-zlib \
-		\
-# bundled pcre does not support JIT on s390x
-# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
-		\
-		$PHP_EXTRA_CONFIGURE_ARGS \
-	&& make -j "$(nproc)" \
-	&& make install \
-	&& { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
-	&& make clean \
-	\
-# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
-	&& cp -v php.ini-* "$PHP_INI_DIR/" \
-	\
-	&& cd / \
-	&& docker-php-source delete \
-	\
-	&& runDeps="$( \
-		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
-			| tr ',' '\n' \
-			| sort -u \
-			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
-	\
-	&& apk del .build-deps \
-	\
-# https://github.com/docker-library/php/issues/443
-	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
-
-COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
-
-ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
-CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/7.0/alpine3.7/zts/docker-php-entrypoint b/7.0/alpine3.7/zts/docker-php-entrypoint
deleted file mode 100755
index 88a016c16..000000000
--- a/7.0/alpine3.7/zts/docker-php-entrypoint
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# first arg is `-f` or `--some-option`
-if [ "${1#-}" != "$1" ]; then
-	set -- php "$@"
-fi
-
-exec "$@"
diff --git a/7.0/alpine3.7/zts/docker-php-ext-configure b/7.0/alpine3.7/zts/docker-php-ext-configure
deleted file mode 100755
index 9e949e1e1..000000000
--- a/7.0/alpine3.7/zts/docker-php-ext-configure
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 ext-name [configure flags]"
-	echo "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-ext="$1"
-if [ -z "$ext" ] || [ ! -d "$ext" ]; then
-	usage >&2
-	exit 1
-fi
-shift
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual .phpize-deps-configure $PHPIZE_DEPS
-	fi
-fi
-
-if command -v dpkg-architecture > /dev/null; then
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"
-	set -- --build="$gnuArch" "$@"
-fi
-
-cd "$ext"
-phpize
-./configure "$@"
diff --git a/7.0/alpine3.7/zts/docker-php-ext-enable b/7.0/alpine3.7/zts/docker-php-ext-enable
deleted file mode 100755
index 2b067f039..000000000
--- a/7.0/alpine3.7/zts/docker-php-ext-enable
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-set -e
-
-extDir="$(php -r 'echo ini_get("extension_dir");')"
-cd "$extDir"
-
-usage() {
-	echo "usage: $0 [options] module-name [module-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 --ini-name 0-apc.ini apcu apc"
-	echo
-	echo 'Possible values for module-name:'
-	find -maxdepth 1 \
-			-type f \
-			-name '*.so' \
-			-exec basename '{}' ';' \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-iniName=
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--ini-name) iniName="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-modules=
-for module; do
-	if [ -z "$module" ]; then
-		continue
-	fi
-	if [ -f "$module.so" ] && ! [ -f "$module" ]; then
-		# allow ".so" to be optional
-		module="$module.so"
-	fi
-	if ! [ -f "$module" ]; then
-		echo >&2 "error: '$module' does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	modules="$modules $module"
-done
-
-if [ -z "$modules" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual '.docker-php-ext-enable-deps' binutils
-		apkDel='.docker-php-ext-enable-deps'
-	fi
-fi
-
-for module in $modules; do
-	if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
-		# https://wiki.php.net/internals/extensions#loading_zend_extensions
-		absModule="$(readlink -f "$module")"
-		line="zend_extension=$absModule"
-	else
-		line="extension=$module"
-	fi
-
-	ext="$(basename "$module")"
-	ext="${ext%.*}"
-	if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
-		# this isn't perfect, but it's better than nothing
-		# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
-		echo >&2
-		echo >&2 "warning: $ext ($module) is already loaded!"
-		echo >&2
-		continue
-	fi
-
-	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
-	if ! grep -q "$line" "$ini" 2>/dev/null; then
-		echo "$line" >> "$ini"
-	fi
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
diff --git a/7.0/alpine3.7/zts/docker-php-ext-install b/7.0/alpine3.7/zts/docker-php-ext-install
deleted file mode 100755
index d75d6d793..000000000
--- a/7.0/alpine3.7/zts/docker-php-ext-install
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 [-jN] ext-name [ext-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop"
-	echo
-	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-j=1
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--jobs|-j) j="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-exts=
-for ext; do
-	if [ -z "$ext" ]; then
-		continue
-	fi
-	if [ ! -d "$ext" ]; then
-		echo >&2 "error: $PWD/$ext does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	exts="$exts $ext"
-done
-
-if [ -z "$exts" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if [ -n "$PHPIZE_DEPS" ]; then
-		if apk info --installed .phpize-deps-configure > /dev/null; then
-			apkDel='.phpize-deps-configure'
-		elif ! apk info --installed .phpize-deps > /dev/null; then
-			apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS
-			apkDel='.phpize-deps'
-		fi
-	fi
-fi
-
-popDir="$PWD"
-for ext in $exts; do
-	cd "$ext"
-	[ -e Makefile ] || docker-php-ext-configure "$ext"
-	make -j"$j"
-	make -j"$j" install
-	find modules \
-		-maxdepth 1 \
-		-name '*.so' \
-		-exec basename '{}' ';' \
-			| xargs -r docker-php-ext-enable
-	make -j"$j" clean
-	cd "$popDir"
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
-
-if [ -e /usr/src/php/.docker-delete-me ]; then
-	docker-php-source delete
-fi
diff --git a/7.0/alpine3.7/zts/docker-php-source b/7.0/alpine3.7/zts/docker-php-source
deleted file mode 100755
index 9033d243d..000000000
--- a/7.0/alpine3.7/zts/docker-php-source
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-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 $dir if not already done."
-	echo "   delete   delete extracted php source located into $dir if not already done."
-	echo
-}
-
-case "$1" in
-	extract)
-		mkdir -p "$dir"
-		if [ ! -f "$dir/.docker-extracted" ]; then
-			tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
-			touch "$dir/.docker-extracted"
-		fi
-		;;
-
-	delete)
-		rm -rf "$dir"
-		;;
-
-	*)
-		usage
-		exit 1
-		;;
-esac
diff --git a/7.0/jessie/apache/Dockerfile b/7.0/jessie/apache/Dockerfile
index 8fe802852..77a51cb57 100644
--- a/7.0/jessie/apache/Dockerfile
+++ b/7.0/jessie/apache/Dockerfile
@@ -100,7 +100,7 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
diff --git a/7.0/jessie/zts/Dockerfile b/7.0/jessie/zts/Dockerfile
deleted file mode 100644
index 926fb72d5..000000000
--- a/7.0/jessie/zts/Dockerfile
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM debian:jessie
-
-# prevent Debian's PHP packages from being installed
-# https://github.com/docker-library/php/pull/542
-RUN set -eux; \
-	{ \
-		echo 'Package: php*'; \
-		echo 'Pin: release *'; \
-		echo 'Pin-Priority: -1'; \
-	} > /etc/apt/preferences.d/no-debian-php
-
-# dependencies required for running "phpize"
-# (see persistent deps below)
-ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkg-config \
-		re2c
-
-# persistent / runtime deps
-RUN apt-get update && apt-get install -y \
-		$PHPIZE_DEPS \
-		ca-certificates \
-		curl \
-		xz-utils \
-	--no-install-recommends && rm -r /var/lib/apt/lists/*
-
-ENV PHP_INI_DIR /usr/local/etc/php
-RUN mkdir -p $PHP_INI_DIR/conf.d
-
-##<autogenerated>##
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
-
-# Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
-# Enable optimization (-O2)
-# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
-# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
-# https://github.com/docker-library/php/issues/272
-ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
-ENV PHP_CPPFLAGS="$PHP_CFLAGS"
-ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
-
-ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
-
-ENV PHP_VERSION 7.0.32
-ENV PHP_URL="https://secure.php.net/get/php-7.0.32.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.0.32.tar.xz.asc/from/this/mirror"
-ENV PHP_SHA256="ff6f62afeb32c71b3b89ecbd42950ef6c5e0c329cc6e1c58ffac47e6f1f883c4" PHP_MD5=""
-
-RUN set -xe; \
-	\
-	fetchDeps=' \
-		wget \
-	'; \
-	if ! command -v gpg > /dev/null; then \
-		fetchDeps="$fetchDeps \
-			dirmngr \
-			gnupg \
-		"; \
-	fi; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends $fetchDeps; \
-	rm -rf /var/lib/apt/lists/*; \
-	\
-	mkdir -p /usr/src; \
-	cd /usr/src; \
-	\
-	wget -O php.tar.xz "$PHP_URL"; \
-	\
-	if [ -n "$PHP_SHA256" ]; then \
-		echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
-	fi; \
-	if [ -n "$PHP_MD5" ]; then \
-		echo "$PHP_MD5 *php.tar.xz" | md5sum -c -; \
-	fi; \
-	\
-	if [ -n "$PHP_ASC_URL" ]; then \
-		wget -O php.tar.xz.asc "$PHP_ASC_URL"; \
-		export GNUPGHOME="$(mktemp -d)"; \
-		for key in $GPG_KEYS; do \
-			gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-		done; \
-		gpg --batch --verify php.tar.xz.asc php.tar.xz; \
-		command -v gpgconf > /dev/null && gpgconf --kill all; \
-		rm -rf "$GNUPGHOME"; \
-	fi; \
-	\
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps
-
-COPY docker-php-source /usr/local/bin/
-
-RUN set -eux; \
-	\
-	savedAptMark="$(apt-mark showmanual)"; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		libcurl4-openssl-dev \
-		libedit-dev \
-		libsqlite3-dev \
-		libssl-dev \
-		libxml2-dev \
-		zlib1g-dev \
-		${PHP_EXTRA_BUILD_DEPS:-} \
-	; \
-	rm -rf /var/lib/apt/lists/*; \
-	\
-	export \
-		CFLAGS="$PHP_CFLAGS" \
-		CPPFLAGS="$PHP_CPPFLAGS" \
-		LDFLAGS="$PHP_LDFLAGS" \
-	; \
-	docker-php-source extract; \
-	cd /usr/src/php; \
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
-	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-# https://bugs.php.net/bug.php?id=74125
-	if [ ! -d /usr/include/curl ]; then \
-		ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
-	fi; \
-	./configure \
-		--build="$gnuArch" \
-		--with-config-file-path="$PHP_INI_DIR" \
-		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
-		\
-# make sure invalid --configure-flags are fatal errors intead of just warnings
-		--enable-option-checking=fatal \
-		\
-# https://github.com/docker-library/php/issues/439
-		--with-mhash \
-		\
-# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
-		--enable-ftp \
-# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
-		--enable-mbstring \
-# --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 \
-		\
-		--with-curl \
-		--with-libedit \
-		--with-openssl \
-		--with-zlib \
-		\
-# bundled pcre does not support JIT on s390x
-# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
-		--with-libdir="lib/$debMultiarch" \
-		\
-		${PHP_EXTRA_CONFIGURE_ARGS:-} \
-	; \
-	make -j "$(nproc)"; \
-	make install; \
-	find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \
-	make clean; \
-	\
-# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
-	cp -v php.ini-* "$PHP_INI_DIR/"; \
-	\
-	cd /; \
-	docker-php-source delete; \
-	\
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-	apt-mark auto '.*' > /dev/null; \
-	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
-	find /usr/local -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { print $(NF-1) }' \
-		| sort -u \
-		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
-		| sort -u \
-		| xargs -r apt-mark manual \
-	; \
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
-	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
-
-COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
-
-ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
-CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/7.0/jessie/zts/docker-php-entrypoint b/7.0/jessie/zts/docker-php-entrypoint
deleted file mode 100755
index 88a016c16..000000000
--- a/7.0/jessie/zts/docker-php-entrypoint
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# first arg is `-f` or `--some-option`
-if [ "${1#-}" != "$1" ]; then
-	set -- php "$@"
-fi
-
-exec "$@"
diff --git a/7.0/jessie/zts/docker-php-ext-configure b/7.0/jessie/zts/docker-php-ext-configure
deleted file mode 100755
index 9e949e1e1..000000000
--- a/7.0/jessie/zts/docker-php-ext-configure
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 ext-name [configure flags]"
-	echo "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-ext="$1"
-if [ -z "$ext" ] || [ ! -d "$ext" ]; then
-	usage >&2
-	exit 1
-fi
-shift
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual .phpize-deps-configure $PHPIZE_DEPS
-	fi
-fi
-
-if command -v dpkg-architecture > /dev/null; then
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"
-	set -- --build="$gnuArch" "$@"
-fi
-
-cd "$ext"
-phpize
-./configure "$@"
diff --git a/7.0/jessie/zts/docker-php-ext-enable b/7.0/jessie/zts/docker-php-ext-enable
deleted file mode 100755
index 2b067f039..000000000
--- a/7.0/jessie/zts/docker-php-ext-enable
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-set -e
-
-extDir="$(php -r 'echo ini_get("extension_dir");')"
-cd "$extDir"
-
-usage() {
-	echo "usage: $0 [options] module-name [module-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 --ini-name 0-apc.ini apcu apc"
-	echo
-	echo 'Possible values for module-name:'
-	find -maxdepth 1 \
-			-type f \
-			-name '*.so' \
-			-exec basename '{}' ';' \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-iniName=
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--ini-name) iniName="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-modules=
-for module; do
-	if [ -z "$module" ]; then
-		continue
-	fi
-	if [ -f "$module.so" ] && ! [ -f "$module" ]; then
-		# allow ".so" to be optional
-		module="$module.so"
-	fi
-	if ! [ -f "$module" ]; then
-		echo >&2 "error: '$module' does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	modules="$modules $module"
-done
-
-if [ -z "$modules" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual '.docker-php-ext-enable-deps' binutils
-		apkDel='.docker-php-ext-enable-deps'
-	fi
-fi
-
-for module in $modules; do
-	if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
-		# https://wiki.php.net/internals/extensions#loading_zend_extensions
-		absModule="$(readlink -f "$module")"
-		line="zend_extension=$absModule"
-	else
-		line="extension=$module"
-	fi
-
-	ext="$(basename "$module")"
-	ext="${ext%.*}"
-	if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
-		# this isn't perfect, but it's better than nothing
-		# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
-		echo >&2
-		echo >&2 "warning: $ext ($module) is already loaded!"
-		echo >&2
-		continue
-	fi
-
-	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
-	if ! grep -q "$line" "$ini" 2>/dev/null; then
-		echo "$line" >> "$ini"
-	fi
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
diff --git a/7.0/jessie/zts/docker-php-ext-install b/7.0/jessie/zts/docker-php-ext-install
deleted file mode 100755
index d75d6d793..000000000
--- a/7.0/jessie/zts/docker-php-ext-install
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 [-jN] ext-name [ext-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop"
-	echo
-	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-j=1
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--jobs|-j) j="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-exts=
-for ext; do
-	if [ -z "$ext" ]; then
-		continue
-	fi
-	if [ ! -d "$ext" ]; then
-		echo >&2 "error: $PWD/$ext does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	exts="$exts $ext"
-done
-
-if [ -z "$exts" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if [ -n "$PHPIZE_DEPS" ]; then
-		if apk info --installed .phpize-deps-configure > /dev/null; then
-			apkDel='.phpize-deps-configure'
-		elif ! apk info --installed .phpize-deps > /dev/null; then
-			apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS
-			apkDel='.phpize-deps'
-		fi
-	fi
-fi
-
-popDir="$PWD"
-for ext in $exts; do
-	cd "$ext"
-	[ -e Makefile ] || docker-php-ext-configure "$ext"
-	make -j"$j"
-	make -j"$j" install
-	find modules \
-		-maxdepth 1 \
-		-name '*.so' \
-		-exec basename '{}' ';' \
-			| xargs -r docker-php-ext-enable
-	make -j"$j" clean
-	cd "$popDir"
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
-
-if [ -e /usr/src/php/.docker-delete-me ]; then
-	docker-php-source delete
-fi
diff --git a/7.0/jessie/zts/docker-php-source b/7.0/jessie/zts/docker-php-source
deleted file mode 100755
index 9033d243d..000000000
--- a/7.0/jessie/zts/docker-php-source
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-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 $dir if not already done."
-	echo "   delete   delete extracted php source located into $dir if not already done."
-	echo
-}
-
-case "$1" in
-	extract)
-		mkdir -p "$dir"
-		if [ ! -f "$dir/.docker-extracted" ]; then
-			tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
-			touch "$dir/.docker-extracted"
-		fi
-		;;
-
-	delete)
-		rm -rf "$dir"
-		;;
-
-	*)
-		usage
-		exit 1
-		;;
-esac
diff --git a/7.0/stretch/apache/Dockerfile b/7.0/stretch/apache/Dockerfile
index bea2942ab..ae6b9da7d 100644
--- a/7.0/stretch/apache/Dockerfile
+++ b/7.0/stretch/apache/Dockerfile
@@ -100,7 +100,7 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
diff --git a/7.0/stretch/zts/Dockerfile b/7.0/stretch/zts/Dockerfile
deleted file mode 100644
index 323d7ace7..000000000
--- a/7.0/stretch/zts/Dockerfile
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM debian:stretch-slim
-
-# prevent Debian's PHP packages from being installed
-# https://github.com/docker-library/php/pull/542
-RUN set -eux; \
-	{ \
-		echo 'Package: php*'; \
-		echo 'Pin: release *'; \
-		echo 'Pin-Priority: -1'; \
-	} > /etc/apt/preferences.d/no-debian-php
-
-# dependencies required for running "phpize"
-# (see persistent deps below)
-ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkg-config \
-		re2c
-
-# persistent / runtime deps
-RUN apt-get update && apt-get install -y \
-		$PHPIZE_DEPS \
-		ca-certificates \
-		curl \
-		xz-utils \
-	--no-install-recommends && rm -r /var/lib/apt/lists/*
-
-ENV PHP_INI_DIR /usr/local/etc/php
-RUN mkdir -p $PHP_INI_DIR/conf.d
-
-##<autogenerated>##
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
-
-# Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
-# Enable optimization (-O2)
-# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
-# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
-# https://github.com/docker-library/php/issues/272
-ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
-ENV PHP_CPPFLAGS="$PHP_CFLAGS"
-ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
-
-ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
-
-ENV PHP_VERSION 7.0.32
-ENV PHP_URL="https://secure.php.net/get/php-7.0.32.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.0.32.tar.xz.asc/from/this/mirror"
-ENV PHP_SHA256="ff6f62afeb32c71b3b89ecbd42950ef6c5e0c329cc6e1c58ffac47e6f1f883c4" PHP_MD5=""
-
-RUN set -xe; \
-	\
-	fetchDeps=' \
-		wget \
-	'; \
-	if ! command -v gpg > /dev/null; then \
-		fetchDeps="$fetchDeps \
-			dirmngr \
-			gnupg \
-		"; \
-	fi; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends $fetchDeps; \
-	rm -rf /var/lib/apt/lists/*; \
-	\
-	mkdir -p /usr/src; \
-	cd /usr/src; \
-	\
-	wget -O php.tar.xz "$PHP_URL"; \
-	\
-	if [ -n "$PHP_SHA256" ]; then \
-		echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
-	fi; \
-	if [ -n "$PHP_MD5" ]; then \
-		echo "$PHP_MD5 *php.tar.xz" | md5sum -c -; \
-	fi; \
-	\
-	if [ -n "$PHP_ASC_URL" ]; then \
-		wget -O php.tar.xz.asc "$PHP_ASC_URL"; \
-		export GNUPGHOME="$(mktemp -d)"; \
-		for key in $GPG_KEYS; do \
-			gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-		done; \
-		gpg --batch --verify php.tar.xz.asc php.tar.xz; \
-		command -v gpgconf > /dev/null && gpgconf --kill all; \
-		rm -rf "$GNUPGHOME"; \
-	fi; \
-	\
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps
-
-COPY docker-php-source /usr/local/bin/
-
-RUN set -eux; \
-	\
-	savedAptMark="$(apt-mark showmanual)"; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		libcurl4-openssl-dev \
-		libedit-dev \
-		libsqlite3-dev \
-		libssl-dev \
-		libxml2-dev \
-		zlib1g-dev \
-		${PHP_EXTRA_BUILD_DEPS:-} \
-	; \
-	rm -rf /var/lib/apt/lists/*; \
-	\
-	export \
-		CFLAGS="$PHP_CFLAGS" \
-		CPPFLAGS="$PHP_CPPFLAGS" \
-		LDFLAGS="$PHP_LDFLAGS" \
-	; \
-	docker-php-source extract; \
-	cd /usr/src/php; \
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
-	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-# https://bugs.php.net/bug.php?id=74125
-	if [ ! -d /usr/include/curl ]; then \
-		ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
-	fi; \
-	./configure \
-		--build="$gnuArch" \
-		--with-config-file-path="$PHP_INI_DIR" \
-		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
-		\
-# make sure invalid --configure-flags are fatal errors intead of just warnings
-		--enable-option-checking=fatal \
-		\
-# https://github.com/docker-library/php/issues/439
-		--with-mhash \
-		\
-# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
-		--enable-ftp \
-# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
-		--enable-mbstring \
-# --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 \
-		\
-		--with-curl \
-		--with-libedit \
-		--with-openssl \
-		--with-zlib \
-		\
-# bundled pcre does not support JIT on s390x
-# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
-		--with-libdir="lib/$debMultiarch" \
-		\
-		${PHP_EXTRA_CONFIGURE_ARGS:-} \
-	; \
-	make -j "$(nproc)"; \
-	make install; \
-	find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \
-	make clean; \
-	\
-# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
-	cp -v php.ini-* "$PHP_INI_DIR/"; \
-	\
-	cd /; \
-	docker-php-source delete; \
-	\
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-	apt-mark auto '.*' > /dev/null; \
-	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
-	find /usr/local -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { print $(NF-1) }' \
-		| sort -u \
-		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
-		| sort -u \
-		| xargs -r apt-mark manual \
-	; \
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
-	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
-
-COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
-
-ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
-CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/7.0/stretch/zts/docker-php-entrypoint b/7.0/stretch/zts/docker-php-entrypoint
deleted file mode 100755
index 88a016c16..000000000
--- a/7.0/stretch/zts/docker-php-entrypoint
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# first arg is `-f` or `--some-option`
-if [ "${1#-}" != "$1" ]; then
-	set -- php "$@"
-fi
-
-exec "$@"
diff --git a/7.0/stretch/zts/docker-php-ext-configure b/7.0/stretch/zts/docker-php-ext-configure
deleted file mode 100755
index 9e949e1e1..000000000
--- a/7.0/stretch/zts/docker-php-ext-configure
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 ext-name [configure flags]"
-	echo "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-ext="$1"
-if [ -z "$ext" ] || [ ! -d "$ext" ]; then
-	usage >&2
-	exit 1
-fi
-shift
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual .phpize-deps-configure $PHPIZE_DEPS
-	fi
-fi
-
-if command -v dpkg-architecture > /dev/null; then
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"
-	set -- --build="$gnuArch" "$@"
-fi
-
-cd "$ext"
-phpize
-./configure "$@"
diff --git a/7.0/stretch/zts/docker-php-ext-enable b/7.0/stretch/zts/docker-php-ext-enable
deleted file mode 100755
index 2b067f039..000000000
--- a/7.0/stretch/zts/docker-php-ext-enable
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-set -e
-
-extDir="$(php -r 'echo ini_get("extension_dir");')"
-cd "$extDir"
-
-usage() {
-	echo "usage: $0 [options] module-name [module-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 --ini-name 0-apc.ini apcu apc"
-	echo
-	echo 'Possible values for module-name:'
-	find -maxdepth 1 \
-			-type f \
-			-name '*.so' \
-			-exec basename '{}' ';' \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-iniName=
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--ini-name) iniName="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-modules=
-for module; do
-	if [ -z "$module" ]; then
-		continue
-	fi
-	if [ -f "$module.so" ] && ! [ -f "$module" ]; then
-		# allow ".so" to be optional
-		module="$module.so"
-	fi
-	if ! [ -f "$module" ]; then
-		echo >&2 "error: '$module' does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	modules="$modules $module"
-done
-
-if [ -z "$modules" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual '.docker-php-ext-enable-deps' binutils
-		apkDel='.docker-php-ext-enable-deps'
-	fi
-fi
-
-for module in $modules; do
-	if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
-		# https://wiki.php.net/internals/extensions#loading_zend_extensions
-		absModule="$(readlink -f "$module")"
-		line="zend_extension=$absModule"
-	else
-		line="extension=$module"
-	fi
-
-	ext="$(basename "$module")"
-	ext="${ext%.*}"
-	if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
-		# this isn't perfect, but it's better than nothing
-		# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
-		echo >&2
-		echo >&2 "warning: $ext ($module) is already loaded!"
-		echo >&2
-		continue
-	fi
-
-	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
-	if ! grep -q "$line" "$ini" 2>/dev/null; then
-		echo "$line" >> "$ini"
-	fi
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
diff --git a/7.0/stretch/zts/docker-php-ext-install b/7.0/stretch/zts/docker-php-ext-install
deleted file mode 100755
index d75d6d793..000000000
--- a/7.0/stretch/zts/docker-php-ext-install
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 [-jN] ext-name [ext-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop"
-	echo
-	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-j=1
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--jobs|-j) j="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-exts=
-for ext; do
-	if [ -z "$ext" ]; then
-		continue
-	fi
-	if [ ! -d "$ext" ]; then
-		echo >&2 "error: $PWD/$ext does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	exts="$exts $ext"
-done
-
-if [ -z "$exts" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if [ -n "$PHPIZE_DEPS" ]; then
-		if apk info --installed .phpize-deps-configure > /dev/null; then
-			apkDel='.phpize-deps-configure'
-		elif ! apk info --installed .phpize-deps > /dev/null; then
-			apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS
-			apkDel='.phpize-deps'
-		fi
-	fi
-fi
-
-popDir="$PWD"
-for ext in $exts; do
-	cd "$ext"
-	[ -e Makefile ] || docker-php-ext-configure "$ext"
-	make -j"$j"
-	make -j"$j" install
-	find modules \
-		-maxdepth 1 \
-		-name '*.so' \
-		-exec basename '{}' ';' \
-			| xargs -r docker-php-ext-enable
-	make -j"$j" clean
-	cd "$popDir"
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
-
-if [ -e /usr/src/php/.docker-delete-me ]; then
-	docker-php-source delete
-fi
diff --git a/7.0/stretch/zts/docker-php-source b/7.0/stretch/zts/docker-php-source
deleted file mode 100755
index 9033d243d..000000000
--- a/7.0/stretch/zts/docker-php-source
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-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 $dir if not already done."
-	echo "   delete   delete extracted php source located into $dir if not already done."
-	echo
-}
-
-case "$1" in
-	extract)
-		mkdir -p "$dir"
-		if [ ! -f "$dir/.docker-extracted" ]; then
-			tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
-			touch "$dir/.docker-extracted"
-		fi
-		;;
-
-	delete)
-		rm -rf "$dir"
-		;;
-
-	*)
-		usage
-		exit 1
-		;;
-esac
diff --git a/7.1/alpine3.8/zts/Dockerfile b/7.1/alpine3.8/zts/Dockerfile
deleted file mode 100644
index fa1027130..000000000
--- a/7.1/alpine3.8/zts/Dockerfile
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM alpine:3.8
-
-# dependencies required for running "phpize"
-# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
-ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev dpkg \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkgconf \
-		re2c
-
-# persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
-		ca-certificates \
-		curl \
-		tar \
-		xz \
-# https://github.com/docker-library/php/issues/494
-		libressl
-
-# ensure www-data user exists
-RUN set -x \
-	&& addgroup -g 82 -S www-data \
-	&& adduser -u 82 -D -S -G www-data www-data
-# 82 is the standard uid/gid for "www-data" in Alpine
-# http://git.alpinelinux.org/cgit/aports/tree/main/apache2/apache2.pre-install?h=v3.3.2
-# http://git.alpinelinux.org/cgit/aports/tree/main/lighttpd/lighttpd.pre-install?h=v3.3.2
-# http://git.alpinelinux.org/cgit/aports/tree/main/nginx-initscripts/nginx-initscripts.pre-install?h=v3.3.2
-
-ENV PHP_INI_DIR /usr/local/etc/php
-RUN mkdir -p $PHP_INI_DIR/conf.d
-
-##<autogenerated>##
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
-
-# Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
-# Enable optimization (-O2)
-# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
-# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
-# https://github.com/docker-library/php/issues/272
-ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
-ENV PHP_CPPFLAGS="$PHP_CFLAGS"
-ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
-
-ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 1729F83938DA44E27BA0F4D3DBDB397470D12172
-
-ENV PHP_VERSION 7.1.24
-ENV PHP_URL="https://secure.php.net/get/php-7.1.24.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.1.24.tar.xz.asc/from/this/mirror"
-ENV PHP_SHA256="e70dcec0ae28b6bc308b78972ec15aa850808819cc765f505aa51e5a7e2fa5d7" PHP_MD5=""
-
-RUN set -xe; \
-	\
-	apk add --no-cache --virtual .fetch-deps \
-		gnupg \
-		wget \
-	; \
-	\
-	mkdir -p /usr/src; \
-	cd /usr/src; \
-	\
-	wget -O php.tar.xz "$PHP_URL"; \
-	\
-	if [ -n "$PHP_SHA256" ]; then \
-		echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
-	fi; \
-	if [ -n "$PHP_MD5" ]; then \
-		echo "$PHP_MD5 *php.tar.xz" | md5sum -c -; \
-	fi; \
-	\
-	if [ -n "$PHP_ASC_URL" ]; then \
-		wget -O php.tar.xz.asc "$PHP_ASC_URL"; \
-		export GNUPGHOME="$(mktemp -d)"; \
-		for key in $GPG_KEYS; do \
-			gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-		done; \
-		gpg --batch --verify php.tar.xz.asc php.tar.xz; \
-		command -v gpgconf > /dev/null && gpgconf --kill all; \
-		rm -rf "$GNUPGHOME"; \
-	fi; \
-	\
-	apk del .fetch-deps
-
-COPY docker-php-source /usr/local/bin/
-
-RUN set -xe \
-	&& apk add --no-cache --virtual .build-deps \
-		$PHPIZE_DEPS \
-		coreutils \
-		curl-dev \
-		libedit-dev \
-		libressl-dev \
-		libxml2-dev \
-		sqlite-dev \
-	\
-	&& export CFLAGS="$PHP_CFLAGS" \
-		CPPFLAGS="$PHP_CPPFLAGS" \
-		LDFLAGS="$PHP_LDFLAGS" \
-	&& docker-php-source extract \
-	&& cd /usr/src/php \
-	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
-	&& ./configure \
-		--build="$gnuArch" \
-		--with-config-file-path="$PHP_INI_DIR" \
-		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
-		\
-# make sure invalid --configure-flags are fatal errors intead of just warnings
-		--enable-option-checking=fatal \
-		\
-# https://github.com/docker-library/php/issues/439
-		--with-mhash \
-		\
-# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
-		--enable-ftp \
-# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
-		--enable-mbstring \
-# --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 \
-		\
-		--with-curl \
-		--with-libedit \
-		--with-openssl \
-		--with-zlib \
-		\
-# bundled pcre does not support JIT on s390x
-# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
-		\
-		$PHP_EXTRA_CONFIGURE_ARGS \
-	&& make -j "$(nproc)" \
-	&& make install \
-	&& { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
-	&& make clean \
-	\
-# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
-	&& cp -v php.ini-* "$PHP_INI_DIR/" \
-	\
-	&& cd / \
-	&& docker-php-source delete \
-	\
-	&& runDeps="$( \
-		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
-			| tr ',' '\n' \
-			| sort -u \
-			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
-	\
-	&& apk del .build-deps \
-	\
-# https://github.com/docker-library/php/issues/443
-	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
-
-COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
-
-ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
-CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/7.1/alpine3.8/zts/docker-php-entrypoint b/7.1/alpine3.8/zts/docker-php-entrypoint
deleted file mode 100755
index 88a016c16..000000000
--- a/7.1/alpine3.8/zts/docker-php-entrypoint
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# first arg is `-f` or `--some-option`
-if [ "${1#-}" != "$1" ]; then
-	set -- php "$@"
-fi
-
-exec "$@"
diff --git a/7.1/alpine3.8/zts/docker-php-ext-configure b/7.1/alpine3.8/zts/docker-php-ext-configure
deleted file mode 100755
index 9e949e1e1..000000000
--- a/7.1/alpine3.8/zts/docker-php-ext-configure
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 ext-name [configure flags]"
-	echo "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-ext="$1"
-if [ -z "$ext" ] || [ ! -d "$ext" ]; then
-	usage >&2
-	exit 1
-fi
-shift
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual .phpize-deps-configure $PHPIZE_DEPS
-	fi
-fi
-
-if command -v dpkg-architecture > /dev/null; then
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"
-	set -- --build="$gnuArch" "$@"
-fi
-
-cd "$ext"
-phpize
-./configure "$@"
diff --git a/7.1/alpine3.8/zts/docker-php-ext-enable b/7.1/alpine3.8/zts/docker-php-ext-enable
deleted file mode 100755
index 2b067f039..000000000
--- a/7.1/alpine3.8/zts/docker-php-ext-enable
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-set -e
-
-extDir="$(php -r 'echo ini_get("extension_dir");')"
-cd "$extDir"
-
-usage() {
-	echo "usage: $0 [options] module-name [module-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 --ini-name 0-apc.ini apcu apc"
-	echo
-	echo 'Possible values for module-name:'
-	find -maxdepth 1 \
-			-type f \
-			-name '*.so' \
-			-exec basename '{}' ';' \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-iniName=
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--ini-name) iniName="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-modules=
-for module; do
-	if [ -z "$module" ]; then
-		continue
-	fi
-	if [ -f "$module.so" ] && ! [ -f "$module" ]; then
-		# allow ".so" to be optional
-		module="$module.so"
-	fi
-	if ! [ -f "$module" ]; then
-		echo >&2 "error: '$module' does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	modules="$modules $module"
-done
-
-if [ -z "$modules" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual '.docker-php-ext-enable-deps' binutils
-		apkDel='.docker-php-ext-enable-deps'
-	fi
-fi
-
-for module in $modules; do
-	if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
-		# https://wiki.php.net/internals/extensions#loading_zend_extensions
-		absModule="$(readlink -f "$module")"
-		line="zend_extension=$absModule"
-	else
-		line="extension=$module"
-	fi
-
-	ext="$(basename "$module")"
-	ext="${ext%.*}"
-	if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
-		# this isn't perfect, but it's better than nothing
-		# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
-		echo >&2
-		echo >&2 "warning: $ext ($module) is already loaded!"
-		echo >&2
-		continue
-	fi
-
-	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
-	if ! grep -q "$line" "$ini" 2>/dev/null; then
-		echo "$line" >> "$ini"
-	fi
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
diff --git a/7.1/alpine3.8/zts/docker-php-ext-install b/7.1/alpine3.8/zts/docker-php-ext-install
deleted file mode 100755
index d75d6d793..000000000
--- a/7.1/alpine3.8/zts/docker-php-ext-install
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 [-jN] ext-name [ext-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop"
-	echo
-	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-j=1
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--jobs|-j) j="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-exts=
-for ext; do
-	if [ -z "$ext" ]; then
-		continue
-	fi
-	if [ ! -d "$ext" ]; then
-		echo >&2 "error: $PWD/$ext does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	exts="$exts $ext"
-done
-
-if [ -z "$exts" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if [ -n "$PHPIZE_DEPS" ]; then
-		if apk info --installed .phpize-deps-configure > /dev/null; then
-			apkDel='.phpize-deps-configure'
-		elif ! apk info --installed .phpize-deps > /dev/null; then
-			apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS
-			apkDel='.phpize-deps'
-		fi
-	fi
-fi
-
-popDir="$PWD"
-for ext in $exts; do
-	cd "$ext"
-	[ -e Makefile ] || docker-php-ext-configure "$ext"
-	make -j"$j"
-	make -j"$j" install
-	find modules \
-		-maxdepth 1 \
-		-name '*.so' \
-		-exec basename '{}' ';' \
-			| xargs -r docker-php-ext-enable
-	make -j"$j" clean
-	cd "$popDir"
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
-
-if [ -e /usr/src/php/.docker-delete-me ]; then
-	docker-php-source delete
-fi
diff --git a/7.1/alpine3.8/zts/docker-php-source b/7.1/alpine3.8/zts/docker-php-source
deleted file mode 100755
index 9033d243d..000000000
--- a/7.1/alpine3.8/zts/docker-php-source
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-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 $dir if not already done."
-	echo "   delete   delete extracted php source located into $dir if not already done."
-	echo
-}
-
-case "$1" in
-	extract)
-		mkdir -p "$dir"
-		if [ ! -f "$dir/.docker-extracted" ]; then
-			tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
-			touch "$dir/.docker-extracted"
-		fi
-		;;
-
-	delete)
-		rm -rf "$dir"
-		;;
-
-	*)
-		usage
-		exit 1
-		;;
-esac
diff --git a/7.1/jessie/apache/Dockerfile b/7.1/jessie/apache/Dockerfile
index 614dbdafd..33dec37e7 100644
--- a/7.1/jessie/apache/Dockerfile
+++ b/7.1/jessie/apache/Dockerfile
@@ -100,7 +100,7 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
diff --git a/7.1/jessie/zts/Dockerfile b/7.1/jessie/zts/Dockerfile
deleted file mode 100644
index ead7865b4..000000000
--- a/7.1/jessie/zts/Dockerfile
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM debian:jessie
-
-# prevent Debian's PHP packages from being installed
-# https://github.com/docker-library/php/pull/542
-RUN set -eux; \
-	{ \
-		echo 'Package: php*'; \
-		echo 'Pin: release *'; \
-		echo 'Pin-Priority: -1'; \
-	} > /etc/apt/preferences.d/no-debian-php
-
-# dependencies required for running "phpize"
-# (see persistent deps below)
-ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkg-config \
-		re2c
-
-# persistent / runtime deps
-RUN apt-get update && apt-get install -y \
-		$PHPIZE_DEPS \
-		ca-certificates \
-		curl \
-		xz-utils \
-	--no-install-recommends && rm -r /var/lib/apt/lists/*
-
-ENV PHP_INI_DIR /usr/local/etc/php
-RUN mkdir -p $PHP_INI_DIR/conf.d
-
-##<autogenerated>##
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
-
-# Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
-# Enable optimization (-O2)
-# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
-# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
-# https://github.com/docker-library/php/issues/272
-ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
-ENV PHP_CPPFLAGS="$PHP_CFLAGS"
-ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
-
-ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 1729F83938DA44E27BA0F4D3DBDB397470D12172
-
-ENV PHP_VERSION 7.1.24
-ENV PHP_URL="https://secure.php.net/get/php-7.1.24.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.1.24.tar.xz.asc/from/this/mirror"
-ENV PHP_SHA256="e70dcec0ae28b6bc308b78972ec15aa850808819cc765f505aa51e5a7e2fa5d7" PHP_MD5=""
-
-RUN set -xe; \
-	\
-	fetchDeps=' \
-		wget \
-	'; \
-	if ! command -v gpg > /dev/null; then \
-		fetchDeps="$fetchDeps \
-			dirmngr \
-			gnupg \
-		"; \
-	fi; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends $fetchDeps; \
-	rm -rf /var/lib/apt/lists/*; \
-	\
-	mkdir -p /usr/src; \
-	cd /usr/src; \
-	\
-	wget -O php.tar.xz "$PHP_URL"; \
-	\
-	if [ -n "$PHP_SHA256" ]; then \
-		echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
-	fi; \
-	if [ -n "$PHP_MD5" ]; then \
-		echo "$PHP_MD5 *php.tar.xz" | md5sum -c -; \
-	fi; \
-	\
-	if [ -n "$PHP_ASC_URL" ]; then \
-		wget -O php.tar.xz.asc "$PHP_ASC_URL"; \
-		export GNUPGHOME="$(mktemp -d)"; \
-		for key in $GPG_KEYS; do \
-			gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-		done; \
-		gpg --batch --verify php.tar.xz.asc php.tar.xz; \
-		command -v gpgconf > /dev/null && gpgconf --kill all; \
-		rm -rf "$GNUPGHOME"; \
-	fi; \
-	\
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps
-
-COPY docker-php-source /usr/local/bin/
-
-RUN set -eux; \
-	\
-	savedAptMark="$(apt-mark showmanual)"; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		libcurl4-openssl-dev \
-		libedit-dev \
-		libsqlite3-dev \
-		libssl-dev \
-		libxml2-dev \
-		zlib1g-dev \
-		${PHP_EXTRA_BUILD_DEPS:-} \
-	; \
-	rm -rf /var/lib/apt/lists/*; \
-	\
-	export \
-		CFLAGS="$PHP_CFLAGS" \
-		CPPFLAGS="$PHP_CPPFLAGS" \
-		LDFLAGS="$PHP_LDFLAGS" \
-	; \
-	docker-php-source extract; \
-	cd /usr/src/php; \
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
-	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-# https://bugs.php.net/bug.php?id=74125
-	if [ ! -d /usr/include/curl ]; then \
-		ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
-	fi; \
-	./configure \
-		--build="$gnuArch" \
-		--with-config-file-path="$PHP_INI_DIR" \
-		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
-		\
-# make sure invalid --configure-flags are fatal errors intead of just warnings
-		--enable-option-checking=fatal \
-		\
-# https://github.com/docker-library/php/issues/439
-		--with-mhash \
-		\
-# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
-		--enable-ftp \
-# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
-		--enable-mbstring \
-# --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 \
-		\
-		--with-curl \
-		--with-libedit \
-		--with-openssl \
-		--with-zlib \
-		\
-# bundled pcre does not support JIT on s390x
-# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
-		--with-libdir="lib/$debMultiarch" \
-		\
-		${PHP_EXTRA_CONFIGURE_ARGS:-} \
-	; \
-	make -j "$(nproc)"; \
-	make install; \
-	find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \
-	make clean; \
-	\
-# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
-	cp -v php.ini-* "$PHP_INI_DIR/"; \
-	\
-	cd /; \
-	docker-php-source delete; \
-	\
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-	apt-mark auto '.*' > /dev/null; \
-	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
-	find /usr/local -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { print $(NF-1) }' \
-		| sort -u \
-		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
-		| sort -u \
-		| xargs -r apt-mark manual \
-	; \
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
-	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
-
-COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
-
-ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
-CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/7.1/jessie/zts/docker-php-entrypoint b/7.1/jessie/zts/docker-php-entrypoint
deleted file mode 100755
index 88a016c16..000000000
--- a/7.1/jessie/zts/docker-php-entrypoint
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# first arg is `-f` or `--some-option`
-if [ "${1#-}" != "$1" ]; then
-	set -- php "$@"
-fi
-
-exec "$@"
diff --git a/7.1/jessie/zts/docker-php-ext-configure b/7.1/jessie/zts/docker-php-ext-configure
deleted file mode 100755
index 9e949e1e1..000000000
--- a/7.1/jessie/zts/docker-php-ext-configure
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 ext-name [configure flags]"
-	echo "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-ext="$1"
-if [ -z "$ext" ] || [ ! -d "$ext" ]; then
-	usage >&2
-	exit 1
-fi
-shift
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual .phpize-deps-configure $PHPIZE_DEPS
-	fi
-fi
-
-if command -v dpkg-architecture > /dev/null; then
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"
-	set -- --build="$gnuArch" "$@"
-fi
-
-cd "$ext"
-phpize
-./configure "$@"
diff --git a/7.1/jessie/zts/docker-php-ext-enable b/7.1/jessie/zts/docker-php-ext-enable
deleted file mode 100755
index 2b067f039..000000000
--- a/7.1/jessie/zts/docker-php-ext-enable
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-set -e
-
-extDir="$(php -r 'echo ini_get("extension_dir");')"
-cd "$extDir"
-
-usage() {
-	echo "usage: $0 [options] module-name [module-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 --ini-name 0-apc.ini apcu apc"
-	echo
-	echo 'Possible values for module-name:'
-	find -maxdepth 1 \
-			-type f \
-			-name '*.so' \
-			-exec basename '{}' ';' \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-iniName=
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--ini-name) iniName="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-modules=
-for module; do
-	if [ -z "$module" ]; then
-		continue
-	fi
-	if [ -f "$module.so" ] && ! [ -f "$module" ]; then
-		# allow ".so" to be optional
-		module="$module.so"
-	fi
-	if ! [ -f "$module" ]; then
-		echo >&2 "error: '$module' does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	modules="$modules $module"
-done
-
-if [ -z "$modules" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual '.docker-php-ext-enable-deps' binutils
-		apkDel='.docker-php-ext-enable-deps'
-	fi
-fi
-
-for module in $modules; do
-	if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
-		# https://wiki.php.net/internals/extensions#loading_zend_extensions
-		absModule="$(readlink -f "$module")"
-		line="zend_extension=$absModule"
-	else
-		line="extension=$module"
-	fi
-
-	ext="$(basename "$module")"
-	ext="${ext%.*}"
-	if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
-		# this isn't perfect, but it's better than nothing
-		# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
-		echo >&2
-		echo >&2 "warning: $ext ($module) is already loaded!"
-		echo >&2
-		continue
-	fi
-
-	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
-	if ! grep -q "$line" "$ini" 2>/dev/null; then
-		echo "$line" >> "$ini"
-	fi
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
diff --git a/7.1/jessie/zts/docker-php-ext-install b/7.1/jessie/zts/docker-php-ext-install
deleted file mode 100755
index d75d6d793..000000000
--- a/7.1/jessie/zts/docker-php-ext-install
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 [-jN] ext-name [ext-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop"
-	echo
-	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-j=1
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--jobs|-j) j="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-exts=
-for ext; do
-	if [ -z "$ext" ]; then
-		continue
-	fi
-	if [ ! -d "$ext" ]; then
-		echo >&2 "error: $PWD/$ext does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	exts="$exts $ext"
-done
-
-if [ -z "$exts" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if [ -n "$PHPIZE_DEPS" ]; then
-		if apk info --installed .phpize-deps-configure > /dev/null; then
-			apkDel='.phpize-deps-configure'
-		elif ! apk info --installed .phpize-deps > /dev/null; then
-			apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS
-			apkDel='.phpize-deps'
-		fi
-	fi
-fi
-
-popDir="$PWD"
-for ext in $exts; do
-	cd "$ext"
-	[ -e Makefile ] || docker-php-ext-configure "$ext"
-	make -j"$j"
-	make -j"$j" install
-	find modules \
-		-maxdepth 1 \
-		-name '*.so' \
-		-exec basename '{}' ';' \
-			| xargs -r docker-php-ext-enable
-	make -j"$j" clean
-	cd "$popDir"
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
-
-if [ -e /usr/src/php/.docker-delete-me ]; then
-	docker-php-source delete
-fi
diff --git a/7.1/jessie/zts/docker-php-source b/7.1/jessie/zts/docker-php-source
deleted file mode 100755
index 9033d243d..000000000
--- a/7.1/jessie/zts/docker-php-source
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-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 $dir if not already done."
-	echo "   delete   delete extracted php source located into $dir if not already done."
-	echo
-}
-
-case "$1" in
-	extract)
-		mkdir -p "$dir"
-		if [ ! -f "$dir/.docker-extracted" ]; then
-			tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
-			touch "$dir/.docker-extracted"
-		fi
-		;;
-
-	delete)
-		rm -rf "$dir"
-		;;
-
-	*)
-		usage
-		exit 1
-		;;
-esac
diff --git a/7.1/stretch/apache/Dockerfile b/7.1/stretch/apache/Dockerfile
index f9cbf8556..dff78487e 100644
--- a/7.1/stretch/apache/Dockerfile
+++ b/7.1/stretch/apache/Dockerfile
@@ -100,7 +100,7 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
diff --git a/7.1/stretch/zts/Dockerfile b/7.1/stretch/zts/Dockerfile
deleted file mode 100644
index d006ad34f..000000000
--- a/7.1/stretch/zts/Dockerfile
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM debian:stretch-slim
-
-# prevent Debian's PHP packages from being installed
-# https://github.com/docker-library/php/pull/542
-RUN set -eux; \
-	{ \
-		echo 'Package: php*'; \
-		echo 'Pin: release *'; \
-		echo 'Pin-Priority: -1'; \
-	} > /etc/apt/preferences.d/no-debian-php
-
-# dependencies required for running "phpize"
-# (see persistent deps below)
-ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkg-config \
-		re2c
-
-# persistent / runtime deps
-RUN apt-get update && apt-get install -y \
-		$PHPIZE_DEPS \
-		ca-certificates \
-		curl \
-		xz-utils \
-	--no-install-recommends && rm -r /var/lib/apt/lists/*
-
-ENV PHP_INI_DIR /usr/local/etc/php
-RUN mkdir -p $PHP_INI_DIR/conf.d
-
-##<autogenerated>##
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
-
-# Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
-# Enable optimization (-O2)
-# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
-# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
-# https://github.com/docker-library/php/issues/272
-ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
-ENV PHP_CPPFLAGS="$PHP_CFLAGS"
-ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
-
-ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 1729F83938DA44E27BA0F4D3DBDB397470D12172
-
-ENV PHP_VERSION 7.1.24
-ENV PHP_URL="https://secure.php.net/get/php-7.1.24.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.1.24.tar.xz.asc/from/this/mirror"
-ENV PHP_SHA256="e70dcec0ae28b6bc308b78972ec15aa850808819cc765f505aa51e5a7e2fa5d7" PHP_MD5=""
-
-RUN set -xe; \
-	\
-	fetchDeps=' \
-		wget \
-	'; \
-	if ! command -v gpg > /dev/null; then \
-		fetchDeps="$fetchDeps \
-			dirmngr \
-			gnupg \
-		"; \
-	fi; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends $fetchDeps; \
-	rm -rf /var/lib/apt/lists/*; \
-	\
-	mkdir -p /usr/src; \
-	cd /usr/src; \
-	\
-	wget -O php.tar.xz "$PHP_URL"; \
-	\
-	if [ -n "$PHP_SHA256" ]; then \
-		echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
-	fi; \
-	if [ -n "$PHP_MD5" ]; then \
-		echo "$PHP_MD5 *php.tar.xz" | md5sum -c -; \
-	fi; \
-	\
-	if [ -n "$PHP_ASC_URL" ]; then \
-		wget -O php.tar.xz.asc "$PHP_ASC_URL"; \
-		export GNUPGHOME="$(mktemp -d)"; \
-		for key in $GPG_KEYS; do \
-			gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-		done; \
-		gpg --batch --verify php.tar.xz.asc php.tar.xz; \
-		command -v gpgconf > /dev/null && gpgconf --kill all; \
-		rm -rf "$GNUPGHOME"; \
-	fi; \
-	\
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps
-
-COPY docker-php-source /usr/local/bin/
-
-RUN set -eux; \
-	\
-	savedAptMark="$(apt-mark showmanual)"; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		libcurl4-openssl-dev \
-		libedit-dev \
-		libsqlite3-dev \
-		libssl-dev \
-		libxml2-dev \
-		zlib1g-dev \
-		${PHP_EXTRA_BUILD_DEPS:-} \
-	; \
-	rm -rf /var/lib/apt/lists/*; \
-	\
-	export \
-		CFLAGS="$PHP_CFLAGS" \
-		CPPFLAGS="$PHP_CPPFLAGS" \
-		LDFLAGS="$PHP_LDFLAGS" \
-	; \
-	docker-php-source extract; \
-	cd /usr/src/php; \
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
-	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-# https://bugs.php.net/bug.php?id=74125
-	if [ ! -d /usr/include/curl ]; then \
-		ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
-	fi; \
-	./configure \
-		--build="$gnuArch" \
-		--with-config-file-path="$PHP_INI_DIR" \
-		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
-		\
-# make sure invalid --configure-flags are fatal errors intead of just warnings
-		--enable-option-checking=fatal \
-		\
-# https://github.com/docker-library/php/issues/439
-		--with-mhash \
-		\
-# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
-		--enable-ftp \
-# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
-		--enable-mbstring \
-# --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 \
-		\
-		--with-curl \
-		--with-libedit \
-		--with-openssl \
-		--with-zlib \
-		\
-# bundled pcre does not support JIT on s390x
-# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
-		--with-libdir="lib/$debMultiarch" \
-		\
-		${PHP_EXTRA_CONFIGURE_ARGS:-} \
-	; \
-	make -j "$(nproc)"; \
-	make install; \
-	find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \
-	make clean; \
-	\
-# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
-	cp -v php.ini-* "$PHP_INI_DIR/"; \
-	\
-	cd /; \
-	docker-php-source delete; \
-	\
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-	apt-mark auto '.*' > /dev/null; \
-	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
-	find /usr/local -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { print $(NF-1) }' \
-		| sort -u \
-		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
-		| sort -u \
-		| xargs -r apt-mark manual \
-	; \
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
-	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
-
-COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
-
-ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
-CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/7.1/stretch/zts/docker-php-entrypoint b/7.1/stretch/zts/docker-php-entrypoint
deleted file mode 100755
index 88a016c16..000000000
--- a/7.1/stretch/zts/docker-php-entrypoint
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# first arg is `-f` or `--some-option`
-if [ "${1#-}" != "$1" ]; then
-	set -- php "$@"
-fi
-
-exec "$@"
diff --git a/7.1/stretch/zts/docker-php-ext-configure b/7.1/stretch/zts/docker-php-ext-configure
deleted file mode 100755
index 9e949e1e1..000000000
--- a/7.1/stretch/zts/docker-php-ext-configure
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 ext-name [configure flags]"
-	echo "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-ext="$1"
-if [ -z "$ext" ] || [ ! -d "$ext" ]; then
-	usage >&2
-	exit 1
-fi
-shift
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual .phpize-deps-configure $PHPIZE_DEPS
-	fi
-fi
-
-if command -v dpkg-architecture > /dev/null; then
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"
-	set -- --build="$gnuArch" "$@"
-fi
-
-cd "$ext"
-phpize
-./configure "$@"
diff --git a/7.1/stretch/zts/docker-php-ext-enable b/7.1/stretch/zts/docker-php-ext-enable
deleted file mode 100755
index 2b067f039..000000000
--- a/7.1/stretch/zts/docker-php-ext-enable
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-set -e
-
-extDir="$(php -r 'echo ini_get("extension_dir");')"
-cd "$extDir"
-
-usage() {
-	echo "usage: $0 [options] module-name [module-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 --ini-name 0-apc.ini apcu apc"
-	echo
-	echo 'Possible values for module-name:'
-	find -maxdepth 1 \
-			-type f \
-			-name '*.so' \
-			-exec basename '{}' ';' \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-iniName=
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--ini-name) iniName="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-modules=
-for module; do
-	if [ -z "$module" ]; then
-		continue
-	fi
-	if [ -f "$module.so" ] && ! [ -f "$module" ]; then
-		# allow ".so" to be optional
-		module="$module.so"
-	fi
-	if ! [ -f "$module" ]; then
-		echo >&2 "error: '$module' does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	modules="$modules $module"
-done
-
-if [ -z "$modules" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual '.docker-php-ext-enable-deps' binutils
-		apkDel='.docker-php-ext-enable-deps'
-	fi
-fi
-
-for module in $modules; do
-	if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
-		# https://wiki.php.net/internals/extensions#loading_zend_extensions
-		absModule="$(readlink -f "$module")"
-		line="zend_extension=$absModule"
-	else
-		line="extension=$module"
-	fi
-
-	ext="$(basename "$module")"
-	ext="${ext%.*}"
-	if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
-		# this isn't perfect, but it's better than nothing
-		# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
-		echo >&2
-		echo >&2 "warning: $ext ($module) is already loaded!"
-		echo >&2
-		continue
-	fi
-
-	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
-	if ! grep -q "$line" "$ini" 2>/dev/null; then
-		echo "$line" >> "$ini"
-	fi
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
diff --git a/7.1/stretch/zts/docker-php-ext-install b/7.1/stretch/zts/docker-php-ext-install
deleted file mode 100755
index d75d6d793..000000000
--- a/7.1/stretch/zts/docker-php-ext-install
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 [-jN] ext-name [ext-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop"
-	echo
-	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-j=1
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--jobs|-j) j="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-exts=
-for ext; do
-	if [ -z "$ext" ]; then
-		continue
-	fi
-	if [ ! -d "$ext" ]; then
-		echo >&2 "error: $PWD/$ext does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	exts="$exts $ext"
-done
-
-if [ -z "$exts" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if [ -n "$PHPIZE_DEPS" ]; then
-		if apk info --installed .phpize-deps-configure > /dev/null; then
-			apkDel='.phpize-deps-configure'
-		elif ! apk info --installed .phpize-deps > /dev/null; then
-			apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS
-			apkDel='.phpize-deps'
-		fi
-	fi
-fi
-
-popDir="$PWD"
-for ext in $exts; do
-	cd "$ext"
-	[ -e Makefile ] || docker-php-ext-configure "$ext"
-	make -j"$j"
-	make -j"$j" install
-	find modules \
-		-maxdepth 1 \
-		-name '*.so' \
-		-exec basename '{}' ';' \
-			| xargs -r docker-php-ext-enable
-	make -j"$j" clean
-	cd "$popDir"
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
-
-if [ -e /usr/src/php/.docker-delete-me ]; then
-	docker-php-source delete
-fi
diff --git a/7.1/stretch/zts/docker-php-source b/7.1/stretch/zts/docker-php-source
deleted file mode 100755
index 9033d243d..000000000
--- a/7.1/stretch/zts/docker-php-source
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-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 $dir if not already done."
-	echo "   delete   delete extracted php source located into $dir if not already done."
-	echo
-}
-
-case "$1" in
-	extract)
-		mkdir -p "$dir"
-		if [ ! -f "$dir/.docker-extracted" ]; then
-			tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
-			touch "$dir/.docker-extracted"
-		fi
-		;;
-
-	delete)
-		rm -rf "$dir"
-		;;
-
-	*)
-		usage
-		exit 1
-		;;
-esac
diff --git a/7.2/alpine3.8/zts/Dockerfile b/7.2/alpine3.8/zts/Dockerfile
deleted file mode 100644
index 333efe4b9..000000000
--- a/7.2/alpine3.8/zts/Dockerfile
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM alpine:3.8
-
-# dependencies required for running "phpize"
-# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
-ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev dpkg \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkgconf \
-		re2c
-
-# persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
-		ca-certificates \
-		curl \
-		tar \
-		xz \
-# https://github.com/docker-library/php/issues/494
-		libressl
-
-# ensure www-data user exists
-RUN set -x \
-	&& addgroup -g 82 -S www-data \
-	&& adduser -u 82 -D -S -G www-data www-data
-# 82 is the standard uid/gid for "www-data" in Alpine
-# http://git.alpinelinux.org/cgit/aports/tree/main/apache2/apache2.pre-install?h=v3.3.2
-# http://git.alpinelinux.org/cgit/aports/tree/main/lighttpd/lighttpd.pre-install?h=v3.3.2
-# http://git.alpinelinux.org/cgit/aports/tree/main/nginx-initscripts/nginx-initscripts.pre-install?h=v3.3.2
-
-ENV PHP_INI_DIR /usr/local/etc/php
-RUN mkdir -p $PHP_INI_DIR/conf.d
-
-##<autogenerated>##
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
-
-# Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
-# Enable optimization (-O2)
-# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
-# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
-# https://github.com/docker-library/php/issues/272
-ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
-ENV PHP_CPPFLAGS="$PHP_CFLAGS"
-ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
-
-ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
-
-ENV PHP_VERSION 7.2.12
-ENV PHP_URL="https://secure.php.net/get/php-7.2.12.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.2.12.tar.xz.asc/from/this/mirror"
-ENV PHP_SHA256="989c04cc879ee71a5e1131db867f3c5102f1f7565f805e2bb8bde33f93147fe1" PHP_MD5=""
-
-RUN set -xe; \
-	\
-	apk add --no-cache --virtual .fetch-deps \
-		gnupg \
-		wget \
-	; \
-	\
-	mkdir -p /usr/src; \
-	cd /usr/src; \
-	\
-	wget -O php.tar.xz "$PHP_URL"; \
-	\
-	if [ -n "$PHP_SHA256" ]; then \
-		echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
-	fi; \
-	if [ -n "$PHP_MD5" ]; then \
-		echo "$PHP_MD5 *php.tar.xz" | md5sum -c -; \
-	fi; \
-	\
-	if [ -n "$PHP_ASC_URL" ]; then \
-		wget -O php.tar.xz.asc "$PHP_ASC_URL"; \
-		export GNUPGHOME="$(mktemp -d)"; \
-		for key in $GPG_KEYS; do \
-			gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-		done; \
-		gpg --batch --verify php.tar.xz.asc php.tar.xz; \
-		command -v gpgconf > /dev/null && gpgconf --kill all; \
-		rm -rf "$GNUPGHOME"; \
-	fi; \
-	\
-	apk del .fetch-deps
-
-COPY docker-php-source /usr/local/bin/
-
-RUN set -xe \
-	&& apk add --no-cache --virtual .build-deps \
-		$PHPIZE_DEPS \
-		argon2-dev \
-		coreutils \
-		curl-dev \
-		libedit-dev \
-		libressl-dev \
-		libsodium-dev \
-		libxml2-dev \
-		sqlite-dev \
-	\
-	&& export CFLAGS="$PHP_CFLAGS" \
-		CPPFLAGS="$PHP_CPPFLAGS" \
-		LDFLAGS="$PHP_LDFLAGS" \
-	&& docker-php-source extract \
-	&& cd /usr/src/php \
-	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
-	&& ./configure \
-		--build="$gnuArch" \
-		--with-config-file-path="$PHP_INI_DIR" \
-		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
-		\
-# make sure invalid --configure-flags are fatal errors intead of just warnings
-		--enable-option-checking=fatal \
-		\
-# https://github.com/docker-library/php/issues/439
-		--with-mhash \
-		\
-# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
-		--enable-ftp \
-# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
-		--enable-mbstring \
-# --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 \
-# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
-		--with-password-argon2 \
-# https://wiki.php.net/rfc/libsodium
-		--with-sodium=shared \
-		\
-		--with-curl \
-		--with-libedit \
-		--with-openssl \
-		--with-zlib \
-		\
-# bundled pcre does not support JIT on s390x
-# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
-		\
-		$PHP_EXTRA_CONFIGURE_ARGS \
-	&& make -j "$(nproc)" \
-	&& make install \
-	&& { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
-	&& make clean \
-	\
-# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
-	&& cp -v php.ini-* "$PHP_INI_DIR/" \
-	\
-	&& cd / \
-	&& docker-php-source delete \
-	\
-	&& runDeps="$( \
-		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
-			| tr ',' '\n' \
-			| sort -u \
-			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
-	\
-	&& apk del .build-deps \
-	\
-# https://github.com/docker-library/php/issues/443
-	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
-
-COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
-
-# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
-RUN docker-php-ext-enable sodium
-
-ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
-CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/7.2/alpine3.8/zts/docker-php-entrypoint b/7.2/alpine3.8/zts/docker-php-entrypoint
deleted file mode 100755
index 88a016c16..000000000
--- a/7.2/alpine3.8/zts/docker-php-entrypoint
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# first arg is `-f` or `--some-option`
-if [ "${1#-}" != "$1" ]; then
-	set -- php "$@"
-fi
-
-exec "$@"
diff --git a/7.2/alpine3.8/zts/docker-php-ext-configure b/7.2/alpine3.8/zts/docker-php-ext-configure
deleted file mode 100755
index 9e949e1e1..000000000
--- a/7.2/alpine3.8/zts/docker-php-ext-configure
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 ext-name [configure flags]"
-	echo "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-ext="$1"
-if [ -z "$ext" ] || [ ! -d "$ext" ]; then
-	usage >&2
-	exit 1
-fi
-shift
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual .phpize-deps-configure $PHPIZE_DEPS
-	fi
-fi
-
-if command -v dpkg-architecture > /dev/null; then
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"
-	set -- --build="$gnuArch" "$@"
-fi
-
-cd "$ext"
-phpize
-./configure "$@"
diff --git a/7.2/alpine3.8/zts/docker-php-ext-enable b/7.2/alpine3.8/zts/docker-php-ext-enable
deleted file mode 100755
index 2b067f039..000000000
--- a/7.2/alpine3.8/zts/docker-php-ext-enable
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-set -e
-
-extDir="$(php -r 'echo ini_get("extension_dir");')"
-cd "$extDir"
-
-usage() {
-	echo "usage: $0 [options] module-name [module-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 --ini-name 0-apc.ini apcu apc"
-	echo
-	echo 'Possible values for module-name:'
-	find -maxdepth 1 \
-			-type f \
-			-name '*.so' \
-			-exec basename '{}' ';' \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-iniName=
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--ini-name) iniName="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-modules=
-for module; do
-	if [ -z "$module" ]; then
-		continue
-	fi
-	if [ -f "$module.so" ] && ! [ -f "$module" ]; then
-		# allow ".so" to be optional
-		module="$module.so"
-	fi
-	if ! [ -f "$module" ]; then
-		echo >&2 "error: '$module' does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	modules="$modules $module"
-done
-
-if [ -z "$modules" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual '.docker-php-ext-enable-deps' binutils
-		apkDel='.docker-php-ext-enable-deps'
-	fi
-fi
-
-for module in $modules; do
-	if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
-		# https://wiki.php.net/internals/extensions#loading_zend_extensions
-		absModule="$(readlink -f "$module")"
-		line="zend_extension=$absModule"
-	else
-		line="extension=$module"
-	fi
-
-	ext="$(basename "$module")"
-	ext="${ext%.*}"
-	if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
-		# this isn't perfect, but it's better than nothing
-		# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
-		echo >&2
-		echo >&2 "warning: $ext ($module) is already loaded!"
-		echo >&2
-		continue
-	fi
-
-	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
-	if ! grep -q "$line" "$ini" 2>/dev/null; then
-		echo "$line" >> "$ini"
-	fi
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
diff --git a/7.2/alpine3.8/zts/docker-php-ext-install b/7.2/alpine3.8/zts/docker-php-ext-install
deleted file mode 100755
index d75d6d793..000000000
--- a/7.2/alpine3.8/zts/docker-php-ext-install
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 [-jN] ext-name [ext-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop"
-	echo
-	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-j=1
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--jobs|-j) j="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-exts=
-for ext; do
-	if [ -z "$ext" ]; then
-		continue
-	fi
-	if [ ! -d "$ext" ]; then
-		echo >&2 "error: $PWD/$ext does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	exts="$exts $ext"
-done
-
-if [ -z "$exts" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if [ -n "$PHPIZE_DEPS" ]; then
-		if apk info --installed .phpize-deps-configure > /dev/null; then
-			apkDel='.phpize-deps-configure'
-		elif ! apk info --installed .phpize-deps > /dev/null; then
-			apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS
-			apkDel='.phpize-deps'
-		fi
-	fi
-fi
-
-popDir="$PWD"
-for ext in $exts; do
-	cd "$ext"
-	[ -e Makefile ] || docker-php-ext-configure "$ext"
-	make -j"$j"
-	make -j"$j" install
-	find modules \
-		-maxdepth 1 \
-		-name '*.so' \
-		-exec basename '{}' ';' \
-			| xargs -r docker-php-ext-enable
-	make -j"$j" clean
-	cd "$popDir"
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
-
-if [ -e /usr/src/php/.docker-delete-me ]; then
-	docker-php-source delete
-fi
diff --git a/7.2/alpine3.8/zts/docker-php-source b/7.2/alpine3.8/zts/docker-php-source
deleted file mode 100755
index 9033d243d..000000000
--- a/7.2/alpine3.8/zts/docker-php-source
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-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 $dir if not already done."
-	echo "   delete   delete extracted php source located into $dir if not already done."
-	echo
-}
-
-case "$1" in
-	extract)
-		mkdir -p "$dir"
-		if [ ! -f "$dir/.docker-extracted" ]; then
-			tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
-			touch "$dir/.docker-extracted"
-		fi
-		;;
-
-	delete)
-		rm -rf "$dir"
-		;;
-
-	*)
-		usage
-		exit 1
-		;;
-esac
diff --git a/7.2/stretch/apache/Dockerfile b/7.2/stretch/apache/Dockerfile
index de86cf395..490246863 100644
--- a/7.2/stretch/apache/Dockerfile
+++ b/7.2/stretch/apache/Dockerfile
@@ -100,7 +100,7 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
diff --git a/7.2/stretch/zts/Dockerfile b/7.2/stretch/zts/Dockerfile
deleted file mode 100644
index d2d12dd72..000000000
--- a/7.2/stretch/zts/Dockerfile
+++ /dev/null
@@ -1,219 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM debian:stretch-slim
-
-# prevent Debian's PHP packages from being installed
-# https://github.com/docker-library/php/pull/542
-RUN set -eux; \
-	{ \
-		echo 'Package: php*'; \
-		echo 'Pin: release *'; \
-		echo 'Pin-Priority: -1'; \
-	} > /etc/apt/preferences.d/no-debian-php
-
-# dependencies required for running "phpize"
-# (see persistent deps below)
-ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkg-config \
-		re2c
-
-# persistent / runtime deps
-RUN apt-get update && apt-get install -y \
-		$PHPIZE_DEPS \
-		ca-certificates \
-		curl \
-		xz-utils \
-	--no-install-recommends && rm -r /var/lib/apt/lists/*
-
-ENV PHP_INI_DIR /usr/local/etc/php
-RUN mkdir -p $PHP_INI_DIR/conf.d
-
-##<autogenerated>##
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
-
-# Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
-# Enable optimization (-O2)
-# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
-# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
-# https://github.com/docker-library/php/issues/272
-ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
-ENV PHP_CPPFLAGS="$PHP_CFLAGS"
-ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
-
-ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
-
-ENV PHP_VERSION 7.2.12
-ENV PHP_URL="https://secure.php.net/get/php-7.2.12.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.2.12.tar.xz.asc/from/this/mirror"
-ENV PHP_SHA256="989c04cc879ee71a5e1131db867f3c5102f1f7565f805e2bb8bde33f93147fe1" PHP_MD5=""
-
-RUN set -xe; \
-	\
-	fetchDeps=' \
-		wget \
-	'; \
-	if ! command -v gpg > /dev/null; then \
-		fetchDeps="$fetchDeps \
-			dirmngr \
-			gnupg \
-		"; \
-	fi; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends $fetchDeps; \
-	rm -rf /var/lib/apt/lists/*; \
-	\
-	mkdir -p /usr/src; \
-	cd /usr/src; \
-	\
-	wget -O php.tar.xz "$PHP_URL"; \
-	\
-	if [ -n "$PHP_SHA256" ]; then \
-		echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
-	fi; \
-	if [ -n "$PHP_MD5" ]; then \
-		echo "$PHP_MD5 *php.tar.xz" | md5sum -c -; \
-	fi; \
-	\
-	if [ -n "$PHP_ASC_URL" ]; then \
-		wget -O php.tar.xz.asc "$PHP_ASC_URL"; \
-		export GNUPGHOME="$(mktemp -d)"; \
-		for key in $GPG_KEYS; do \
-			gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-		done; \
-		gpg --batch --verify php.tar.xz.asc php.tar.xz; \
-		command -v gpgconf > /dev/null && gpgconf --kill all; \
-		rm -rf "$GNUPGHOME"; \
-	fi; \
-	\
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps
-
-COPY docker-php-source /usr/local/bin/
-
-RUN set -eux; \
-	\
-	savedAptMark="$(apt-mark showmanual)"; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		libcurl4-openssl-dev \
-		libedit-dev \
-		libsodium-dev \
-		libsqlite3-dev \
-		libssl-dev \
-		libxml2-dev \
-		zlib1g-dev \
-		${PHP_EXTRA_BUILD_DEPS:-} \
-	; \
-##<argon2>##
-	sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
-	{ \
-		echo 'Package: *'; \
-		echo 'Pin: release n=buster'; \
-		echo 'Pin-Priority: -10'; \
-		echo; \
-		echo 'Package: libargon2*'; \
-		echo 'Pin: release n=buster'; \
-		echo 'Pin-Priority: 990'; \
-	} > /etc/apt/preferences.d/argon2-buster; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends libargon2-dev; \
-##</argon2>##
-	rm -rf /var/lib/apt/lists/*; \
-	\
-	export \
-		CFLAGS="$PHP_CFLAGS" \
-		CPPFLAGS="$PHP_CPPFLAGS" \
-		LDFLAGS="$PHP_LDFLAGS" \
-	; \
-	docker-php-source extract; \
-	cd /usr/src/php; \
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
-	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-# https://bugs.php.net/bug.php?id=74125
-	if [ ! -d /usr/include/curl ]; then \
-		ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
-	fi; \
-	./configure \
-		--build="$gnuArch" \
-		--with-config-file-path="$PHP_INI_DIR" \
-		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
-		\
-# make sure invalid --configure-flags are fatal errors intead of just warnings
-		--enable-option-checking=fatal \
-		\
-# https://github.com/docker-library/php/issues/439
-		--with-mhash \
-		\
-# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
-		--enable-ftp \
-# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
-		--enable-mbstring \
-# --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 \
-# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
-		--with-password-argon2 \
-# https://wiki.php.net/rfc/libsodium
-		--with-sodium=shared \
-		\
-		--with-curl \
-		--with-libedit \
-		--with-openssl \
-		--with-zlib \
-		\
-# bundled pcre does not support JIT on s390x
-# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
-		--with-libdir="lib/$debMultiarch" \
-		\
-		${PHP_EXTRA_CONFIGURE_ARGS:-} \
-	; \
-	make -j "$(nproc)"; \
-	make install; \
-	find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \
-	make clean; \
-	\
-# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
-	cp -v php.ini-* "$PHP_INI_DIR/"; \
-	\
-	cd /; \
-	docker-php-source delete; \
-	\
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-	apt-mark auto '.*' > /dev/null; \
-	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
-	find /usr/local -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { print $(NF-1) }' \
-		| sort -u \
-		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
-		| sort -u \
-		| xargs -r apt-mark manual \
-	; \
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
-	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
-
-COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
-
-# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
-RUN docker-php-ext-enable sodium
-
-ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
-CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/7.2/stretch/zts/docker-php-entrypoint b/7.2/stretch/zts/docker-php-entrypoint
deleted file mode 100755
index 88a016c16..000000000
--- a/7.2/stretch/zts/docker-php-entrypoint
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# first arg is `-f` or `--some-option`
-if [ "${1#-}" != "$1" ]; then
-	set -- php "$@"
-fi
-
-exec "$@"
diff --git a/7.2/stretch/zts/docker-php-ext-configure b/7.2/stretch/zts/docker-php-ext-configure
deleted file mode 100755
index 9e949e1e1..000000000
--- a/7.2/stretch/zts/docker-php-ext-configure
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 ext-name [configure flags]"
-	echo "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-ext="$1"
-if [ -z "$ext" ] || [ ! -d "$ext" ]; then
-	usage >&2
-	exit 1
-fi
-shift
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual .phpize-deps-configure $PHPIZE_DEPS
-	fi
-fi
-
-if command -v dpkg-architecture > /dev/null; then
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"
-	set -- --build="$gnuArch" "$@"
-fi
-
-cd "$ext"
-phpize
-./configure "$@"
diff --git a/7.2/stretch/zts/docker-php-ext-enable b/7.2/stretch/zts/docker-php-ext-enable
deleted file mode 100755
index 2b067f039..000000000
--- a/7.2/stretch/zts/docker-php-ext-enable
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-set -e
-
-extDir="$(php -r 'echo ini_get("extension_dir");')"
-cd "$extDir"
-
-usage() {
-	echo "usage: $0 [options] module-name [module-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 --ini-name 0-apc.ini apcu apc"
-	echo
-	echo 'Possible values for module-name:'
-	find -maxdepth 1 \
-			-type f \
-			-name '*.so' \
-			-exec basename '{}' ';' \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-iniName=
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--ini-name) iniName="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-modules=
-for module; do
-	if [ -z "$module" ]; then
-		continue
-	fi
-	if [ -f "$module.so" ] && ! [ -f "$module" ]; then
-		# allow ".so" to be optional
-		module="$module.so"
-	fi
-	if ! [ -f "$module" ]; then
-		echo >&2 "error: '$module' does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	modules="$modules $module"
-done
-
-if [ -z "$modules" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual '.docker-php-ext-enable-deps' binutils
-		apkDel='.docker-php-ext-enable-deps'
-	fi
-fi
-
-for module in $modules; do
-	if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
-		# https://wiki.php.net/internals/extensions#loading_zend_extensions
-		absModule="$(readlink -f "$module")"
-		line="zend_extension=$absModule"
-	else
-		line="extension=$module"
-	fi
-
-	ext="$(basename "$module")"
-	ext="${ext%.*}"
-	if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
-		# this isn't perfect, but it's better than nothing
-		# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
-		echo >&2
-		echo >&2 "warning: $ext ($module) is already loaded!"
-		echo >&2
-		continue
-	fi
-
-	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
-	if ! grep -q "$line" "$ini" 2>/dev/null; then
-		echo "$line" >> "$ini"
-	fi
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
diff --git a/7.2/stretch/zts/docker-php-ext-install b/7.2/stretch/zts/docker-php-ext-install
deleted file mode 100755
index d75d6d793..000000000
--- a/7.2/stretch/zts/docker-php-ext-install
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 [-jN] ext-name [ext-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop"
-	echo
-	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-j=1
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--jobs|-j) j="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-exts=
-for ext; do
-	if [ -z "$ext" ]; then
-		continue
-	fi
-	if [ ! -d "$ext" ]; then
-		echo >&2 "error: $PWD/$ext does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	exts="$exts $ext"
-done
-
-if [ -z "$exts" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if [ -n "$PHPIZE_DEPS" ]; then
-		if apk info --installed .phpize-deps-configure > /dev/null; then
-			apkDel='.phpize-deps-configure'
-		elif ! apk info --installed .phpize-deps > /dev/null; then
-			apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS
-			apkDel='.phpize-deps'
-		fi
-	fi
-fi
-
-popDir="$PWD"
-for ext in $exts; do
-	cd "$ext"
-	[ -e Makefile ] || docker-php-ext-configure "$ext"
-	make -j"$j"
-	make -j"$j" install
-	find modules \
-		-maxdepth 1 \
-		-name '*.so' \
-		-exec basename '{}' ';' \
-			| xargs -r docker-php-ext-enable
-	make -j"$j" clean
-	cd "$popDir"
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
-
-if [ -e /usr/src/php/.docker-delete-me ]; then
-	docker-php-source delete
-fi
diff --git a/7.2/stretch/zts/docker-php-source b/7.2/stretch/zts/docker-php-source
deleted file mode 100755
index 9033d243d..000000000
--- a/7.2/stretch/zts/docker-php-source
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-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 $dir if not already done."
-	echo "   delete   delete extracted php source located into $dir if not already done."
-	echo
-}
-
-case "$1" in
-	extract)
-		mkdir -p "$dir"
-		if [ ! -f "$dir/.docker-extracted" ]; then
-			tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
-			touch "$dir/.docker-extracted"
-		fi
-		;;
-
-	delete)
-		rm -rf "$dir"
-		;;
-
-	*)
-		usage
-		exit 1
-		;;
-esac
diff --git a/7.3-rc/alpine3.8/zts/Dockerfile b/7.3-rc/alpine3.8/zts/Dockerfile
deleted file mode 100644
index 86db311ad..000000000
--- a/7.3-rc/alpine3.8/zts/Dockerfile
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM alpine:3.8
-
-# dependencies required for running "phpize"
-# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
-ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev dpkg \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkgconf \
-		re2c
-
-# persistent / runtime deps
-RUN apk add --no-cache --virtual .persistent-deps \
-		ca-certificates \
-		curl \
-		tar \
-		xz \
-# https://github.com/docker-library/php/issues/494
-		libressl
-
-# ensure www-data user exists
-RUN set -x \
-	&& addgroup -g 82 -S www-data \
-	&& adduser -u 82 -D -S -G www-data www-data
-# 82 is the standard uid/gid for "www-data" in Alpine
-# http://git.alpinelinux.org/cgit/aports/tree/main/apache2/apache2.pre-install?h=v3.3.2
-# http://git.alpinelinux.org/cgit/aports/tree/main/lighttpd/lighttpd.pre-install?h=v3.3.2
-# http://git.alpinelinux.org/cgit/aports/tree/main/nginx-initscripts/nginx-initscripts.pre-install?h=v3.3.2
-
-ENV PHP_INI_DIR /usr/local/etc/php
-RUN mkdir -p $PHP_INI_DIR/conf.d
-
-##<autogenerated>##
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
-
-# Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
-# Enable optimization (-O2)
-# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
-# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
-# https://github.com/docker-library/php/issues/272
-ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
-ENV PHP_CPPFLAGS="$PHP_CFLAGS"
-ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
-
-ENV GPG_KEYS CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D
-
-ENV PHP_VERSION 7.3.0RC6
-ENV PHP_URL="https://downloads.php.net/~cmb/php-7.3.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~cmb/php-7.3.0RC6.tar.xz.asc"
-ENV PHP_SHA256="8120b5830e24d5fabc96da693ab924852e6c2a95829ad994d6a5107c69787848" PHP_MD5=""
-
-RUN set -xe; \
-	\
-	apk add --no-cache --virtual .fetch-deps \
-		gnupg \
-		wget \
-	; \
-	\
-	mkdir -p /usr/src; \
-	cd /usr/src; \
-	\
-	wget -O php.tar.xz "$PHP_URL"; \
-	\
-	if [ -n "$PHP_SHA256" ]; then \
-		echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
-	fi; \
-	if [ -n "$PHP_MD5" ]; then \
-		echo "$PHP_MD5 *php.tar.xz" | md5sum -c -; \
-	fi; \
-	\
-	if [ -n "$PHP_ASC_URL" ]; then \
-		wget -O php.tar.xz.asc "$PHP_ASC_URL"; \
-		export GNUPGHOME="$(mktemp -d)"; \
-		for key in $GPG_KEYS; do \
-			gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-		done; \
-		gpg --batch --verify php.tar.xz.asc php.tar.xz; \
-		command -v gpgconf > /dev/null && gpgconf --kill all; \
-		rm -rf "$GNUPGHOME"; \
-	fi; \
-	\
-	apk del .fetch-deps
-
-COPY docker-php-source /usr/local/bin/
-
-RUN set -xe \
-	&& apk add --no-cache --virtual .build-deps \
-		$PHPIZE_DEPS \
-		argon2-dev \
-		coreutils \
-		curl-dev \
-		libedit-dev \
-		libressl-dev \
-		libsodium-dev \
-		libxml2-dev \
-		sqlite-dev \
-	\
-	&& export CFLAGS="$PHP_CFLAGS" \
-		CPPFLAGS="$PHP_CPPFLAGS" \
-		LDFLAGS="$PHP_LDFLAGS" \
-	&& docker-php-source extract \
-	&& cd /usr/src/php \
-	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
-	&& ./configure \
-		--build="$gnuArch" \
-		--with-config-file-path="$PHP_INI_DIR" \
-		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
-		\
-# make sure invalid --configure-flags are fatal errors intead of just warnings
-		--enable-option-checking=fatal \
-		\
-# https://github.com/docker-library/php/issues/439
-		--with-mhash \
-		\
-# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
-		--enable-ftp \
-# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
-		--enable-mbstring \
-# --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 \
-# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
-		--with-password-argon2 \
-# https://wiki.php.net/rfc/libsodium
-		--with-sodium=shared \
-		\
-		--with-curl \
-		--with-libedit \
-		--with-openssl \
-		--with-zlib \
-		\
-# bundled pcre does not support JIT on s390x
-# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
-		\
-		$PHP_EXTRA_CONFIGURE_ARGS \
-	&& make -j "$(nproc)" \
-	&& make install \
-	&& { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
-	&& make clean \
-	\
-# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
-	&& cp -v php.ini-* "$PHP_INI_DIR/" \
-	\
-	&& cd / \
-	&& docker-php-source delete \
-	\
-	&& runDeps="$( \
-		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
-			| tr ',' '\n' \
-			| sort -u \
-			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-	)" \
-	&& apk add --no-cache --virtual .php-rundeps $runDeps \
-	\
-	&& apk del .build-deps \
-	\
-# https://github.com/docker-library/php/issues/443
-	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
-
-COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
-
-# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
-RUN docker-php-ext-enable sodium
-
-ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
-CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/7.3-rc/alpine3.8/zts/docker-php-entrypoint b/7.3-rc/alpine3.8/zts/docker-php-entrypoint
deleted file mode 100755
index 88a016c16..000000000
--- a/7.3-rc/alpine3.8/zts/docker-php-entrypoint
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# first arg is `-f` or `--some-option`
-if [ "${1#-}" != "$1" ]; then
-	set -- php "$@"
-fi
-
-exec "$@"
diff --git a/7.3-rc/alpine3.8/zts/docker-php-ext-configure b/7.3-rc/alpine3.8/zts/docker-php-ext-configure
deleted file mode 100755
index 9e949e1e1..000000000
--- a/7.3-rc/alpine3.8/zts/docker-php-ext-configure
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 ext-name [configure flags]"
-	echo "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-ext="$1"
-if [ -z "$ext" ] || [ ! -d "$ext" ]; then
-	usage >&2
-	exit 1
-fi
-shift
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual .phpize-deps-configure $PHPIZE_DEPS
-	fi
-fi
-
-if command -v dpkg-architecture > /dev/null; then
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"
-	set -- --build="$gnuArch" "$@"
-fi
-
-cd "$ext"
-phpize
-./configure "$@"
diff --git a/7.3-rc/alpine3.8/zts/docker-php-ext-enable b/7.3-rc/alpine3.8/zts/docker-php-ext-enable
deleted file mode 100755
index 2b067f039..000000000
--- a/7.3-rc/alpine3.8/zts/docker-php-ext-enable
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-set -e
-
-extDir="$(php -r 'echo ini_get("extension_dir");')"
-cd "$extDir"
-
-usage() {
-	echo "usage: $0 [options] module-name [module-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 --ini-name 0-apc.ini apcu apc"
-	echo
-	echo 'Possible values for module-name:'
-	find -maxdepth 1 \
-			-type f \
-			-name '*.so' \
-			-exec basename '{}' ';' \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-iniName=
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--ini-name) iniName="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-modules=
-for module; do
-	if [ -z "$module" ]; then
-		continue
-	fi
-	if [ -f "$module.so" ] && ! [ -f "$module" ]; then
-		# allow ".so" to be optional
-		module="$module.so"
-	fi
-	if ! [ -f "$module" ]; then
-		echo >&2 "error: '$module' does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	modules="$modules $module"
-done
-
-if [ -z "$modules" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual '.docker-php-ext-enable-deps' binutils
-		apkDel='.docker-php-ext-enable-deps'
-	fi
-fi
-
-for module in $modules; do
-	if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
-		# https://wiki.php.net/internals/extensions#loading_zend_extensions
-		absModule="$(readlink -f "$module")"
-		line="zend_extension=$absModule"
-	else
-		line="extension=$module"
-	fi
-
-	ext="$(basename "$module")"
-	ext="${ext%.*}"
-	if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
-		# this isn't perfect, but it's better than nothing
-		# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
-		echo >&2
-		echo >&2 "warning: $ext ($module) is already loaded!"
-		echo >&2
-		continue
-	fi
-
-	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
-	if ! grep -q "$line" "$ini" 2>/dev/null; then
-		echo "$line" >> "$ini"
-	fi
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
diff --git a/7.3-rc/alpine3.8/zts/docker-php-ext-install b/7.3-rc/alpine3.8/zts/docker-php-ext-install
deleted file mode 100755
index d75d6d793..000000000
--- a/7.3-rc/alpine3.8/zts/docker-php-ext-install
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 [-jN] ext-name [ext-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop"
-	echo
-	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-j=1
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--jobs|-j) j="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-exts=
-for ext; do
-	if [ -z "$ext" ]; then
-		continue
-	fi
-	if [ ! -d "$ext" ]; then
-		echo >&2 "error: $PWD/$ext does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	exts="$exts $ext"
-done
-
-if [ -z "$exts" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if [ -n "$PHPIZE_DEPS" ]; then
-		if apk info --installed .phpize-deps-configure > /dev/null; then
-			apkDel='.phpize-deps-configure'
-		elif ! apk info --installed .phpize-deps > /dev/null; then
-			apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS
-			apkDel='.phpize-deps'
-		fi
-	fi
-fi
-
-popDir="$PWD"
-for ext in $exts; do
-	cd "$ext"
-	[ -e Makefile ] || docker-php-ext-configure "$ext"
-	make -j"$j"
-	make -j"$j" install
-	find modules \
-		-maxdepth 1 \
-		-name '*.so' \
-		-exec basename '{}' ';' \
-			| xargs -r docker-php-ext-enable
-	make -j"$j" clean
-	cd "$popDir"
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
-
-if [ -e /usr/src/php/.docker-delete-me ]; then
-	docker-php-source delete
-fi
diff --git a/7.3-rc/alpine3.8/zts/docker-php-source b/7.3-rc/alpine3.8/zts/docker-php-source
deleted file mode 100755
index 9033d243d..000000000
--- a/7.3-rc/alpine3.8/zts/docker-php-source
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-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 $dir if not already done."
-	echo "   delete   delete extracted php source located into $dir if not already done."
-	echo
-}
-
-case "$1" in
-	extract)
-		mkdir -p "$dir"
-		if [ ! -f "$dir/.docker-extracted" ]; then
-			tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
-			touch "$dir/.docker-extracted"
-		fi
-		;;
-
-	delete)
-		rm -rf "$dir"
-		;;
-
-	*)
-		usage
-		exit 1
-		;;
-esac
diff --git a/7.3-rc/stretch/apache/Dockerfile b/7.3-rc/stretch/apache/Dockerfile
index 05b3e8638..d845462b1 100644
--- a/7.3-rc/stretch/apache/Dockerfile
+++ b/7.3-rc/stretch/apache/Dockerfile
@@ -100,7 +100,7 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
 ##</autogenerated>##
 
 # Apply stack smash protection to functions using local buffers and alloca()
diff --git a/7.3-rc/stretch/zts/Dockerfile b/7.3-rc/stretch/zts/Dockerfile
deleted file mode 100644
index 1f5991e50..000000000
--- a/7.3-rc/stretch/zts/Dockerfile
+++ /dev/null
@@ -1,219 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM debian:stretch-slim
-
-# prevent Debian's PHP packages from being installed
-# https://github.com/docker-library/php/pull/542
-RUN set -eux; \
-	{ \
-		echo 'Package: php*'; \
-		echo 'Pin: release *'; \
-		echo 'Pin-Priority: -1'; \
-	} > /etc/apt/preferences.d/no-debian-php
-
-# dependencies required for running "phpize"
-# (see persistent deps below)
-ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkg-config \
-		re2c
-
-# persistent / runtime deps
-RUN apt-get update && apt-get install -y \
-		$PHPIZE_DEPS \
-		ca-certificates \
-		curl \
-		xz-utils \
-	--no-install-recommends && rm -r /var/lib/apt/lists/*
-
-ENV PHP_INI_DIR /usr/local/etc/php
-RUN mkdir -p $PHP_INI_DIR/conf.d
-
-##<autogenerated>##
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
-##</autogenerated>##
-
-# Apply stack smash protection to functions using local buffers and alloca()
-# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
-# Enable optimization (-O2)
-# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
-# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
-# https://github.com/docker-library/php/issues/272
-ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
-ENV PHP_CPPFLAGS="$PHP_CFLAGS"
-ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
-
-ENV GPG_KEYS CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D
-
-ENV PHP_VERSION 7.3.0RC6
-ENV PHP_URL="https://downloads.php.net/~cmb/php-7.3.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~cmb/php-7.3.0RC6.tar.xz.asc"
-ENV PHP_SHA256="8120b5830e24d5fabc96da693ab924852e6c2a95829ad994d6a5107c69787848" PHP_MD5=""
-
-RUN set -xe; \
-	\
-	fetchDeps=' \
-		wget \
-	'; \
-	if ! command -v gpg > /dev/null; then \
-		fetchDeps="$fetchDeps \
-			dirmngr \
-			gnupg \
-		"; \
-	fi; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends $fetchDeps; \
-	rm -rf /var/lib/apt/lists/*; \
-	\
-	mkdir -p /usr/src; \
-	cd /usr/src; \
-	\
-	wget -O php.tar.xz "$PHP_URL"; \
-	\
-	if [ -n "$PHP_SHA256" ]; then \
-		echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
-	fi; \
-	if [ -n "$PHP_MD5" ]; then \
-		echo "$PHP_MD5 *php.tar.xz" | md5sum -c -; \
-	fi; \
-	\
-	if [ -n "$PHP_ASC_URL" ]; then \
-		wget -O php.tar.xz.asc "$PHP_ASC_URL"; \
-		export GNUPGHOME="$(mktemp -d)"; \
-		for key in $GPG_KEYS; do \
-			gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-		done; \
-		gpg --batch --verify php.tar.xz.asc php.tar.xz; \
-		command -v gpgconf > /dev/null && gpgconf --kill all; \
-		rm -rf "$GNUPGHOME"; \
-	fi; \
-	\
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps
-
-COPY docker-php-source /usr/local/bin/
-
-RUN set -eux; \
-	\
-	savedAptMark="$(apt-mark showmanual)"; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		libcurl4-openssl-dev \
-		libedit-dev \
-		libsodium-dev \
-		libsqlite3-dev \
-		libssl-dev \
-		libxml2-dev \
-		zlib1g-dev \
-		${PHP_EXTRA_BUILD_DEPS:-} \
-	; \
-##<argon2>##
-	sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
-	{ \
-		echo 'Package: *'; \
-		echo 'Pin: release n=buster'; \
-		echo 'Pin-Priority: -10'; \
-		echo; \
-		echo 'Package: libargon2*'; \
-		echo 'Pin: release n=buster'; \
-		echo 'Pin-Priority: 990'; \
-	} > /etc/apt/preferences.d/argon2-buster; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends libargon2-dev; \
-##</argon2>##
-	rm -rf /var/lib/apt/lists/*; \
-	\
-	export \
-		CFLAGS="$PHP_CFLAGS" \
-		CPPFLAGS="$PHP_CPPFLAGS" \
-		LDFLAGS="$PHP_LDFLAGS" \
-	; \
-	docker-php-source extract; \
-	cd /usr/src/php; \
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
-	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-# https://bugs.php.net/bug.php?id=74125
-	if [ ! -d /usr/include/curl ]; then \
-		ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
-	fi; \
-	./configure \
-		--build="$gnuArch" \
-		--with-config-file-path="$PHP_INI_DIR" \
-		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
-		\
-# make sure invalid --configure-flags are fatal errors intead of just warnings
-		--enable-option-checking=fatal \
-		\
-# https://github.com/docker-library/php/issues/439
-		--with-mhash \
-		\
-# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
-		--enable-ftp \
-# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
-		--enable-mbstring \
-# --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 \
-# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
-		--with-password-argon2 \
-# https://wiki.php.net/rfc/libsodium
-		--with-sodium=shared \
-		\
-		--with-curl \
-		--with-libedit \
-		--with-openssl \
-		--with-zlib \
-		\
-# bundled pcre does not support JIT on s390x
-# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
-		--with-libdir="lib/$debMultiarch" \
-		\
-		${PHP_EXTRA_CONFIGURE_ARGS:-} \
-	; \
-	make -j "$(nproc)"; \
-	make install; \
-	find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \
-	make clean; \
-	\
-# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
-	cp -v php.ini-* "$PHP_INI_DIR/"; \
-	\
-	cd /; \
-	docker-php-source delete; \
-	\
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-	apt-mark auto '.*' > /dev/null; \
-	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
-	find /usr/local -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { print $(NF-1) }' \
-		| sort -u \
-		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
-		| sort -u \
-		| xargs -r apt-mark manual \
-	; \
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
-	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
-
-COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
-
-# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
-RUN docker-php-ext-enable sodium
-
-ENTRYPOINT ["docker-php-entrypoint"]
-##<autogenerated>##
-CMD ["php", "-a"]
-##</autogenerated>##
diff --git a/7.3-rc/stretch/zts/docker-php-entrypoint b/7.3-rc/stretch/zts/docker-php-entrypoint
deleted file mode 100755
index 88a016c16..000000000
--- a/7.3-rc/stretch/zts/docker-php-entrypoint
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# first arg is `-f` or `--some-option`
-if [ "${1#-}" != "$1" ]; then
-	set -- php "$@"
-fi
-
-exec "$@"
diff --git a/7.3-rc/stretch/zts/docker-php-ext-configure b/7.3-rc/stretch/zts/docker-php-ext-configure
deleted file mode 100755
index 9e949e1e1..000000000
--- a/7.3-rc/stretch/zts/docker-php-ext-configure
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 ext-name [configure flags]"
-	echo "   ie: $0 gd --with-jpeg-dir=/usr/local/something"
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-ext="$1"
-if [ -z "$ext" ] || [ ! -d "$ext" ]; then
-	usage >&2
-	exit 1
-fi
-shift
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual .phpize-deps-configure $PHPIZE_DEPS
-	fi
-fi
-
-if command -v dpkg-architecture > /dev/null; then
-	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"
-	set -- --build="$gnuArch" "$@"
-fi
-
-cd "$ext"
-phpize
-./configure "$@"
diff --git a/7.3-rc/stretch/zts/docker-php-ext-enable b/7.3-rc/stretch/zts/docker-php-ext-enable
deleted file mode 100755
index 2b067f039..000000000
--- a/7.3-rc/stretch/zts/docker-php-ext-enable
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-set -e
-
-extDir="$(php -r 'echo ini_get("extension_dir");')"
-cd "$extDir"
-
-usage() {
-	echo "usage: $0 [options] module-name [module-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 --ini-name 0-apc.ini apcu apc"
-	echo
-	echo 'Possible values for module-name:'
-	find -maxdepth 1 \
-			-type f \
-			-name '*.so' \
-			-exec basename '{}' ';' \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-iniName=
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--ini-name) iniName="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-modules=
-for module; do
-	if [ -z "$module" ]; then
-		continue
-	fi
-	if [ -f "$module.so" ] && ! [ -f "$module" ]; then
-		# allow ".so" to be optional
-		module="$module.so"
-	fi
-	if ! [ -f "$module" ]; then
-		echo >&2 "error: '$module' does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	modules="$modules $module"
-done
-
-if [ -z "$modules" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if \
-		[ -n "$PHPIZE_DEPS" ] \
-		&& ! apk info --installed .phpize-deps > /dev/null \
-		&& ! apk info --installed .phpize-deps-configure > /dev/null \
-	; then
-		apk add --no-cache --virtual '.docker-php-ext-enable-deps' binutils
-		apkDel='.docker-php-ext-enable-deps'
-	fi
-fi
-
-for module in $modules; do
-	if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
-		# https://wiki.php.net/internals/extensions#loading_zend_extensions
-		absModule="$(readlink -f "$module")"
-		line="zend_extension=$absModule"
-	else
-		line="extension=$module"
-	fi
-
-	ext="$(basename "$module")"
-	ext="${ext%.*}"
-	if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
-		# this isn't perfect, but it's better than nothing
-		# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
-		echo >&2
-		echo >&2 "warning: $ext ($module) is already loaded!"
-		echo >&2
-		continue
-	fi
-
-	ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
-	if ! grep -q "$line" "$ini" 2>/dev/null; then
-		echo "$line" >> "$ini"
-	fi
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
diff --git a/7.3-rc/stretch/zts/docker-php-ext-install b/7.3-rc/stretch/zts/docker-php-ext-install
deleted file mode 100755
index d75d6d793..000000000
--- a/7.3-rc/stretch/zts/docker-php-ext-install
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-set -e
-
-# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
-: ${CFLAGS:=$PHP_CFLAGS}
-: ${CPPFLAGS:=$PHP_CPPFLAGS}
-: ${LDFLAGS:=$PHP_LDFLAGS}
-export CFLAGS CPPFLAGS LDFLAGS
-
-srcExists=
-if [ -d /usr/src/php ]; then
-	srcExists=1
-fi
-docker-php-source extract
-if [ -z "$srcExists" ]; then
-	touch /usr/src/php/.docker-delete-me
-fi
-
-cd /usr/src/php/ext
-
-usage() {
-	echo "usage: $0 [-jN] ext-name [ext-name ...]"
-	echo "   ie: $0 gd mysqli"
-	echo "       $0 pdo pdo_mysql"
-	echo "       $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop"
-	echo
-	echo 'if custom ./configure arguments are necessary, see docker-php-ext-configure'
-	echo
-	echo 'Possible values for ext-name:'
-	find . \
-			-mindepth 2 \
-			-maxdepth 2 \
-			-type f \
-			-name 'config.m4' \
-		| xargs -n1 dirname \
-		| xargs -n1 basename \
-		| sort \
-		| xargs
-	echo
-	echo 'Some of the above modules are already compiled into PHP; please check'
-	echo 'the output of "php -i" to see which modules are already loaded.'
-}
-
-opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-j=1
-while true; do
-	flag="$1"
-	shift
-	case "$flag" in
-		--help|-h|'-?') usage && exit 0 ;;
-		--jobs|-j) j="$1" && shift ;;
-		--) break ;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-exts=
-for ext; do
-	if [ -z "$ext" ]; then
-		continue
-	fi
-	if [ ! -d "$ext" ]; then
-		echo >&2 "error: $PWD/$ext does not exist"
-		echo >&2
-		usage >&2
-		exit 1
-	fi
-	exts="$exts $ext"
-done
-
-if [ -z "$exts" ]; then
-	usage >&2
-	exit 1
-fi
-
-pm='unknown'
-if [ -e /lib/apk/db/installed ]; then
-	pm='apk'
-fi
-
-apkDel=
-if [ "$pm" = 'apk' ]; then
-	if [ -n "$PHPIZE_DEPS" ]; then
-		if apk info --installed .phpize-deps-configure > /dev/null; then
-			apkDel='.phpize-deps-configure'
-		elif ! apk info --installed .phpize-deps > /dev/null; then
-			apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS
-			apkDel='.phpize-deps'
-		fi
-	fi
-fi
-
-popDir="$PWD"
-for ext in $exts; do
-	cd "$ext"
-	[ -e Makefile ] || docker-php-ext-configure "$ext"
-	make -j"$j"
-	make -j"$j" install
-	find modules \
-		-maxdepth 1 \
-		-name '*.so' \
-		-exec basename '{}' ';' \
-			| xargs -r docker-php-ext-enable
-	make -j"$j" clean
-	cd "$popDir"
-done
-
-if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
-	apk del $apkDel
-fi
-
-if [ -e /usr/src/php/.docker-delete-me ]; then
-	docker-php-source delete
-fi
diff --git a/7.3-rc/stretch/zts/docker-php-source b/7.3-rc/stretch/zts/docker-php-source
deleted file mode 100755
index 9033d243d..000000000
--- a/7.3-rc/stretch/zts/docker-php-source
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-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 $dir if not already done."
-	echo "   delete   delete extracted php source located into $dir if not already done."
-	echo
-}
-
-case "$1" in
-	extract)
-		mkdir -p "$dir"
-		if [ ! -f "$dir/.docker-extracted" ]; then
-			tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
-			touch "$dir/.docker-extracted"
-		fi
-		;;
-
-	delete)
-		rm -rf "$dir"
-		;;
-
-	*)
-		usage
-		exit 1
-		;;
-esac
diff --git a/apache-Dockerfile-block-1 b/apache-Dockerfile-block-1
index 8c2fbecbd..d3f71aae0 100644
--- a/apache-Dockerfile-block-1
+++ b/apache-Dockerfile-block-1
@@ -58,4 +58,4 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
+ENV PHP_EXTRA_CONFIGURE_ARGS --disable-cgi --enable-maintainer-zts --with-apxs2
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index f78b9aa2e..7d09a1140 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -94,9 +94,9 @@ for version in "${versions[@]}"; do
 			cli \
 			apache \
 			fpm \
-			zts \
 		; do
 			dir="$version/$suite/$variant"
+
 			[ -f "$dir/Dockerfile" ] || continue
 
 			commit="$(dirCommit "$dir")"
@@ -104,6 +104,14 @@ for version in "${versions[@]}"; do
 
 			baseAliases=( $fullVersion "${versionAliases[@]}" )
 			variantAliases=( "${baseAliases[@]/%/-$variant}" )
+			# zts (thread safe php) is available in the apache image, so lets keep a compatability tag for zts on old versions
+			# https://github.com/docker-library/php/issues/742
+			# TODO remove zts tags completely
+			if [ "$variant" = 'apache' ]; then
+				if [ "$version" = '7.2' ] || [ "$version" = '7.1' ] || [ "$version" = '7.0' ] || [ "$version" = '5.6' ]; then
+					variantAliases+=( "${baseAliases[@]/%/-zts}" )
+				fi
+			fi
 			variantAliases=( "${variantAliases[@]//latest-/}" )
 
 			if [ "$variant" = 'cli' ]; then
diff --git a/update.sh b/update.sh
index 21db60a58..cd671de13 100755
--- a/update.sh
+++ b/update.sh
@@ -139,7 +139,7 @@ for version in "${versions[@]}"; do
 			baseDockerfile=Dockerfile-alpine.template
 		fi
 
-		for variant in cli apache fpm zts; do
+		for variant in cli apache fpm; do
 			[ -d "$version/$suite/$variant" ] || continue
 			{ generated_warning; cat "$baseDockerfile"; } > "$version/$suite/$variant/Dockerfile"
 
diff --git a/zts-Dockerfile-block-1 b/zts-Dockerfile-block-1
deleted file mode 100644
index 56495d2cb..000000000
--- a/zts-Dockerfile-block-1
+++ /dev/null
@@ -1 +0,0 @@
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi