Add threadsafe (zts) to Apache so mpm_event can be used

[yosifkit]

This also drops the separate zts tags and just points them to the Apache image for versions less than 7.3.

Fixes #742

This changes the number of unique php images from 47 to 34

diff --git a/library/php b/library/php
index 75ff70b3..fcb3c326 100644
--- a/library/php
+++ b/library/php
@@ -1,4 +1,4 @@
-# this file is generated via https://github.com/docker-library/php/blob/0b2c6441b26bfb5f190a53c5781c641e9b6b8972/generate-stackbrew-library.sh
+# this file is generated via https://github.com/docker-library/php/blob/9caa485a31f311455db6a6763d9aaa0e8d22ec65/generate-stackbrew-library.sh
 
 Maintainers: Tianon Gravi <[email protected]> (@tianon),
              Joseph Ferguson <[email protected]> (@yosifkit)
@@ -11,7 +11,7 @@ Directory: 7.3-rc/stretch/cli
 
 Tags: 7.3.0RC5-apache-stretch, 7.3-rc-apache-stretch, rc-apache-stretch, 7.3.0RC5-apache, 7.3-rc-apache, rc-apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le
-GitCommit: 67efd89c36bf15cb5ba096213e0536b2cab5eb38
+GitCommit: 9caa485a31f311455db6a6763d9aaa0e8d22ec65
 Directory: 7.3-rc/stretch/apache
 
 Tags: 7.3.0RC5-fpm-stretch, 7.3-rc-fpm-stretch, rc-fpm-stretch, 7.3.0RC5-fpm, 7.3-rc-fpm, rc-fpm
@@ -19,11 +19,6 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 7.3-rc/stretch/fpm
 
-Tags: 7.3.0RC5-zts-stretch, 7.3-rc-zts-stretch, rc-zts-stretch, 7.3.0RC5-zts, 7.3-rc-zts, rc-zts
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le
-GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
-Directory: 7.3-rc/stretch/zts
-
 Tags: 7.3.0RC5-cli-alpine3.8, 7.3-rc-cli-alpine3.8, rc-cli-alpine3.8, 7.3.0RC5-alpine3.8, 7.3-rc-alpine3.8, rc-alpine3.8, 7.3.0RC5-cli-alpine, 7.3-rc-cli-alpine, rc-cli-alpine, 7.3.0RC5-alpine, 7.3-rc-alpine, rc-alpine
 Architectures: amd64, arm32v6, arm64v8, i386, ppc64le
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
@@ -34,19 +29,14 @@ Architectures: amd64, arm32v6, arm64v8, i386, ppc64le
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 7.3-rc/alpine3.8/fpm
 
-Tags: 7.3.0RC5-zts-alpine3.8, 7.3-rc-zts-alpine3.8, rc-zts-alpine3.8, 7.3.0RC5-zts-alpine, 7.3-rc-zts-alpine, rc-zts-alpine
-Architectures: amd64, arm32v6, arm64v8, i386, ppc64le
-GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
-Directory: 7.3-rc/alpine3.8/zts
-
 Tags: 7.2.12-cli-stretch, 7.2-cli-stretch, 7-cli-stretch, cli-stretch, 7.2.12-stretch, 7.2-stretch, 7-stretch, stretch, 7.2.12-cli, 7.2-cli, 7-cli, cli, 7.2.12, 7.2, 7, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 7.2/stretch/cli
 
-Tags: 7.2.12-apache-stretch, 7.2-apache-stretch, 7-apache-stretch, apache-stretch, 7.2.12-apache, 7.2-apache, 7-apache, apache
+Tags: 7.2.12-apache-stretch, 7.2-apache-stretch, 7-apache-stretch, apache-stretch, 7.2.12-zts-stretch, 7.2-zts-stretch, 7-zts-stretch, zts-stretch, 7.2.12-apache, 7.2-apache, 7-apache, apache, 7.2.12-zts, 7.2-zts, 7-zts, zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le
-GitCommit: 67efd89c36bf15cb5ba096213e0536b2cab5eb38
+GitCommit: 9caa485a31f311455db6a6763d9aaa0e8d22ec65
 Directory: 7.2/stretch/apache
 
 Tags: 7.2.12-fpm-stretch, 7.2-fpm-stretch, 7-fpm-stretch, fpm-stretch, 7.2.12-fpm, 7.2-fpm, 7-fpm, fpm
