Swap "openssl" for "libressl" to account for the change in Alpine 3.5

tianon · tianon · commit 58fbb6e660f0 · 2017-01-04T11:00:35.000-08:00
diff --git a/5.6/alpine/Dockerfile b/5.6/alpine/Dockerfile
@@ -57,7 +57,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		openssl \
+		libressl \
 	; \
 	\
 	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
@@ -58,7 +58,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		openssl \
+		libressl \
 	; \
 	\
 	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
@@ -58,7 +58,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		openssl \
+		libressl \
 	; \
 	\
 	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
@@ -57,7 +57,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		openssl \
+		libressl \
 	; \
 	\
 	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
@@ -58,7 +58,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		openssl \
+		libressl \
 	; \
 	\
 	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
@@ -58,7 +58,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		openssl \
+		libressl \
 	; \
 	\
 	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
@@ -57,7 +57,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		openssl \
+		libressl \
 	; \
 	\
 	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
@@ -58,7 +58,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		openssl \
+		libressl \
 	; \
 	\
 	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
@@ -58,7 +58,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		openssl \
+		libressl \
 	; \
 	\
 	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
@@ -51,7 +51,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		openssl \
+		libressl \
 	; \
 	\
 	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
`@@ -57,7 +57,7 @@ RUN set -xe; \`
`57`	`57`	`\`
`58`	`58`	`apk add --no-cache --virtual .fetch-deps \`
`59`	`59`	`gnupg \`
`60`		`- openssl \`
	`60`	`+ libressl \`
`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 \`
`94`	`95`	`libxml2-dev \`
`95`		`- openssl-dev \`
`96`	`96`	`sqlite-dev \`
`97`	`97`	`\`
`98`	`98`	`&& export CFLAGS="$PHP_CFLAGS" \`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ RUN set -xe; \`
`58`	`58`	`\`
`59`	`59`	`apk add --no-cache --virtual .fetch-deps \`
`60`	`60`	`gnupg \`
`61`		`- openssl \`
	`61`	`+ libressl \`
`62`	`62`	`; \`
`63`	`63`	`\`
`64`	`64`	`mkdir -p /usr/src; \`
`@@ -92,8 +92,8 @@ RUN set -xe \`
`92`	`92`	`$PHPIZE_DEPS \`
`93`	`93`	`curl-dev \`
`94`	`94`	`libedit-dev \`
	`95`	`+ libressl-dev \`
`95`	`96`	`libxml2-dev \`
`96`		`- openssl-dev \`
`97`	`97`	`sqlite-dev \`
`98`	`98`	`\`
`99`	`99`	`&& export CFLAGS="$PHP_CFLAGS" \`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ RUN set -xe; \`
`51`	`51`	`\`
`52`	`52`	`apk add --no-cache --virtual .fetch-deps \`
`53`	`53`	`gnupg \`
`54`		`- openssl \`
	`54`	`+ libressl \`
`55`	`55`	`; \`
`56`	`56`	`\`
`57`	`57`	`mkdir -p /usr/src; \`
`@@ -85,8 +85,8 @@ RUN set -xe \`
`85`	`85`	`$PHPIZE_DEPS \`
`86`	`86`	`curl-dev \`
`87`	`87`	`libedit-dev \`
	`88`	`+ libressl-dev \`
`88`	`89`	`libxml2-dev \`
`89`		`- openssl-dev \`
`90`	`90`	`sqlite-dev \`
`91`	`91`	`\`
`92`	`92`	`&& export CFLAGS="$PHP_CFLAGS" \`