Merge pull request #499 from infosiftr/libressl

yosifkit · web-flow · commit 6f86f0f2fff7 · 2017-09-22T15:56:34.000-07:00
Update Alpine 3.6+ to use "libressl" instead of "openssl"
diff --git a/5.6/alpine/Dockerfile b/5.6/alpine/Dockerfile
@@ -94,8 +94,8 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		libxml2-dev \
 		openssl-dev \
+		libxml2-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/5.6/fpm/alpine/Dockerfile b/5.6/fpm/alpine/Dockerfile
@@ -95,8 +95,8 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		libxml2-dev \
 		openssl-dev \
+		libxml2-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/5.6/zts/alpine/Dockerfile b/5.6/zts/alpine/Dockerfile
@@ -95,8 +95,8 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		libxml2-dev \
 		openssl-dev \
+		libxml2-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/7.0/alpine/Dockerfile b/7.0/alpine/Dockerfile
@@ -94,8 +94,8 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		libxml2-dev \
 		openssl-dev \
+		libxml2-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/7.0/fpm/alpine/Dockerfile b/7.0/fpm/alpine/Dockerfile
@@ -95,8 +95,8 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		libxml2-dev \
 		openssl-dev \
+		libxml2-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/7.0/zts/alpine/Dockerfile b/7.0/zts/alpine/Dockerfile
@@ -95,8 +95,8 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		libxml2-dev \
 		openssl-dev \
+		libxml2-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/7.1/alpine/Dockerfile b/7.1/alpine/Dockerfile
@@ -94,8 +94,8 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		libxml2-dev \
 		openssl-dev \
+		libxml2-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/7.1/fpm/alpine/Dockerfile b/7.1/fpm/alpine/Dockerfile
@@ -95,8 +95,8 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		libxml2-dev \
 		openssl-dev \
+		libxml2-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/7.1/zts/alpine/Dockerfile b/7.1/zts/alpine/Dockerfile
@@ -95,8 +95,8 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
-		libxml2-dev \
 		openssl-dev \
+		libxml2-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/7.2-rc/alpine/Dockerfile b/7.2-rc/alpine/Dockerfile
@@ -59,7 +59,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		openssl \
+		libressl \
 	; \
 	\
 	mkdir -p /usr/src; \
@@ -94,8 +94,8 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
+		libressl-dev \
 		libxml2-dev \
-		openssl-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/7.2-rc/fpm/alpine/Dockerfile b/7.2-rc/fpm/alpine/Dockerfile
@@ -60,7 +60,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		openssl \
+		libressl \
 	; \
 	\
 	mkdir -p /usr/src; \
@@ -95,8 +95,8 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
+		libressl-dev \
 		libxml2-dev \
-		openssl-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/7.2-rc/zts/alpine/Dockerfile b/7.2-rc/zts/alpine/Dockerfile
@@ -60,7 +60,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		openssl \
+		libressl \
 	; \
 	\
 	mkdir -p /usr/src; \
@@ -95,8 +95,8 @@ RUN set -xe \
 		coreutils \
 		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
@@ -53,7 +53,7 @@ RUN set -xe; \
 	\
 	apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		openssl \
+		libressl \
 	; \
 	\
 	mkdir -p /usr/src; \
@@ -88,8 +88,8 @@ RUN set -xe \
 		coreutils \
 		curl-dev \
 		libedit-dev \
+		libressl-dev \
 		libxml2-dev \
-		openssl-dev \
 		sqlite-dev \
 	\
 	&& export CFLAGS="$PHP_CFLAGS" \
diff --git a/update.sh b/update.sh
@@ -195,6 +195,10 @@ for version in "${versions[@]}"; do
 			"${dockerfiles[@]}"
 	)
 
+	if [ "$alpineVersion" = '3.4' ]; then
+		sed -ri 's!libressl!openssl!g' "${dockerfiles[@]}"
+	fi
+
 	# update entrypoint commands
 	for dockerfile in "${dockerfiles[@]}"; do
 		cmd="$(awk '$1 == "CMD" { $1 = ""; print }' "$dockerfile" | tail -1 | jq --raw-output '.[0]')"

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ RUN set -xe; \`
`59`	`59`	`\`
`60`	`60`	`apk add --no-cache --virtual .fetch-deps \`
`61`	`61`	`gnupg \`
`62`		`- openssl \`
	`62`	`+ libressl \`
`63`	`63`	`; \`
`64`	`64`	`\`
`65`	`65`	`mkdir -p /usr/src; \`
`@@ -94,8 +94,8 @@ RUN set -xe \`
`94`	`94`	`coreutils \`
`95`	`95`	`curl-dev \`
`96`	`96`	`libedit-dev \`
	`97`	`+ libressl-dev \`
`97`	`98`	`libxml2-dev \`
`98`		`- openssl-dev \`
`99`	`99`	`sqlite-dev \`
`100`	`100`	`\`
`101`	`101`	`&& export CFLAGS="$PHP_CFLAGS" \`