@@ -54,11 +44,6 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 7.2/stretch/fpm
 
-Tags: 7.2.12-zts-stretch, 7.2-zts-stretch, 7-zts-stretch, zts-stretch, 7.2.12-zts, 7.2-zts, 7-zts, zts
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le
-GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
-Directory: 7.2/stretch/zts
-
 Tags: 7.2.12-cli-alpine3.8, 7.2-cli-alpine3.8, 7-cli-alpine3.8, cli-alpine3.8, 7.2.12-alpine3.8, 7.2-alpine3.8, 7-alpine3.8, alpine3.8, 7.2.12-cli-alpine, 7.2-cli-alpine, 7-cli-alpine, cli-alpine, 7.2.12-alpine, 7.2-alpine, 7-alpine, alpine
 Architectures: amd64, arm32v6, arm64v8, i386, ppc64le
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
@@ -69,19 +54,14 @@ Architectures: amd64, arm32v6, arm64v8, i386, ppc64le
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 7.2/alpine3.8/fpm
 
-Tags: 7.2.12-zts-alpine3.8, 7.2-zts-alpine3.8, 7-zts-alpine3.8, zts-alpine3.8, 7.2.12-zts-alpine, 7.2-zts-alpine, 7-zts-alpine, zts-alpine
-Architectures: amd64, arm32v6, arm64v8, i386, ppc64le
-GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
-Directory: 7.2/alpine3.8/zts
-
 Tags: 7.1.24-cli-stretch, 7.1-cli-stretch, 7.1.24-stretch, 7.1-stretch, 7.1.24-cli, 7.1-cli, 7.1.24, 7.1
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 7.1/stretch/cli
 
-Tags: 7.1.24-apache-stretch, 7.1-apache-stretch, 7.1.24-apache, 7.1-apache
+Tags: 7.1.24-apache-stretch, 7.1-apache-stretch, 7.1.24-zts-stretch, 7.1-zts-stretch, 7.1.24-apache, 7.1-apache, 7.1.24-zts, 7.1-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 67efd89c36bf15cb5ba096213e0536b2cab5eb38
+GitCommit: 9caa485a31f311455db6a6763d9aaa0e8d22ec65
 Directory: 7.1/stretch/apache
 
 Tags: 7.1.24-fpm-stretch, 7.1-fpm-stretch, 7.1.24-fpm, 7.1-fpm
@@ -89,19 +69,14 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 7.1/stretch/fpm
 
-Tags: 7.1.24-zts-stretch, 7.1-zts-stretch, 7.1.24-zts, 7.1-zts
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
-Directory: 7.1/stretch/zts
-
 Tags: 7.1.24-cli-jessie, 7.1-cli-jessie, 7.1.24-jessie, 7.1-jessie
 Architectures: amd64, arm32v5, arm32v7, i386
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 7.1/jessie/cli
 
-Tags: 7.1.24-apache-jessie, 7.1-apache-jessie
+Tags: 7.1.24-apache-jessie, 7.1-apache-jessie, 7.1.24-zts-jessie, 7.1-zts-jessie
 Architectures: amd64, arm32v5, arm32v7, i386
-GitCommit: 67efd89c36bf15cb5ba096213e0536b2cab5eb38
+GitCommit: 9caa485a31f311455db6a6763d9aaa0e8d22ec65
 Directory: 7.1/jessie/apache
 
 Tags: 7.1.24-fpm-jessie, 7.1-fpm-jessie
