Revert "Upgrade alpine to v3.5"

tianon · web-flow · commit 3ac528cf10d4 · 2017-01-05T10:06:53.000-08:00
diff --git a/5.6/alpine/Dockerfile b/5.6/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.5
+FROM alpine:3.4
 
 # persistent / runtime deps
 ENV PHPIZE_DEPS \
@@ -57,7 +57,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		libressl \
+		openssl \
 	; \
 	\
 	mkdir -p /usr/src; \
@@ -91,8 +91,8 @@ RUN set -xe \
 		$PHPIZE_DEPS \
 		curl-dev \
 		libedit-dev \
-		libressl-dev \
 		libxml2-dev \
+		openssl-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/5.6/fpm/alpine/Dockerfile b/5.6/fpm/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.5
+FROM alpine:3.4
 
 # persistent / runtime deps
 ENV PHPIZE_DEPS \
@@ -58,7 +58,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		libressl \
+		openssl \
 	; \
 	\
 	mkdir -p /usr/src; \
@@ -92,8 +92,8 @@ RUN set -xe \
 		$PHPIZE_DEPS \
 		curl-dev \
 		libedit-dev \
-		libressl-dev \
 		libxml2-dev \
+		openssl-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/5.6/zts/alpine/Dockerfile b/5.6/zts/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.5
+FROM alpine:3.4
 
 # persistent / runtime deps
 ENV PHPIZE_DEPS \
@@ -58,7 +58,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		libressl \
+		openssl \
 	; \
 	\
 	mkdir -p /usr/src; \
@@ -92,8 +92,8 @@ RUN set -xe \
 		$PHPIZE_DEPS \
 		curl-dev \
 		libedit-dev \
-		libressl-dev \
 		libxml2-dev \
+		openssl-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/7.0/alpine/Dockerfile b/7.0/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.5
+FROM alpine:3.4
 
 # persistent / runtime deps
 ENV PHPIZE_DEPS \
@@ -57,7 +57,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		libressl \
+		openssl \
 	; \
 	\
 	mkdir -p /usr/src; \
@@ -91,8 +91,8 @@ RUN set -xe \
 		$PHPIZE_DEPS \
 		curl-dev \
 		libedit-dev \
-		libressl-dev \
 		libxml2-dev \
+		openssl-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/7.0/fpm/alpine/Dockerfile b/7.0/fpm/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.5
+FROM alpine:3.4
 
 # persistent / runtime deps
 ENV PHPIZE_DEPS \
@@ -58,7 +58,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		libressl \
+		openssl \
 	; \
 	\
 	mkdir -p /usr/src; \
@@ -92,8 +92,8 @@ RUN set -xe \
 		$PHPIZE_DEPS \
 		curl-dev \
 		libedit-dev \
-		libressl-dev \
 		libxml2-dev \
+		openssl-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/7.0/zts/alpine/Dockerfile b/7.0/zts/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.5
+FROM alpine:3.4
 
 # persistent / runtime deps
 ENV PHPIZE_DEPS \
@@ -58,7 +58,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		libressl \
+		openssl \
 	; \
 	\
 	mkdir -p /usr/src; \
@@ -92,8 +92,8 @@ RUN set -xe \
 		$PHPIZE_DEPS \
 		curl-dev \
 		libedit-dev \
-		libressl-dev \
 		libxml2-dev \
+		openssl-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/7.1/alpine/Dockerfile b/7.1/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.5
+FROM alpine:3.4
 
 # persistent / runtime deps
 ENV PHPIZE_DEPS \
@@ -57,7 +57,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		libressl \
+		openssl \
 	; \
 	\
 	mkdir -p /usr/src; \
@@ -91,8 +91,8 @@ RUN set -xe \
 		$PHPIZE_DEPS \
 		curl-dev \
 		libedit-dev \
-		libressl-dev \
 		libxml2-dev \
+		openssl-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/7.1/fpm/alpine/Dockerfile b/7.1/fpm/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.5
+FROM alpine:3.4
 
 # persistent / runtime deps
 ENV PHPIZE_DEPS \
@@ -58,7 +58,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		libressl \
+		openssl \
 	; \
 	\
 	mkdir -p /usr/src; \
@@ -92,8 +92,8 @@ RUN set -xe \
 		$PHPIZE_DEPS \
 		curl-dev \
 		libedit-dev \
-		libressl-dev \
 		libxml2-dev \
+		openssl-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/7.1/zts/alpine/Dockerfile b/7.1/zts/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.5
+FROM alpine:3.4
 
 # persistent / runtime deps
 ENV PHPIZE_DEPS \
@@ -58,7 +58,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		libressl \
+		openssl \
 	; \
 	\
 	mkdir -p /usr/src; \
@@ -92,8 +92,8 @@ RUN set -xe \
 		$PHPIZE_DEPS \
 		curl-dev \
 		libedit-dev \
-		libressl-dev \
 		libxml2-dev \
+		openssl-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.4
 
 # persistent / runtime deps
 ENV PHPIZE_DEPS \
@@ -51,7 +51,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		libressl \
+		openssl \
 	; \
 	\
 	mkdir -p /usr/src; \
@@ -85,8 +85,8 @@ RUN set -xe \
 		$PHPIZE_DEPS \
 		curl-dev \
 		libedit-dev \
-		libressl-dev \
 		libxml2-dev \
+		openssl-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# PLEASE DO NOT EDIT IT DIRECTLY.`
`5`	`5`	`#`
`6`	`6`
`7`		`-FROM alpine:3.5`
	`7`	`+FROM alpine:3.4`
`8`	`8`
`9`	`9`	`# persistent / runtime deps`
`10`	`10`	`ENV PHPIZE_DEPS \`
`@@ -57,7 +57,7 @@ RUN set -xe; \`
`57`	`57`	`\`
`58`	`58`	`apk add --no-cache --virtual .fetch-deps \`
`59`	`59`	`gnupg \`
`60`		`- libressl \`
	`60`	`+ openssl \`
`61`	`61`	`; \`
`62`	`62`	`\`
`63`	`63`	`mkdir -p /usr/src; \`
`@@ -91,8 +91,8 @@ RUN set -xe \`
`91`	`91`	`$PHPIZE_DEPS \`
`92`	`92`	`curl-dev \`
`93`	`93`	`libedit-dev \`
`94`		`- libressl-dev \`
`95`	`94`	`libxml2-dev \`
	`95`	`+ openssl-dev \`
`96`	`96`	`sqlite-dev \`
`97`	`97`	`\`
`98`	`98`	`&& export CFLAGS="$PHP_CFLAGS" \`