Add stretch and alpine 3.7 variants for 5.6, 7.0 and 7.1. #646

yosifkit · 2018-05-17T21:14:26Z

This adds alpine:3.7 and stretch based images for all supported versions of php. This results in 21 new builds 😢 (multiplied by arches). The default is kept on the older release for now. The next step is to add warnings to the hub description of when the plain tags like 5.6-alpine will move to alpine 3.7 and the alpine 3.4 tags dropped (probably asap, since Alpine 3.4 is now EOL).

Two commits to make it slightly easier to see: first commit is just the Dockerfiles + .travis.yml; second commit is the docker-php-* scripts.

Fixes #275, refs #504, fixes #601, fixes #624, closes #629, fixes #633,

@@ -54,6 +54,26 @@
 GitCommit: b045ba7c51ceed8a495beb8ea7274df48a3c70e1
 Directory: 7.2/alpine3.6/zts
 
+Tags: 7.1.17-cli-stretch, 7.1-cli-stretch, 7.1.17-stretch, 7.1-stretch
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 7.1/stretch/cli
+
+Tags: 7.1.17-apache-stretch, 7.1-apache-stretch
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 7.1/stretch/apache
+
+Tags: 7.1.17-fpm-stretch, 7.1-fpm-stretch
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 7.1/stretch/fpm
+
+Tags: 7.1.17-zts-stretch, 7.1-zts-stretch
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 7.1/stretch/zts
+
 Tags: 7.1.17-cli-jessie, 7.1-cli-jessie, 7.1.17-jessie, 7.1-jessie, 7.1.17-cli, 7.1-cli, 7.1.17, 7.1
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: b045ba7c51ceed8a495beb8ea7274df48a3c70e1
@@ -74,6 +94,21 @@
 GitCommit: b045ba7c51ceed8a495beb8ea7274df48a3c70e1
 Directory: 7.1/jessie/zts
 
+Tags: 7.1.17-cli-alpine3.7, 7.1-cli-alpine3.7, 7.1.17-alpine3.7, 7.1-alpine3.7
+Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 7.1/alpine3.7/cli
+
+Tags: 7.1.17-fpm-alpine3.7, 7.1-fpm-alpine3.7
+Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 7.1/alpine3.7/fpm
+
+Tags: 7.1.17-zts-alpine3.7, 7.1-zts-alpine3.7
+Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 7.1/alpine3.7/zts
+
 Tags: 7.1.17-cli-alpine3.4, 7.1-cli-alpine3.4, 7.1.17-alpine3.4, 7.1-alpine3.4, 7.1.17-cli-alpine, 7.1-cli-alpine, 7.1.17-alpine, 7.1-alpine
 Architectures: amd64
 GitCommit: b045ba7c51ceed8a495beb8ea7274df48a3c70e1
@@ -89,6 +124,26 @@
 GitCommit: b045ba7c51ceed8a495beb8ea7274df48a3c70e1
 Directory: 7.1/alpine3.4/zts
 
+Tags: 7.0.30-cli-stretch, 7.0-cli-stretch, 7.0.30-stretch, 7.0-stretch
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 7.0/stretch/cli
+
+Tags: 7.0.30-apache-stretch, 7.0-apache-stretch
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 7.0/stretch/apache
+
+Tags: 7.0.30-fpm-stretch, 7.0-fpm-stretch
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 7.0/stretch/fpm
+
+Tags: 7.0.30-zts-stretch, 7.0-zts-stretch
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 7.0/stretch/zts
+
 Tags: 7.0.30-cli-jessie, 7.0-cli-jessie, 7.0.30-jessie, 7.0-jessie, 7.0.30-cli, 7.0-cli, 7.0.30, 7.0
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: b045ba7c51ceed8a495beb8ea7274df48a3c70e1
@@ -109,6 +164,21 @@
 GitCommit: b045ba7c51ceed8a495beb8ea7274df48a3c70e1
 Directory: 7.0/jessie/zts
 
+Tags: 7.0.30-cli-alpine3.7, 7.0-cli-alpine3.7, 7.0.30-alpine3.7, 7.0-alpine3.7
+Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 7.0/alpine3.7/cli
+
+Tags: 7.0.30-fpm-alpine3.7, 7.0-fpm-alpine3.7
+Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 7.0/alpine3.7/fpm
+
+Tags: 7.0.30-zts-alpine3.7, 7.0-zts-alpine3.7
+Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 7.0/alpine3.7/zts
+
 Tags: 7.0.30-cli-alpine3.4, 7.0-cli-alpine3.4, 7.0.30-alpine3.4, 7.0-alpine3.4, 7.0.30-cli-alpine, 7.0-cli-alpine, 7.0.30-alpine, 7.0-alpine
 Architectures: amd64
 GitCommit: b045ba7c51ceed8a495beb8ea7274df48a3c70e1
@@ -124,6 +194,26 @@
 GitCommit: b045ba7c51ceed8a495beb8ea7274df48a3c70e1
 Directory: 7.0/alpine3.4/zts
 
+Tags: 5.6.36-cli-stretch, 5.6-cli-stretch, 5-cli-stretch, 5.6.36-stretch, 5.6-stretch, 5-stretch
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 5.6/stretch/cli
+
+Tags: 5.6.36-apache-stretch, 5.6-apache-stretch, 5-apache-stretch
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 5.6/stretch/apache
+
+Tags: 5.6.36-fpm-stretch, 5.6-fpm-stretch, 5-fpm-stretch
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 5.6/stretch/fpm
+
+Tags: 5.6.36-zts-stretch, 5.6-zts-stretch, 5-zts-stretch
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 5.6/stretch/zts
+
 Tags: 5.6.36-cli-jessie, 5.6-cli-jessie, 5-cli-jessie, 5.6.36-jessie, 5.6-jessie, 5-jessie, 5.6.36-cli, 5.6-cli, 5-cli, 5.6.36, 5.6, 5
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: b045ba7c51ceed8a495beb8ea7274df48a3c70e1
@@ -144,6 +234,21 @@
 GitCommit: b045ba7c51ceed8a495beb8ea7274df48a3c70e1
 Directory: 5.6/jessie/zts
 
+Tags: 5.6.36-cli-alpine3.7, 5.6-cli-alpine3.7, 5-cli-alpine3.7, 5.6.36-alpine3.7, 5.6-alpine3.7, 5-alpine3.7
+Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 5.6/alpine3.7/cli
+
+Tags: 5.6.36-fpm-alpine3.7, 5.6-fpm-alpine3.7, 5-fpm-alpine3.7
+Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 5.6/alpine3.7/fpm
+
+Tags: 5.6.36-zts-alpine3.7, 5.6-zts-alpine3.7, 5-zts-alpine3.7
+Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
+GitCommit: e28efa5c65a85e4ff3eaf34a336b4bc9e5189fc9
+Directory: 5.6/alpine3.7/zts
+
 Tags: 5.6.36-cli-alpine3.4, 5.6-cli-alpine3.4, 5-cli-alpine3.4, 5.6.36-alpine3.4, 5.6-alpine3.4, 5-alpine3.4, 5.6.36-cli-alpine, 5.6-cli-alpine, 5-cli-alpine, 5.6.36-alpine, 5.6-alpine, 5-alpine
 Architectures: amd64
 GitCommit: b045ba7c51ceed8a495beb8ea7274df48a3c70e1

sylus · 2018-05-17T22:16:06Z

Thank you so much for doing this, can definitely appreciate the effort put in! 🥇

…retch

yosifkit · 2018-05-21T20:52:04Z

Green! 🍏 📗 💚 🥗 🇬🇱

tianon · 2018-05-21T23:28:51Z

Here's an easier diff to review:

