Add threadsafe (zts) to Apache so mpm_event can be used; point zts ta…

…gs to apache (for <7.3)
docker-library · Nov 26, 2018 · 26ec001 · 26ec001
1 parent 8d9fb94
commit 26ec001
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 24 deletions.
diff --git 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/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/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/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/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.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/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.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.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/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
@@ -94,16 +94,24 @@ for version in "${versions[@]}"; do
 			cli \
 			apache \
 			fpm \
-			zts \
 		; do
 			dir="$version/$suite/$variant"
+
 			[ -f "$dir/Dockerfile" ] || continue
 
 			commit="$(dirCommit "$dir")"
 			fullVersion="$(git show "$commit":"$dir/Dockerfile" | awk '$1 == "ENV" && $2 == "PHP_VERSION" { print $3; exit }')"
 
 			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
@@ -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"