From 0e3468fe7f3de591f5b080a0a2e1e2d6244051cd Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 22 Sep 2017 14:55:27 -0700 Subject: [PATCH] Update Alpine 3.6+ to use "libressl" instead of "openssl" --- 5.6/alpine/Dockerfile | 2 +- 5.6/fpm/alpine/Dockerfile | 2 +- 5.6/zts/alpine/Dockerfile | 2 +- 7.0/alpine/Dockerfile | 2 +- 7.0/fpm/alpine/Dockerfile | 2 +- 7.0/zts/alpine/Dockerfile | 2 +- 7.1/alpine/Dockerfile | 2 +- 7.1/fpm/alpine/Dockerfile | 2 +- 7.1/zts/alpine/Dockerfile | 2 +- 7.2-rc/alpine/Dockerfile | 4 ++-- 7.2-rc/fpm/alpine/Dockerfile | 4 ++-- 7.2-rc/zts/alpine/Dockerfile | 4 ++-- Dockerfile-alpine.template | 4 ++-- update.sh | 4 ++++ 14 files changed, 21 insertions(+), 17 deletions(-) diff --git a/5.6/alpine/Dockerfile b/5.6/alpine/Dockerfile index df5768ae70..5875398041 100644 --- 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 index 22f5397a48..82cae9672d 100644 --- 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 index c67d24a543..f8e610aaae 100644 --- 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 index 83fca6ec83..38db987139 100644 --- 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 index 21cdc2050e..69841f6ae6 100644 --- 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 index 9fcdb72209..2e79fe41f6 100644 --- 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 index 9e23fd47bb..98af53687b 100644 --- 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 index b392785d80..3cad0c4baf 100644 --- 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 index 12aa134b6a..8acb858e41 100644 --- 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 index 647e49a8bc..5d4950cecb 100644 --- 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 index 6c42b05796..6b5eea359f 100644 --- 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 index 82ea127868..7b410f0af8 100644 --- 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 index 324c2bbadf..e2e3eccc70 100644 --- 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 index 53ec9aace7..54a18782e2 100755 --- 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]')"