$ GIT_PAGER=cat git diff --find-copies-harder docker-library/master...infosiftr/in-your-base
diff --git a/.travis.yml b/.travis.yml
index 76cdc10..60b89fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,24 +12,45 @@ env:
   - VERSION=7.2 VARIANT=alpine3.6/cli
   - VERSION=7.2 VARIANT=alpine3.6/fpm
   - VERSION=7.2 VARIANT=alpine3.6/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.7/cli
+  - VERSION=7.1 VARIANT=alpine3.7/fpm
+  - VERSION=7.1 VARIANT=alpine3.7/zts
   - VERSION=7.1 VARIANT=alpine3.4/cli
   - VERSION=7.1 VARIANT=alpine3.4/fpm
   - VERSION=7.1 VARIANT=alpine3.4/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=7.0 VARIANT=alpine3.4/cli
   - VERSION=7.0 VARIANT=alpine3.4/fpm
   - VERSION=7.0 VARIANT=alpine3.4/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.7/cli
+  - VERSION=5.6 VARIANT=alpine3.7/fpm
+  - VERSION=5.6 VARIANT=alpine3.7/zts
   - VERSION=5.6 VARIANT=alpine3.4/cli
   - VERSION=5.6 VARIANT=alpine3.4/fpm
   - VERSION=5.6 VARIANT=alpine3.4/zts
diff --git a/5.6/alpine3.4/cli/Dockerfile b/5.6/alpine3.7/cli/Dockerfile
similarity index 99%
copy from 5.6/alpine3.4/cli/Dockerfile
copy to 5.6/alpine3.7/cli/Dockerfile
index fe4f716..8436caa 100644
--- a/5.6/alpine3.4/cli/Dockerfile
+++ b/5.6/alpine3.7/cli/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.4
+FROM alpine:3.7
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -26,7 +26,7 @@ RUN apk add --no-cache --virtual .persistent-deps \
 		tar \
 		xz \
 # https://github.com/docker-library/php/issues/494
-		openssl
+		libressl
 
 # ensure www-data user exists
 RUN set -x \
@@ -97,7 +97,7 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		openssl-dev \
+		libressl-dev \
 		libxml2-dev \
 		sqlite-dev \
 	\
diff --git a/5.6/alpine3.4/cli/docker-php-entrypoint b/5.6/alpine3.7/cli/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-entrypoint
copy to 5.6/alpine3.7/cli/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/5.6/alpine3.7/cli/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 5.6/alpine3.7/cli/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/5.6/alpine3.7/cli/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 5.6/alpine3.7/cli/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/5.6/alpine3.7/cli/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 5.6/alpine3.7/cli/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/5.6/alpine3.7/cli/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 5.6/alpine3.7/cli/docker-php-source
diff --git a/5.6/alpine3.4/fpm/Dockerfile b/5.6/alpine3.7/fpm/Dockerfile
similarity index 99%
copy from 5.6/alpine3.4/fpm/Dockerfile
copy to 5.6/alpine3.7/fpm/Dockerfile
index 3cab917..3b61d37 100644
--- a/5.6/alpine3.4/fpm/Dockerfile
+++ b/5.6/alpine3.7/fpm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.4
+FROM alpine:3.7
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -26,7 +26,7 @@ RUN apk add --no-cache --virtual .persistent-deps \
 		tar \
 		xz \
 # https://github.com/docker-library/php/issues/494
-		openssl
+		libressl
 
 # ensure www-data user exists
 RUN set -x \
@@ -98,7 +98,7 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		openssl-dev \
+		libressl-dev \
 		libxml2-dev \
 		sqlite-dev \
 	\
diff --git a/5.6/alpine3.4/fpm/docker-php-entrypoint b/5.6/alpine3.7/fpm/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/fpm/docker-php-entrypoint
copy to 5.6/alpine3.7/fpm/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/5.6/alpine3.7/fpm/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 5.6/alpine3.7/fpm/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/5.6/alpine3.7/fpm/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 5.6/alpine3.7/fpm/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/5.6/alpine3.7/fpm/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 5.6/alpine3.7/fpm/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/5.6/alpine3.7/fpm/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 5.6/alpine3.7/fpm/docker-php-source
diff --git a/5.6/alpine3.4/zts/Dockerfile b/5.6/alpine3.7/zts/Dockerfile
similarity index 99%
copy from 5.6/alpine3.4/zts/Dockerfile
copy to 5.6/alpine3.7/zts/Dockerfile
index 8817696..a26bce6 100644
--- a/5.6/alpine3.4/zts/Dockerfile
+++ b/5.6/alpine3.7/zts/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.4
+FROM alpine:3.7
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -26,7 +26,7 @@ RUN apk add --no-cache --virtual .persistent-deps \
 		tar \
 		xz \
 # https://github.com/docker-library/php/issues/494
-		openssl
+		libressl
 
 # ensure www-data user exists
 RUN set -x \
@@ -98,7 +98,7 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		openssl-dev \
+		libressl-dev \
 		libxml2-dev \
 		sqlite-dev \
 	\
diff --git a/5.6/alpine3.4/cli/docker-php-entrypoint b/5.6/alpine3.7/zts/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-entrypoint
copy to 5.6/alpine3.7/zts/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/5.6/alpine3.7/zts/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 5.6/alpine3.7/zts/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/5.6/alpine3.7/zts/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 5.6/alpine3.7/zts/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/5.6/alpine3.7/zts/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 5.6/alpine3.7/zts/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/5.6/alpine3.7/zts/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 5.6/alpine3.7/zts/docker-php-source
diff --git a/5.6/jessie/apache/Dockerfile b/5.6/stretch/apache/Dockerfile
similarity index 99%
copy from 5.6/jessie/apache/Dockerfile
copy to 5.6/stretch/apache/Dockerfile
index b8c1735..bce2be7 100644
--- a/5.6/jessie/apache/Dockerfile
+++ b/5.6/stretch/apache/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:jessie
+FROM debian:stretch-slim
 
 # prevent Debian's PHP packages from being installed
 # https://github.com/docker-library/php/pull/542
@@ -166,7 +166,7 @@ RUN set -eux; \
 		libcurl4-openssl-dev \
 		libedit-dev \
 		libsqlite3-dev \
-		libssl-dev \
+		libssl1.0-dev \
 		libxml2-dev \
 		zlib1g-dev \
 		${PHP_EXTRA_BUILD_DEPS:-} \
diff --git a/5.6/jessie/apache/apache2-foreground b/5.6/stretch/apache/apache2-foreground
similarity index 100%
copy from 5.6/jessie/apache/apache2-foreground
copy to 5.6/stretch/apache/apache2-foreground
diff --git a/5.6/jessie/apache/docker-php-entrypoint b/5.6/stretch/apache/docker-php-entrypoint
similarity index 100%
copy from 5.6/jessie/apache/docker-php-entrypoint
copy to 5.6/stretch/apache/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/5.6/stretch/apache/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 5.6/stretch/apache/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/5.6/stretch/apache/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 5.6/stretch/apache/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/5.6/stretch/apache/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 5.6/stretch/apache/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/5.6/stretch/apache/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 5.6/stretch/apache/docker-php-source
diff --git a/5.6/jessie/cli/Dockerfile b/5.6/stretch/cli/Dockerfile
similarity index 99%
copy from 5.6/jessie/cli/Dockerfile
copy to 5.6/stretch/cli/Dockerfile
index f5b92ea..49a5f8a 100644
--- a/5.6/jessie/cli/Dockerfile
+++ b/5.6/stretch/cli/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:jessie
+FROM debian:stretch-slim
 
 # prevent Debian's PHP packages from being installed
 # https://github.com/docker-library/php/pull/542
@@ -107,7 +107,7 @@ RUN set -eux; \
 		libcurl4-openssl-dev \
 		libedit-dev \
 		libsqlite3-dev \