@@ -109,11 +84,6 @@ Architectures: amd64, arm32v5, arm32v7, i386
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 7.1/jessie/fpm
 
-Tags: 7.1.24-zts-jessie, 7.1-zts-jessie
-Architectures: amd64, arm32v5, arm32v7, i386
-GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
-Directory: 7.1/jessie/zts
-
 Tags: 7.1.24-cli-alpine3.8, 7.1-cli-alpine3.8, 7.1.24-alpine3.8, 7.1-alpine3.8, 7.1.24-cli-alpine, 7.1-cli-alpine, 7.1.24-alpine, 7.1-alpine
 Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
@@ -124,19 +94,14 @@ Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 7.1/alpine3.8/fpm
 
-Tags: 7.1.24-zts-alpine3.8, 7.1-zts-alpine3.8, 7.1.24-zts-alpine, 7.1-zts-alpine
-Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
-GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
-Directory: 7.1/alpine3.8/zts
-
 Tags: 7.0.32-cli-stretch, 7.0-cli-stretch, 7.0.32-stretch, 7.0-stretch, 7.0.32-cli, 7.0-cli, 7.0.32, 7.0
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 7.0/stretch/cli
 
-Tags: 7.0.32-apache-stretch, 7.0-apache-stretch, 7.0.32-apache, 7.0-apache
+Tags: 7.0.32-apache-stretch, 7.0-apache-stretch, 7.0.32-zts-stretch, 7.0-zts-stretch, 7.0.32-apache, 7.0-apache, 7.0.32-zts, 7.0-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 67efd89c36bf15cb5ba096213e0536b2cab5eb38
+GitCommit: 9caa485a31f311455db6a6763d9aaa0e8d22ec65
 Directory: 7.0/stretch/apache
 
 Tags: 7.0.32-fpm-stretch, 7.0-fpm-stretch, 7.0.32-fpm, 7.0-fpm
@@ -144,19 +109,14 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 7.0/stretch/fpm
 
-Tags: 7.0.32-zts-stretch, 7.0-zts-stretch, 7.0.32-zts, 7.0-zts
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
-Directory: 7.0/stretch/zts
-
 Tags: 7.0.32-cli-jessie, 7.0-cli-jessie, 7.0.32-jessie, 7.0-jessie
 Architectures: amd64, arm32v5, arm32v7, i386
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 7.0/jessie/cli
 
-Tags: 7.0.32-apache-jessie, 7.0-apache-jessie
+Tags: 7.0.32-apache-jessie, 7.0-apache-jessie, 7.0.32-zts-jessie, 7.0-zts-jessie
 Architectures: amd64, arm32v5, arm32v7, i386
-GitCommit: 67efd89c36bf15cb5ba096213e0536b2cab5eb38
+GitCommit: 9caa485a31f311455db6a6763d9aaa0e8d22ec65
 Directory: 7.0/jessie/apache
 
 Tags: 7.0.32-fpm-jessie, 7.0-fpm-jessie
@@ -164,11 +124,6 @@ Architectures: amd64, arm32v5, arm32v7, i386
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 7.0/jessie/fpm
 
-Tags: 7.0.32-zts-jessie, 7.0-zts-jessie
-Architectures: amd64, arm32v5, arm32v7, i386
-GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
-Directory: 7.0/jessie/zts
-
 Tags: 7.0.32-cli-alpine3.7, 7.0-cli-alpine3.7, 7.0.32-alpine3.7, 7.0-alpine3.7, 7.0.32-cli-alpine, 7.0-cli-alpine, 7.0.32-alpine, 7.0-alpine
 Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
@@ -179,19 +134,14 @@ Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 7.0/alpine3.7/fpm
 