-		libssl-dev \
+		libssl1.0-dev \
 		libxml2-dev \
 		zlib1g-dev \
 		${PHP_EXTRA_BUILD_DEPS:-} \
diff --git a/5.6/alpine3.4/cli/docker-php-entrypoint b/5.6/stretch/cli/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-entrypoint
copy to 5.6/stretch/cli/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/5.6/stretch/cli/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 5.6/stretch/cli/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/5.6/stretch/cli/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 5.6/stretch/cli/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/5.6/stretch/cli/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 5.6/stretch/cli/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/5.6/stretch/cli/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 5.6/stretch/cli/docker-php-source
diff --git a/5.6/jessie/fpm/Dockerfile b/5.6/stretch/fpm/Dockerfile
similarity index 99%
copy from 5.6/jessie/fpm/Dockerfile
copy to 5.6/stretch/fpm/Dockerfile
index 4ef982f..821385d 100644
--- a/5.6/jessie/fpm/Dockerfile
+++ b/5.6/stretch/fpm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:jessie
+FROM debian:stretch-slim
 
 # prevent Debian's PHP packages from being installed
 # https://github.com/docker-library/php/pull/542
@@ -108,7 +108,7 @@ RUN set -eux; \
 		libcurl4-openssl-dev \
 		libedit-dev \
 		libsqlite3-dev \
-		libssl-dev \
+		libssl1.0-dev \
 		libxml2-dev \
 		zlib1g-dev \
 		${PHP_EXTRA_BUILD_DEPS:-} \
diff --git a/5.6/alpine3.4/fpm/docker-php-entrypoint b/5.6/stretch/fpm/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/fpm/docker-php-entrypoint
copy to 5.6/stretch/fpm/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/5.6/stretch/fpm/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 5.6/stretch/fpm/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/5.6/stretch/fpm/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 5.6/stretch/fpm/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/5.6/stretch/fpm/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 5.6/stretch/fpm/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/5.6/stretch/fpm/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 5.6/stretch/fpm/docker-php-source
diff --git a/5.6/jessie/zts/Dockerfile b/5.6/stretch/zts/Dockerfile
similarity index 99%
copy from 5.6/jessie/zts/Dockerfile
copy to 5.6/stretch/zts/Dockerfile
index 3d7cf52..31f8517 100644
--- a/5.6/jessie/zts/Dockerfile
+++ b/5.6/stretch/zts/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:jessie
+FROM debian:stretch-slim
 
 # prevent Debian's PHP packages from being installed
 # https://github.com/docker-library/php/pull/542
@@ -108,7 +108,7 @@ RUN set -eux; \
 		libcurl4-openssl-dev \
 		libedit-dev \
 		libsqlite3-dev \
-		libssl-dev \
+		libssl1.0-dev \
 		libxml2-dev \
 		zlib1g-dev \
 		${PHP_EXTRA_BUILD_DEPS:-} \
diff --git a/5.6/alpine3.4/cli/docker-php-entrypoint b/5.6/stretch/zts/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-entrypoint
copy to 5.6/stretch/zts/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/5.6/stretch/zts/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 5.6/stretch/zts/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/5.6/stretch/zts/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 5.6/stretch/zts/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/5.6/stretch/zts/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 5.6/stretch/zts/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/5.6/stretch/zts/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 5.6/stretch/zts/docker-php-source
diff --git a/7.0/alpine3.4/cli/Dockerfile b/7.0/alpine3.7/cli/Dockerfile
similarity index 99%
copy from 7.0/alpine3.4/cli/Dockerfile
copy to 7.0/alpine3.7/cli/Dockerfile
index cbf1137..44ecb55 100644
--- a/7.0/alpine3.4/cli/Dockerfile
+++ b/7.0/alpine3.7/cli/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.4
+FROM alpine:3.7
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -26,7 +26,7 @@ RUN apk add --no-cache --virtual .persistent-deps \
 		tar \
 		xz \
 # https://github.com/docker-library/php/issues/494
-		openssl
+		libressl
 
 # ensure www-data user exists
 RUN set -x \
@@ -97,7 +97,7 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		openssl-dev \
+		libressl-dev \
 		libxml2-dev \
 		sqlite-dev \
 	\
diff --git a/5.6/alpine3.4/cli/docker-php-entrypoint b/7.0/alpine3.7/cli/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-entrypoint
copy to 7.0/alpine3.7/cli/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/7.0/alpine3.7/cli/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 7.0/alpine3.7/cli/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/7.0/alpine3.7/cli/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 7.0/alpine3.7/cli/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/7.0/alpine3.7/cli/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 7.0/alpine3.7/cli/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/7.0/alpine3.7/cli/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 7.0/alpine3.7/cli/docker-php-source
diff --git a/7.0/alpine3.4/fpm/Dockerfile b/7.0/alpine3.7/fpm/Dockerfile
similarity index 99%
copy from 7.0/alpine3.4/fpm/Dockerfile
copy to 7.0/alpine3.7/fpm/Dockerfile
index 4d3d812..1a19d7e 100644
--- a/7.0/alpine3.4/fpm/Dockerfile
+++ b/7.0/alpine3.7/fpm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.4
+FROM alpine:3.7
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -26,7 +26,7 @@ RUN apk add --no-cache --virtual .persistent-deps \
 		tar \
 		xz \
 # https://github.com/docker-library/php/issues/494
-		openssl
+		libressl
 
 # ensure www-data user exists
 RUN set -x \
@@ -98,7 +98,7 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		openssl-dev \
+		libressl-dev \
 		libxml2-dev \
 		sqlite-dev \
 	\
diff --git a/5.6/alpine3.4/fpm/docker-php-entrypoint b/7.0/alpine3.7/fpm/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/fpm/docker-php-entrypoint
copy to 7.0/alpine3.7/fpm/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/7.0/alpine3.7/fpm/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 7.0/alpine3.7/fpm/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/7.0/alpine3.7/fpm/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 7.0/alpine3.7/fpm/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/7.0/alpine3.7/fpm/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 7.0/alpine3.7/fpm/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/7.0/alpine3.7/fpm/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 7.0/alpine3.7/fpm/docker-php-source
diff --git a/7.0/alpine3.4/zts/Dockerfile b/7.0/alpine3.7/zts/Dockerfile
similarity index 99%
copy from 7.0/alpine3.4/zts/Dockerfile
copy to 7.0/alpine3.7/zts/Dockerfile
index 1ac8abd..b6530f5 100644
--- a/7.0/alpine3.4/zts/Dockerfile
+++ b/7.0/alpine3.7/zts/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.4
+FROM alpine:3.7
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -26,7 +26,7 @@ RUN apk add --no-cache --virtual .persistent-deps \
 		tar \
 		xz \
 # https://github.com/docker-library/php/issues/494
-		openssl
+		libressl
 
 # ensure www-data user exists
 RUN set -x \
@@ -98,7 +98,7 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		openssl-dev \
+		libressl-dev \
 		libxml2-dev \
 		sqlite-dev \
 	\
diff --git a/5.6/alpine3.4/cli/docker-php-entrypoint b/7.0/alpine3.7/zts/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-entrypoint
copy to 7.0/alpine3.7/zts/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/7.0/alpine3.7/zts/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 7.0/alpine3.7/zts/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/7.0/alpine3.7/zts/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 7.0/alpine3.7/zts/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/7.0/alpine3.7/zts/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 7.0/alpine3.7/zts/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/7.0/alpine3.7/zts/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 7.0/alpine3.7/zts/docker-php-source
diff --git a/7.0/jessie/apache/Dockerfile b/7.0/stretch/apache/Dockerfile
similarity index 99%
copy from 7.0/jessie/apache/Dockerfile
copy to 7.0/stretch/apache/Dockerfile
index c44ca5d..d6e95da 100644
--- a/7.0/jessie/apache/Dockerfile
+++ b/7.0/stretch/apache/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:jessie
+FROM debian:stretch-slim
 
 # prevent Debian's PHP packages from being installed
 # https://github.com/docker-library/php/pull/542
diff --git a/5.6/jessie/apache/apache2-foreground b/7.0/stretch/apache/apache2-foreground
similarity index 100%
copy from 5.6/jessie/apache/apache2-foreground
copy to 7.0/stretch/apache/apache2-foreground
diff --git a/5.6/jessie/apache/docker-php-entrypoint b/7.0/stretch/apache/docker-php-entrypoint
similarity index 100%
copy from 5.6/jessie/apache/docker-php-entrypoint
copy to 7.0/stretch/apache/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/7.0/stretch/apache/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 7.0/stretch/apache/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/7.0/stretch/apache/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 7.0/stretch/apache/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/7.0/stretch/apache/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 7.0/stretch/apache/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/7.0/stretch/apache/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 7.0/stretch/apache/docker-php-source
diff --git a/7.0/jessie/cli/Dockerfile b/7.0/stretch/cli/Dockerfile
similarity index 99%
copy from 7.0/jessie/cli/Dockerfile
copy to 7.0/stretch/cli/Dockerfile
index 9823876..2f5e07b 100644
--- a/7.0/jessie/cli/Dockerfile
+++ b/7.0/stretch/cli/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:jessie
+FROM debian:stretch-slim
 
 # prevent Debian's PHP packages from being installed
 # https://github.com/docker-library/php/pull/542
diff --git a/5.6/alpine3.4/cli/docker-php-entrypoint b/7.0/stretch/cli/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-entrypoint
copy to 7.0/stretch/cli/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/7.0/stretch/cli/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 7.0/stretch/cli/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/7.0/stretch/cli/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 7.0/stretch/cli/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/7.0/stretch/cli/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 7.0/stretch/cli/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/7.0/stretch/cli/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 7.0/stretch/cli/docker-php-source
diff --git a/7.0/jessie/fpm/Dockerfile b/7.0/stretch/fpm/Dockerfile
similarity index 99%
copy from 7.0/jessie/fpm/Dockerfile
copy to 7.0/stretch/fpm/Dockerfile
index a77c056..ed2dce6 100644
--- a/7.0/jessie/fpm/Dockerfile
+++ b/7.0/stretch/fpm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:jessie
+FROM debian:stretch-slim
 
 # prevent Debian's PHP packages from being installed
 # https://github.com/docker-library/php/pull/542
diff --git a/5.6/alpine3.4/fpm/docker-php-entrypoint b/7.0/stretch/fpm/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/fpm/docker-php-entrypoint
copy to 7.0/stretch/fpm/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/7.0/stretch/fpm/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 7.0/stretch/fpm/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/7.0/stretch/fpm/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 7.0/stretch/fpm/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/7.0/stretch/fpm/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 7.0/stretch/fpm/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/7.0/stretch/fpm/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 7.0/stretch/fpm/docker-php-source
diff --git a/7.0/jessie/zts/Dockerfile b/7.0/stretch/zts/Dockerfile
similarity index 99%
copy from 7.0/jessie/zts/Dockerfile
copy to 7.0/stretch/zts/Dockerfile
index eba52dc..d1e1f40 100644
--- a/7.0/jessie/zts/Dockerfile
+++ b/7.0/stretch/zts/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:jessie
+FROM debian:stretch-slim
 
 # prevent Debian's PHP packages from being installed
 # https://github.com/docker-library/php/pull/542
diff --git a/5.6/alpine3.4/cli/docker-php-entrypoint b/7.0/stretch/zts/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-entrypoint
copy to 7.0/stretch/zts/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/7.0/stretch/zts/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 7.0/stretch/zts/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/7.0/stretch/zts/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 7.0/stretch/zts/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/7.0/stretch/zts/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 7.0/stretch/zts/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/7.0/stretch/zts/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 7.0/stretch/zts/docker-php-source
diff --git a/7.1/alpine3.4/cli/Dockerfile b/7.1/alpine3.7/cli/Dockerfile
similarity index 99%
copy from 7.1/alpine3.4/cli/Dockerfile
copy to 7.1/alpine3.7/cli/Dockerfile
index ec3f0a8..1a9ac7c 100644
--- a/7.1/alpine3.4/cli/Dockerfile
+++ b/7.1/alpine3.7/cli/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.4
+FROM alpine:3.7
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -26,7 +26,7 @@ RUN apk add --no-cache --virtual .persistent-deps \
 		tar \
 		xz \
 # https://github.com/docker-library/php/issues/494
-		openssl
+		libressl
 
 # ensure www-data user exists
 RUN set -x \
@@ -97,7 +97,7 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		openssl-dev \
+		libressl-dev \
 		libxml2-dev \
 		sqlite-dev \
 	\
diff --git a/5.6/alpine3.4/cli/docker-php-entrypoint b/7.1/alpine3.7/cli/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-entrypoint
copy to 7.1/alpine3.7/cli/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/7.1/alpine3.7/cli/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 7.1/alpine3.7/cli/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/7.1/alpine3.7/cli/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 7.1/alpine3.7/cli/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/7.1/alpine3.7/cli/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 7.1/alpine3.7/cli/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/7.1/alpine3.7/cli/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 7.1/alpine3.7/cli/docker-php-source
diff --git a/7.1/alpine3.4/fpm/Dockerfile b/7.1/alpine3.7/fpm/Dockerfile
similarity index 99%
copy from 7.1/alpine3.4/fpm/Dockerfile
copy to 7.1/alpine3.7/fpm/Dockerfile
index c05db7c..61c0b3d 100644
--- a/7.1/alpine3.4/fpm/Dockerfile
+++ b/7.1/alpine3.7/fpm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.4
+FROM alpine:3.7
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -26,7 +26,7 @@ RUN apk add --no-cache --virtual .persistent-deps \
 		tar \
 		xz \
 # https://github.com/docker-library/php/issues/494
-		openssl
+		libressl
 
 # ensure www-data user exists
 RUN set -x \
@@ -98,7 +98,7 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		openssl-dev \
+		libressl-dev \
 		libxml2-dev \
 		sqlite-dev \
 	\
diff --git a/5.6/alpine3.4/fpm/docker-php-entrypoint b/7.1/alpine3.7/fpm/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/fpm/docker-php-entrypoint
copy to 7.1/alpine3.7/fpm/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/7.1/alpine3.7/fpm/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 7.1/alpine3.7/fpm/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/7.1/alpine3.7/fpm/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 7.1/alpine3.7/fpm/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/7.1/alpine3.7/fpm/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 7.1/alpine3.7/fpm/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/7.1/alpine3.7/fpm/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 7.1/alpine3.7/fpm/docker-php-source
diff --git a/7.1/alpine3.4/zts/Dockerfile b/7.1/alpine3.7/zts/Dockerfile
similarity index 99%
copy from 7.1/alpine3.4/zts/Dockerfile
copy to 7.1/alpine3.7/zts/Dockerfile
index 52ed5b5..3dee2d6 100644
--- a/7.1/alpine3.4/zts/Dockerfile
+++ b/7.1/alpine3.7/zts/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.4
+FROM alpine:3.7
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
@@ -26,7 +26,7 @@ RUN apk add --no-cache --virtual .persistent-deps \
 		tar \
 		xz \
 # https://github.com/docker-library/php/issues/494
-		openssl
+		libressl
 
 # ensure www-data user exists
 RUN set -x \
@@ -98,7 +98,7 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		openssl-dev \
+		libressl-dev \
 		libxml2-dev \
 		sqlite-dev \
 	\