-Tags: 7.0.32-zts-alpine3.7, 7.0-zts-alpine3.7, 7.0.32-zts-alpine, 7.0-zts-alpine
-Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
-GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
-Directory: 7.0/alpine3.7/zts
-
 Tags: 5.6.38-cli-stretch, 5.6-cli-stretch, 5-cli-stretch, 5.6.38-stretch, 5.6-stretch, 5-stretch, 5.6.38-cli, 5.6-cli, 5-cli, 5.6.38, 5.6, 5
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 5.6/stretch/cli
 
-Tags: 5.6.38-apache-stretch, 5.6-apache-stretch, 5-apache-stretch, 5.6.38-apache, 5.6-apache, 5-apache
+Tags: 5.6.38-apache-stretch, 5.6-apache-stretch, 5-apache-stretch, 5.6.38-zts-stretch, 5.6-zts-stretch, 5-zts-stretch, 5.6.38-apache, 5.6-apache, 5-apache, 5.6.38-zts, 5.6-zts, 5-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 67efd89c36bf15cb5ba096213e0536b2cab5eb38
+GitCommit: 9caa485a31f311455db6a6763d9aaa0e8d22ec65
 Directory: 5.6/stretch/apache
 
 Tags: 5.6.38-fpm-stretch, 5.6-fpm-stretch, 5-fpm-stretch, 5.6.38-fpm, 5.6-fpm, 5-fpm
@@ -199,19 +149,14 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 5.6/stretch/fpm
 
-Tags: 5.6.38-zts-stretch, 5.6-zts-stretch, 5-zts-stretch, 5.6.38-zts, 5.6-zts, 5-zts
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
-Directory: 5.6/stretch/zts
-
 Tags: 5.6.38-cli-jessie, 5.6-cli-jessie, 5-cli-jessie, 5.6.38-jessie, 5.6-jessie, 5-jessie
 Architectures: amd64, arm32v5, arm32v7, i386
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 5.6/jessie/cli
 
-Tags: 5.6.38-apache-jessie, 5.6-apache-jessie, 5-apache-jessie
+Tags: 5.6.38-apache-jessie, 5.6-apache-jessie, 5-apache-jessie, 5.6.38-zts-jessie, 5.6-zts-jessie, 5-zts-jessie
 Architectures: amd64, arm32v5, arm32v7, i386
-GitCommit: 67efd89c36bf15cb5ba096213e0536b2cab5eb38
+GitCommit: 9caa485a31f311455db6a6763d9aaa0e8d22ec65
 Directory: 5.6/jessie/apache
 
 Tags: 5.6.38-fpm-jessie, 5.6-fpm-jessie, 5-fpm-jessie
@@ -219,11 +164,6 @@ Architectures: amd64, arm32v5, arm32v7, i386
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 5.6/jessie/fpm
 
-Tags: 5.6.38-zts-jessie, 5.6-zts-jessie, 5-zts-jessie
-Architectures: amd64, arm32v5, arm32v7, i386
-GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
-Directory: 5.6/jessie/zts
-
 Tags: 5.6.38-cli-alpine3.8, 5.6-cli-alpine3.8, 5-cli-alpine3.8, 5.6.38-alpine3.8, 5.6-alpine3.8, 5-alpine3.8, 5.6.38-cli-alpine, 5.6-cli-alpine, 5-cli-alpine, 5.6.38-alpine, 5.6-alpine, 5-alpine
 Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
@@ -233,8 +173,3 @@ Tags: 5.6.38-fpm-alpine3.8, 5.6-fpm-alpine3.8, 5-fpm-alpine3.8, 5.6.38-fpm-alpin
 Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
 GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
 Directory: 5.6/alpine3.8/fpm
-
-Tags: 5.6.38-zts-alpine3.8, 5.6-zts-alpine3.8, 5-zts-alpine3.8, 5.6.38-zts-alpine, 5.6-zts-alpine, 5-zts-alpine
-Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
-GitCommit: b99209cc078ebb7bf4614e870c2d69e0b3bed399
-Directory: 5.6/alpine3.8/zts

#742 -- ZTS is slower 😞