diff --git a/5.6/alpine3.4/cli/docker-php-entrypoint b/7.1/alpine3.7/zts/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-entrypoint
copy to 7.1/alpine3.7/zts/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/7.1/alpine3.7/zts/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 7.1/alpine3.7/zts/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/7.1/alpine3.7/zts/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 7.1/alpine3.7/zts/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/7.1/alpine3.7/zts/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 7.1/alpine3.7/zts/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/7.1/alpine3.7/zts/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 7.1/alpine3.7/zts/docker-php-source
diff --git a/7.1/jessie/apache/Dockerfile b/7.1/stretch/apache/Dockerfile
similarity index 99%
copy from 7.1/jessie/apache/Dockerfile
copy to 7.1/stretch/apache/Dockerfile
index c1faca3..11e7369 100644
--- a/7.1/jessie/apache/Dockerfile
+++ b/7.1/stretch/apache/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:jessie
+FROM debian:stretch-slim
 
 # prevent Debian's PHP packages from being installed
 # https://github.com/docker-library/php/pull/542
diff --git a/5.6/jessie/apache/apache2-foreground b/7.1/stretch/apache/apache2-foreground
similarity index 100%
copy from 5.6/jessie/apache/apache2-foreground
copy to 7.1/stretch/apache/apache2-foreground
diff --git a/5.6/jessie/apache/docker-php-entrypoint b/7.1/stretch/apache/docker-php-entrypoint
similarity index 100%
copy from 5.6/jessie/apache/docker-php-entrypoint
copy to 7.1/stretch/apache/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/7.1/stretch/apache/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 7.1/stretch/apache/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/7.1/stretch/apache/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 7.1/stretch/apache/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/7.1/stretch/apache/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 7.1/stretch/apache/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/7.1/stretch/apache/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 7.1/stretch/apache/docker-php-source
diff --git a/7.1/jessie/cli/Dockerfile b/7.1/stretch/cli/Dockerfile
similarity index 99%
copy from 7.1/jessie/cli/Dockerfile
copy to 7.1/stretch/cli/Dockerfile
index 8ba2865..6e47c9e 100644
--- a/7.1/jessie/cli/Dockerfile
+++ b/7.1/stretch/cli/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:jessie
+FROM debian:stretch-slim
 
 # prevent Debian's PHP packages from being installed
 # https://github.com/docker-library/php/pull/542
diff --git a/5.6/alpine3.4/cli/docker-php-entrypoint b/7.1/stretch/cli/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-entrypoint
copy to 7.1/stretch/cli/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/7.1/stretch/cli/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 7.1/stretch/cli/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/7.1/stretch/cli/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 7.1/stretch/cli/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/7.1/stretch/cli/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 7.1/stretch/cli/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/7.1/stretch/cli/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 7.1/stretch/cli/docker-php-source
diff --git a/7.1/jessie/fpm/Dockerfile b/7.1/stretch/fpm/Dockerfile
similarity index 99%
copy from 7.1/jessie/fpm/Dockerfile
copy to 7.1/stretch/fpm/Dockerfile
index 0cff575..cf6cb22 100644
--- a/7.1/jessie/fpm/Dockerfile
+++ b/7.1/stretch/fpm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:jessie
+FROM debian:stretch-slim
 
 # prevent Debian's PHP packages from being installed
 # https://github.com/docker-library/php/pull/542
diff --git a/5.6/alpine3.4/fpm/docker-php-entrypoint b/7.1/stretch/fpm/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/fpm/docker-php-entrypoint
copy to 7.1/stretch/fpm/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/7.1/stretch/fpm/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 7.1/stretch/fpm/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/7.1/stretch/fpm/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 7.1/stretch/fpm/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/7.1/stretch/fpm/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 7.1/stretch/fpm/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/7.1/stretch/fpm/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 7.1/stretch/fpm/docker-php-source
diff --git a/7.1/jessie/zts/Dockerfile b/7.1/stretch/zts/Dockerfile
similarity index 99%
copy from 7.1/jessie/zts/Dockerfile
copy to 7.1/stretch/zts/Dockerfile
index b0a7265..7d84490 100644
--- a/7.1/jessie/zts/Dockerfile
+++ b/7.1/stretch/zts/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:jessie
+FROM debian:stretch-slim
 
 # prevent Debian's PHP packages from being installed
 # https://github.com/docker-library/php/pull/542
diff --git a/5.6/alpine3.4/cli/docker-php-entrypoint b/7.1/stretch/zts/docker-php-entrypoint
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-entrypoint
copy to 7.1/stretch/zts/docker-php-entrypoint
diff --git a/5.6/alpine3.4/cli/docker-php-ext-configure b/7.1/stretch/zts/docker-php-ext-configure
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-configure
copy to 7.1/stretch/zts/docker-php-ext-configure
diff --git a/5.6/alpine3.4/cli/docker-php-ext-enable b/7.1/stretch/zts/docker-php-ext-enable
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-enable
copy to 7.1/stretch/zts/docker-php-ext-enable
diff --git a/5.6/alpine3.4/cli/docker-php-ext-install b/7.1/stretch/zts/docker-php-ext-install
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-ext-install
copy to 7.1/stretch/zts/docker-php-ext-install
diff --git a/5.6/alpine3.4/cli/docker-php-source b/7.1/stretch/zts/docker-php-source
similarity index 100%
copy from 5.6/alpine3.4/cli/docker-php-source
copy to 7.1/stretch/zts/docker-php-source
diff --git a/update.sh b/update.sh
index b001269..83e0869 100755
--- a/update.sh
+++ b/update.sh
@@ -168,6 +168,10 @@ for version in "${versions[@]}"; do
 				# sodium is part of php core 7.2+ https://wiki.php.net/rfc/libsodium
 				sed -ri '/sodium/d' "$version/$suite/$variant/Dockerfile"
 			fi
+			if [ "$majorVersion" = '5' -a "$suite" = 'stretch' ]; then
+				# php 5 still needs older ssl
+				sed -ri 's/libssl-dev/libssl1.0-dev/g' "$version/$suite/$variant/Dockerfile"
+			fi
 
 			# remove any _extra_ blank lines created by the deletions above
 			awk '

tianon · 2018-05-21T23:30:48Z

Just for posterity:

+			if [ "$majorVersion" = '5' -a "$suite" = 'stretch' ]; then

This line made me think maybe it should instead be "$suite" != 'jessie' since we'll have the same issue with buster, but buster doesn't have OpenSSL 1.0, so if PHP 5.6 is actually supported long enough for buster (https://secure.php.net/supported-versions.php; ~31 Dec 2018), that'll become an upstream issue blocking the addition of buster+5.6 (since they'll have to patch 5.6 for OpenSSL 1.1+ at that point for us to even consider including it).

tianon · 2018-05-21T23:31:03Z

LGTM (I can hear all the build servers groaning from here)

schmunk42 · 2018-05-22T08:05:20Z

@tianon @yosifkit Are PHP-Tests running for the images built?

I am asking because we had numerous highly esoteric issues with PHP on Alpine. For Yii 2.0 Framework we weren't able to get its test-suite passing on Alpine, which was no problem on Debian.

yosifkit · 2018-05-22T17:37:39Z

We do not usually run the tests since that would greatly increase the already long build time. We do warn on the Hub description that Alpine images might have problems because of their libc implementation:

The main caveat to note is that it does use musl libc instead of glibc and friends, so certain software might run into issues depending on the depth of their libc requirements.

Do you have specific problems that are not reproducible if you use the php packages from Alpine (apk add)? They may have a few patches because of muslc that might be necessary in the image.

Here is a diff of the test failures summary on Alpine vs Debian (using our 7.2-cli builds). Unfortunately, the php packages maintained by Alpine do not run make test, so we can't compare to that (http://build.alpinelinux.org/buildlogs/build-3-7-x86_64/community/php7/php7-7.1.17-r0.log).

diff

--- alpine	2018-05-22 10:15:56.723922338 -0700
+++ deb	2018-05-22 10:16:18.444347589 -0700
@@ -1,161 +1,16 @@
 =====================================================================
 FAILED TEST SUMMARY
 ---------------------------------------------------------------------
-php://input is empty when enable_post_data_reading=Off [tests/basic/bug67198.phpt]
-Bug #12647 (Locale settings affecting float parsing) [tests/lang/034.phpt]
-Bug #30638 (localeconv returns wrong LC_NUMERIC settings) (ok to fail on MacOS X) [tests/lang/bug30638.phpt]
-Bug #27023 (CURLOPT_POSTFIELDS does not parse content types for files) [ext/curl/tests/bug27023.phpt]
-Bug #48203 (Crash when CURLOPT_STDERR is set to regular file) [ext/curl/tests/bug48203.phpt]
-Variation of bug #48203 with curl_multi_exec (Crash when file pointers passed to curl are closed before calling curl_multi_exec) [ext/curl/tests/bug48203_multi.phpt]
-Test curl_setopt() CURLOPT_FILE readonly file handle [ext/curl/tests/bug48207.phpt]
-Bug #54995 (Missing CURLINFO_RESPONSE_CODE support) [ext/curl/tests/bug54995.phpt]
-Test curl_opt() function with POST params from array with a numeric key [ext/curl/tests/bug55767.phpt]
-Bug #66109 (Option CURLOPT_CUSTOMREQUEST can't be reset to default.) [ext/curl/tests/bug66109.phpt]
-Bug # #68937 (Segfault in curl_multi_exec) [ext/curl/tests/bug68937.phpt]
-Bug # #68937 (Segfault in curl_multi_exec) [ext/curl/tests/bug68937_2.phpt]
-Bug #69316: Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER [ext/curl/tests/bug69316.phpt]
-Test CURLOPT_READDATA without a callback function [ext/curl/tests/curl_CURLOPT_READDATA.phpt]
-Test curl_exec() function with basic functionality [ext/curl/tests/curl_basic_001.phpt]
-Test curl_opt() function with CURLOPT_RETURNTRANSFER parameter set to 1 [ext/curl/tests/curl_basic_002.phpt]
-Test curl_opt() function with POST parameters [ext/curl/tests/curl_basic_003.phpt]
-Test curl_opt() function with setting referer [ext/curl/tests/curl_basic_004.phpt]
-Test curl_opt() function with user agent [ext/curl/tests/curl_basic_005.phpt]
-Test curl_opt() function with CURLOPT_WRITEFUNCTION parameter set to a closure [ext/curl/tests/curl_basic_006.phpt]
-Test curl_opt() function with COOKIE [ext/curl/tests/curl_basic_011.phpt]
-Test curl_opt() function with CURLOPT_HTTP_VERSION/CURL_HTTP_VERSION_1_0 [ext/curl/tests/curl_basic_012.phpt]
-Test curl_opt() function with CURLOPT_HTTP_VERSION/CURL_HTTP_VERSION_1_1 [ext/curl/tests/curl_basic_013.phpt]
-Test curl_multi_exec() function with basic functionality [ext/curl/tests/curl_basic_017.phpt]
-Test curl_setopt() with curl_multi function with basic functionality [ext/curl/tests/curl_basic_018.phpt]
-Test curl_getinfo() function with CURLINFO_EFFECTIVE_URL parameter [ext/curl/tests/curl_basic_019.phpt]
-Test curl_getinfo() function with CURLINFO_HTTP_CODE parameter [ext/curl/tests/curl_basic_020.phpt]
-Test curl_getinfo() function with CURLINFO_CONTENT_TYPE parameter [ext/curl/tests/curl_basic_021.phpt]
-Test curl_copy_handle() with simple get [ext/curl/tests/curl_copy_handle_basic_001.phpt]
-Test curl_copy_handle() with simple POST [ext/curl/tests/curl_copy_handle_basic_002.phpt]
-Test curl_copy_handle() after exec() [ext/curl/tests/curl_copy_handle_basic_004.phpt]
-Test curl_copy_handle() after exec() with POST [ext/curl/tests/curl_copy_handle_basic_005.phpt]
-Test curl_copy_handle() with User Agent [ext/curl/tests/curl_copy_handle_basic_006.phpt]
-Test curl_copy_handle() with simple POST [ext/curl/tests/curl_copy_handle_basic_007.phpt]
-Test curl_copy_handle() with CURLOPT_PROGRESSFUNCTION [ext/curl/tests/curl_copy_handle_basic_008.phpt]
-Memory corruption error if fp of just created file is closed before curl_close. [ext/curl/tests/curl_file_deleted_before_curl_close.phpt]
-CURL file uploading [ext/curl/tests/curl_file_upload.phpt]
-Curl_multi_getcontent() basic test with different sources (local file/http) [ext/curl/tests/curl_multi_getcontent_basic3.phpt]
-curl_setopt_array() function - tests setting multiple cURL options with curl_setopt_array() [ext/curl/tests/curl_setopt_array_basic.phpt]
-curl_setopt basic tests with CURLOPT_STDERR. [ext/curl/tests/curl_setopt_basic002.phpt]
-curl_setopt() call with CURLOPT_HTTPHEADER [ext/curl/tests/curl_setopt_basic003.phpt]
-curl_setopt() call with CURLOPT_RETURNTRANSFER [ext/curl/tests/curl_setopt_basic004.phpt]
-Test curl option CURLOPT_HEADERFUNCTION [ext/curl/tests/curl_writeheader_callback.phpt]
-strftime() and gmstrftime() tests [ext/date/tests/009.phpt]
-Bug #27780 (strtotime(+1 xxx) returns a wrong date/time) [ext/date/tests/bug27780.phpt]
-Bug #32555 (strtotime("tomorrow") can return false) [ext/date/tests/bug32555.phpt]
-Bug #33532 (Different output for strftime() and date()) [ext/date/tests/bug33532.phpt]
-Bug #53437 DateInterval unserialize bad data, 64 bit [ext/date/tests/bug53437_var5.phpt]
-Bug #53437 DateInterval unserialize bad data, 64 bit [ext/date/tests/bug53437_var6.phpt]
-Bug #48147 (iconv with //IGNORE cuts the string) [ext/iconv/tests/bug48147.phpt]
-Bug #52211 (iconv() returns part of string on error) [ext/iconv/tests/bug52211.phpt]
-Bug #76249 (stream filter convert.iconv leads to infinite loop on invalid sequence) [ext/iconv/tests/bug76249.phpt]
-EUC-JP to ISO-2022-JP [ext/iconv/tests/eucjp2iso2022jp.phpt]
-EUC-JP to SJIS [ext/iconv/tests/eucjp2sjis.phpt]
-Test iconv() function : basic functionality [ext/iconv/tests/iconv_basic.phpt]
-Test the basics to function iconv. [ext/iconv/tests/iconv_basic_001.phpt]
-iconv_mime_decode() [ext/iconv/tests/iconv_mime_decode.phpt]
-iconv_mime_encode() [ext/iconv/tests/iconv_mime_encode.phpt]
-iconv stream filter [ext/iconv/tests/iconv_stream_filter.phpt]
-iconv stream filter [ext/iconv/tests/iconv_stream_filter_delimiter.phpt]
-iconv_strpos() [ext/iconv/tests/iconv_strpos.phpt]
-iconv_strrpos() [ext/iconv/tests/iconv_strrpos.phpt]
-iconv_substr() [ext/iconv/tests/iconv_substr.phpt]
-ob_iconv_handler() [ext/iconv/tests/ob_iconv_handler.phpt]
-Bug #41403 (json_decode cannot decode floats if localeconv decimal_point is not '.') [ext/json/tests/bug41403.phpt]
-Bug #66338 (Optimization binding of class constants is not safely opcacheable) [ext/opcache/tests/bug66338.phpt]
-ISSUE #115 (path issue when using phar) [ext/opcache/tests/issue0115.phpt]
-ISSUE #149 (Phar mount points not working this OPcache enabled) [ext/opcache/tests/issue0149.phpt]
-revalidate_path 01: OPCache must cache only resolved real paths when revalidate_path is set [ext/opcache/tests/revalidate_path_01.phpt]
-Bug #36732 (add support for req_extensions in openss_csr_new and sign) [ext/openssl/tests/bug36732.phpt]
-Bug #55646: textual input in openssl_csr_new() is not expected in UTF-8 [ext/openssl/tests/bug55646.phpt]
-Bug #72165 Null pointer dereference - openssl_csr_new [ext/openssl/tests/bug72165.phpt]
-openssl_*() with OPENSSL_KEYTYPE_EC [ext/openssl/tests/ecc.phpt]
-openssl_error_string() tests [ext/openssl/tests/openssl_error_string_basic.phpt]
-security_level setting to prohibit cert [ext/openssl/tests/stream_security_level.phpt]
-Localized match [ext/pcre/tests/locales.phpt]
 Test posix_kill(), posix_get_last_error and posix_strerror() functions : basic functionality [ext/posix/tests/posix_kill_basic.phpt]
 Check for libsodium utils [ext/sodium/tests/utils.phpt]
-Sort with SORT_LOCALE_STRING [ext/standard/tests/array/locale_sort.phpt]
-Test BCRYPT with invalid algorithm [ext/standard/tests/crypt/bcrypt_invalid_algorithm.phpt]
-Test BCRYPT with invalid cost [ext/standard/tests/crypt/bcrypt_invalid_cost.phpt]
-Test DES with invalid fallback [ext/standard/tests/crypt/des_fallback_invalid_salt.phpt]
-array dns_get_record ( string $hostname [, int $type = DNS_ANY [, array &$authns [, array &$addtl [, bool &$raw = false ]]]] ); [ext/standard/tests/dns_get_record.phpt]
-Test popen() and pclose function: error conditions [ext/standard/tests/file/popen_pclose_error.phpt]
-Test function getservbyname() by substituting argument 1 with boolean values. [ext/standard/tests/general_functions/getservbyname_variation2.phpt]
-Test function getservbyname() by substituting argument 1 with int values. [ext/standard/tests/general_functions/getservbyname_variation5.phpt]
+Test function getservbyname() [ext/standard/tests/general_functions/getservbyname_basic.phpt]
+Test function getservbyport() by calling it more than or less than its expected arguments [ext/standard/tests/general_functions/getservbyport_basic.phpt]
 Test function getservbyport() by calling it more than or less than its expected arguments [ext/standard/tests/general_functions/getservbyport_variation1.phpt]
 proc_nice() basic behaviour [ext/standard/tests/general_functions/proc_nice_basic.phpt]
 dns_get_record() CAA tests [ext/standard/tests/network/dns_get_record_caa.phpt]
-int stream_socket_sendto ( resource $socket , string $data [, int $flags = 0 [, string $address ]] ); [ext/standard/tests/streams/stream_socket_sendto.phpt]
-php_strip_whitespace() and output buffer [ext/standard/tests/strings/007.phpt]
-Bug #51059 crypt() segfaults on certain salts [ext/standard/tests/strings/bug51059.phpt]
-Official blowfish tests (http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/glibc/crypt_blowfish/wrapper.c) [ext/standard/tests/strings/crypt_blowfish.phpt]
-Test Blowfish crypt() with invalid rounds [ext/standard/tests/strings/crypt_blowfish_variation1.phpt]
-Test Blowfish crypt() does not fall back to DES when rounds are not specified,
-or Blowfish is not available. [ext/standard/tests/strings/crypt_blowfish_variation2.phpt]
-crypt(): *0 should return *1 [ext/standard/tests/strings/crypt_des_error.phpt]
-htmlentities() test 2 (setlocale / fr_FR.ISO-8859-15) [ext/standard/tests/strings/htmlentities02.phpt]
-htmlentities() test 4 (setlocale / ja_JP.EUC-JP) [ext/standard/tests/strings/htmlentities04.phpt]
-htmlentities() test 15 (setlocale / KOI8-R) [ext/standard/tests/strings/htmlentities15.phpt]
-money_format test [ext/standard/tests/strings/moneyformat.phpt]
-Test setlocale() function : basic functionality - setting system locale to a specific [ext/standard/tests/strings/setlocale_basic1.phpt]
-Test setlocale() function : basic functionality - set locale using an array [ext/standard/tests/strings/setlocale_basic2.phpt]
-Test setlocale() function : basic functionality - passing multiple locales as argument [ext/standard/tests/strings/setlocale_basic3.phpt]
-Test setlocale() function : error condition [ext/standard/tests/strings/setlocale_error.phpt]
-Test setlocale() function : usage variations - passing multiple valid/invlaid locales as argument [ext/standard/tests/strings/setlocale_variation1.phpt]
-Test setlocale() function : usage variations - Setting all available locales in the platform [ext/standard/tests/strings/setlocale_variation2.phpt]
-Test setlocale() function : usage variations - setting system locale = 0 [ext/standard/tests/strings/setlocale_variation3.phpt]
-Test setlocale() function : usage variations - setting system locale as null [ext/standard/tests/strings/setlocale_variation4.phpt]
-Test setlocale() function : usage variations - Setting system locale as empty string [ext/standard/tests/strings/setlocale_variation5.phpt]
-sprintf %f #3 [ext/standard/tests/strings/sprintf_f_3.phpt]
-Test strtoupper on non-ASCII characters [ext/standard/tests/strings/strtoupper.phpt]
-Test strptime() function : basic functionality [ext/standard/tests/time/strptime_basic.phpt]
-Test strptime() function : basic functionality [ext/standard/tests/time/strptime_parts.phpt]
-Test get_headers() function : test with context [ext/standard/tests/url/get_headers_error_003.phpt]
-Bug #61977 Test exit code for various errors [sapi/cli/tests/bug43177.phpt]
-Bug #61679 (Error on non-standard HTTP methods) [sapi/cli/tests/bug61679.phpt]
-Bug #61977 test CLI web-server support for Mime Type File extensions mapping [sapi/cli/tests/bug61977.phpt]
-Bug #64878 (304 responses return Content-Type header) [sapi/cli/tests/bug64878.phpt]
-Bug #65066 (Cli server not responsive when responding with 422 http status code): 100 status code [sapi/cli/tests/bug65066_100.phpt]
-Bug #65066 (Cli server not responsive when responding with 422 http status code): 422 status code [sapi/cli/tests/bug65066_422.phpt]
-Bug #65066 (Cli server not responsive when responding with 422 http status code): 511 status code [sapi/cli/tests/bug65066_511.phpt]
-Bug #65633 (built-in server treat some http headers as case-sensitive) [sapi/cli/tests/bug65633.phpt]
-Bug #66606 (Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE) - GET request [sapi/cli/tests/bug66606_1.phpt]
-Bug #66606 (Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE) - POST request [sapi/cli/tests/bug66606_2.phpt]
-Bug #66830 (Empty header causes PHP built-in web server to hang) [sapi/cli/tests/bug66830.phpt]
-FR #67429 (CLI server is missing some new HTTP response codes) [sapi/cli/tests/bug67429.phpt]
-Bug #68291 (404 on urls with '+') [sapi/cli/tests/bug68291.phpt]
-Bug #68745 (Invalid HTTP requests make web server segfault) [sapi/cli/tests/bug68745.phpt]
-Bug #69655 (php -S changes MKCALENDAR request method to MKCOL) [sapi/cli/tests/bug69655.phpt]
-FR #69953 (Support MKCALENDAR request method) [sapi/cli/tests/bug69953.phpt]
-Bug #70264 (CLI server directory traversal) [sapi/cli/tests/bug70264.phpt]
-Bug #70470 (Built-in server truncates headers spanning over TCP packets) [sapi/cli/tests/bug70470.phpt]
-Bug #71005 (Segfault in php_cli_server_dispatch_router()) [sapi/cli/tests/bug71005.phpt]
+getprotobyname function basic test [ext/standard/tests/network/getprotobyname_basic.phpt]
+getprotobynumber function basic test [ext/standard/tests/network/getprotobynumber_basic.phpt]
 Check cli_process_title support on Unix [sapi/cli/tests/cli_process_title_unix.phpt]
-Correctly handle split and empty header [sapi/cli/tests/emptyheader.phpt]
-basic function [sapi/cli/tests/php_cli_server_001.phpt]
-$_SERVER variable [sapi/cli/tests/php_cli_server_002.phpt]
-Bug #55726 (Changing the working directory makes router script inaccessible) [sapi/cli/tests/php_cli_server_003.phpt]
-Bug #55747 (request headers missed in $_SERVER) [sapi/cli/tests/php_cli_server_004.phpt]
-Post a file [sapi/cli/tests/php_cli_server_005.phpt]
-Bug #55755 (SegFault when outputting header WWW-Authenticate) [sapi/cli/tests/php_cli_server_006.phpt]
-Bug #55758 (Digest Authenticate missed in 5.4) [sapi/cli/tests/php_cli_server_007.phpt]
-SERVER_PROTOCOL header availability [sapi/cli/tests/php_cli_server_008.phpt]
-PATH_INFO (relevant to #60112) [sapi/cli/tests/php_cli_server_009.phpt]
-Bug #60180 ($_SERVER["PHP_SELF"] incorrect) [sapi/cli/tests/php_cli_server_010.phpt]
-Bug #60159 (Router returns false, but POST is not passed to requested resource) [sapi/cli/tests/php_cli_server_012.phpt]
-No router, no script [sapi/cli/tests/php_cli_server_013.phpt]
-Bug #60477: Segfault after two multipart/form-data POST requestes [sapi/cli/tests/php_cli_server_014.phpt]
-Bug #60523 (PHP Errors are not reported in browsers using built-in SAPI) [sapi/cli/tests/php_cli_server_015.phpt]
-Bug #60591 (Memory leak when access a non-exists file) [sapi/cli/tests/php_cli_server_016.phpt]
-Implement Req #60850 (Built in web server does not set $_SERVER['SCRIPT_FILENAME'] when using router) [sapi/cli/tests/php_cli_server_017.phpt]
-Implement Req #61679 (Support HTTP PATCH method) [sapi/cli/tests/php_cli_server_018.phpt]
-Implement Req #65917 (getallheaders() is not supported by the built-in web server) [sapi/cli/tests/php_cli_server_019.phpt]
-Use SEARCH as a HTTP verb [sapi/cli/tests/php_cli_server_020.phpt]
 FPM: version string [sapi/fpm/tests/001.phpt]
 FPM: Startup and connect [sapi/fpm/tests/002.phpt]
 FPM: Test IPv6 support [sapi/fpm/tests/003.phpt]

- `busybox`: 1.28.4 - `cassandra`: arm64v8 on 2.1 (docker-library/cassandra#147) - `ghost`: 1.23.0 - `haproxy`: 1.8.9 - `mariadb`: extra `mysqld` flags to `mysql_install_db` (MariaDB/mariadb-docker#168) - `mongo`: 3.6.5, 4.0.0-rc0, move 4.0-rc and 3.7 to Xenial (docker-library/mongo#275) - `php`: remove Alpine 3.4 (docker-library/php#650), add Stretch and Alpine 3.7 variants (docker-library/php#646) - `postgres`: 10.4, 9.3.23, 9.4.18, 9.5.13, 9.6.9 - `python`: remove Alpine 3.4, add Alpine 3.7 (docker-library/python#290) - `rocket.chat`: 0.64.2 - `ruby`: remove Alpine 3.4, add Alpine 3.7 (docker-library/ruby#210), remove 2.2 (EOL; https://www.ruby-lang.org/en/downloads/branches/)

schmunk42 · 2018-05-24T13:16:48Z

@yosifkit Thank you for the reply, in fact I didn't notice the part in the README yet :)

The broken tests I was referring to were related to date calculation in different timezones, but we also had weird issues with nginx on Alpine. Nothing which was easily solvable with apk.

I think people have to live with it when using Alpine.

tszymanek · 2018-07-04T12:47:57Z

Moving debian distros from jessie to stretch-slim is a major B/C for those who maintaned custom Dockerfiles using php-7.0 debian images. This should be resolved differently - at least don't make the tags point to the newer builds and/or encourage developers to use the more narrow tags. Also deprecate the older images but maintain them for a while.

yosifkit · 2018-07-05T22:46:24Z

@tszymanek, yes, that is why I had opened #504 to discuss how to handle the transition. We then went ahead with #507 to tag the PHP images with their distro (ex: php:7.0-jessie and php:7.2-alpine3.6). We still have these tags and they will be updated for a time; we have yet to set a firm timeline on how long we will maintain multiple sets of images (ie, jessie and stretch).

tianon · 2018-07-05T23:12:29Z

It's also worth noting that Jessie is no longer supported by the Debian Security Team.

yosifkit added 3 commits May 18, 2018 10:02

Add Dockerfiles for newer base OSs

53040bf

Add docker-php-* scripts for new images

27c65bb

Add missing apache-foreground scripts, swap ssl version for 5.6 on st…

78125d0

…retch

yosifkit force-pushed the in-your-base branch from e28efa5 to 78125d0 Compare May 18, 2018 17:17

yosifkit assigned tianon May 21, 2018

tianon merged commit 72f2e43 into docker-library:master May 21, 2018

tianon deleted the in-your-base branch May 21, 2018 23:31

michael-k mentioned this pull request May 22, 2018

Alpine 3.4 reaches its EOL on 2018-05-01, how to proceed with alpine tags aliasing alpine3.4? docker-library/official-images#4275

Closed

6 tasks

tianon mentioned this pull request May 23, 2018

Update docker-library images docker-library/official-images#4385

Merged

tilosp mentioned this pull request May 24, 2018

Move to a debian stretch and alpine 3.7 based base image nextcloud/docker#342

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add stretch and alpine 3.7 variants for 5.6, 7.0 and 7.1. #646

Add stretch and alpine 3.7 variants for 5.6, 7.0 and 7.1. #646

yosifkit commented May 17, 2018

sylus commented May 17, 2018

yosifkit commented May 21, 2018

tianon commented May 21, 2018

tianon commented May 21, 2018

tianon commented May 21, 2018

schmunk42 commented May 22, 2018

yosifkit commented May 22, 2018

schmunk42 commented May 24, 2018

tszymanek commented Jul 4, 2018

yosifkit commented Jul 5, 2018

tianon commented Jul 5, 2018 via email

Add stretch and alpine 3.7 variants for 5.6, 7.0 and 7.1. #646

Add stretch and alpine 3.7 variants for 5.6, 7.0 and 7.1. #646

Conversation

yosifkit commented May 17, 2018

sylus commented May 17, 2018

yosifkit commented May 21, 2018

tianon commented May 21, 2018

tianon commented May 21, 2018

tianon commented May 21, 2018

schmunk42 commented May 22, 2018

yosifkit commented May 22, 2018

schmunk42 commented May 24, 2018

tszymanek commented Jul 4, 2018

yosifkit commented Jul 5, 2018

tianon commented Jul 5, 2018 via email