From fc24121abdce6d74be6d4df6758230b2074d9066 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 26 Sep 2017 11:21:53 -0700 Subject: [PATCH] Add "libressl" persistently for "openssl_pkey_new" --- 5.6/alpine/Dockerfile | 5 +++-- 5.6/fpm/alpine/Dockerfile | 5 +++-- 5.6/zts/alpine/Dockerfile | 5 +++-- 7.0/alpine/Dockerfile | 5 +++-- 7.0/fpm/alpine/Dockerfile | 5 +++-- 7.0/zts/alpine/Dockerfile | 5 +++-- 7.1/alpine/Dockerfile | 5 +++-- 7.1/fpm/alpine/Dockerfile | 5 +++-- 7.1/zts/alpine/Dockerfile | 5 +++-- 7.2-rc/alpine/Dockerfile | 5 +++-- 7.2-rc/fpm/alpine/Dockerfile | 5 +++-- 7.2-rc/zts/alpine/Dockerfile | 5 +++-- Dockerfile-alpine.template | 5 +++-- 13 files changed, 39 insertions(+), 26 deletions(-) diff --git a/5.6/alpine/Dockerfile b/5.6/alpine/Dockerfile index 354885a9..996e8898 100644 --- a/5.6/alpine/Dockerfile +++ b/5.6/alpine/Dockerfile @@ -22,7 +22,9 @@ RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ curl \ tar \ - xz + xz \ +# https://github.com/docker-library/php/issues/494 + openssl # ensure www-data user exists RUN set -x \ @@ -59,7 +61,6 @@ RUN set -xe; \ \ apk add --no-cache --virtual .fetch-deps \ gnupg \ - openssl \ ; \ \ mkdir -p /usr/src; \ diff --git a/5.6/fpm/alpine/Dockerfile b/5.6/fpm/alpine/Dockerfile index 165f0e4b..9590b59d 100644 --- a/5.6/fpm/alpine/Dockerfile +++ b/5.6/fpm/alpine/Dockerfile @@ -22,7 +22,9 @@ RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ curl \ tar \ - xz + xz \ +# https://github.com/docker-library/php/issues/494 + openssl # ensure www-data user exists RUN set -x \ @@ -60,7 +62,6 @@ RUN set -xe; \ \ apk add --no-cache --virtual .fetch-deps \ gnupg \ - openssl \ ; \ \ mkdir -p /usr/src; \ diff --git a/5.6/zts/alpine/Dockerfile b/5.6/zts/alpine/Dockerfile index 53185de9..a44bca7f 100644 --- a/5.6/zts/alpine/Dockerfile +++ b/5.6/zts/alpine/Dockerfile @@ -22,7 +22,9 @@ RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ curl \ tar \ - xz + xz \ +# https://github.com/docker-library/php/issues/494 + openssl # ensure www-data user exists RUN set -x \ @@ -60,7 +62,6 @@ RUN set -xe; \ \ apk add --no-cache --virtual .fetch-deps \ gnupg \ - openssl \ ; \ \ mkdir -p /usr/src; \ diff --git a/7.0/alpine/Dockerfile b/7.0/alpine/Dockerfile index 0ef38367..5342580b 100644 --- a/7.0/alpine/Dockerfile +++ b/7.0/alpine/Dockerfile @@ -22,7 +22,9 @@ RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ curl \ tar \ - xz + xz \ +# https://github.com/docker-library/php/issues/494 + openssl # ensure www-data user exists RUN set -x \ @@ -59,7 +61,6 @@ RUN set -xe; \ \ apk add --no-cache --virtual .fetch-deps \ gnupg \ - openssl \ ; \ \ mkdir -p /usr/src; \ diff --git a/7.0/fpm/alpine/Dockerfile b/7.0/fpm/alpine/Dockerfile index 91bb1549..e22e97b9 100644 --- a/7.0/fpm/alpine/Dockerfile +++ b/7.0/fpm/alpine/Dockerfile @@ -22,7 +22,9 @@ RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ curl \ tar \ - xz + xz \ +# https://github.com/docker-library/php/issues/494 + openssl # ensure www-data user exists RUN set -x \ @@ -60,7 +62,6 @@ RUN set -xe; \ \ apk add --no-cache --virtual .fetch-deps \ gnupg \ - openssl \ ; \ \ mkdir -p /usr/src; \ diff --git a/7.0/zts/alpine/Dockerfile b/7.0/zts/alpine/Dockerfile index 8cbe1bf2..87073137 100644 --- a/7.0/zts/alpine/Dockerfile +++ b/7.0/zts/alpine/Dockerfile @@ -22,7 +22,9 @@ RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ curl \ tar \ - xz + xz \ +# https://github.com/docker-library/php/issues/494 + openssl # ensure www-data user exists RUN set -x \ @@ -60,7 +62,6 @@ RUN set -xe; \ \ apk add --no-cache --virtual .fetch-deps \ gnupg \ - openssl \ ; \ \ mkdir -p /usr/src; \ diff --git a/7.1/alpine/Dockerfile b/7.1/alpine/Dockerfile index 7a264e8b..2d50504f 100644 --- a/7.1/alpine/Dockerfile +++ b/7.1/alpine/Dockerfile @@ -22,7 +22,9 @@ RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ curl \ tar \ - xz + xz \ +# https://github.com/docker-library/php/issues/494 + openssl # ensure www-data user exists RUN set -x \ @@ -59,7 +61,6 @@ RUN set -xe; \ \ apk add --no-cache --virtual .fetch-deps \ gnupg \ - openssl \ ; \ \ mkdir -p /usr/src; \ diff --git a/7.1/fpm/alpine/Dockerfile b/7.1/fpm/alpine/Dockerfile index 23226e2f..afcd26aa 100644 --- a/7.1/fpm/alpine/Dockerfile +++ b/7.1/fpm/alpine/Dockerfile @@ -22,7 +22,9 @@ RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ curl \ tar \ - xz + xz \ +# https://github.com/docker-library/php/issues/494 + openssl # ensure www-data user exists RUN set -x \ @@ -60,7 +62,6 @@ RUN set -xe; \ \ apk add --no-cache --virtual .fetch-deps \ gnupg \ - openssl \ ; \ \ mkdir -p /usr/src; \ diff --git a/7.1/zts/alpine/Dockerfile b/7.1/zts/alpine/Dockerfile index e774a529..8e2cb193 100644 --- a/7.1/zts/alpine/Dockerfile +++ b/7.1/zts/alpine/Dockerfile @@ -22,7 +22,9 @@ RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ curl \ tar \ - xz + xz \ +# https://github.com/docker-library/php/issues/494 + openssl # ensure www-data user exists RUN set -x \ @@ -60,7 +62,6 @@ RUN set -xe; \ \ apk add --no-cache --virtual .fetch-deps \ gnupg \ - openssl \ ; \ \ mkdir -p /usr/src; \ diff --git a/7.2-rc/alpine/Dockerfile b/7.2-rc/alpine/Dockerfile index 8d2f4061..fde490be 100644 --- a/7.2-rc/alpine/Dockerfile +++ b/7.2-rc/alpine/Dockerfile @@ -22,7 +22,9 @@ RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ curl \ tar \ - xz + xz \ +# https://github.com/docker-library/php/issues/494 + libressl # ensure www-data user exists RUN set -x \ @@ -59,7 +61,6 @@ RUN set -xe; \ \ apk add --no-cache --virtual .fetch-deps \ gnupg \ - libressl \ ; \ \ mkdir -p /usr/src; \ diff --git a/7.2-rc/fpm/alpine/Dockerfile b/7.2-rc/fpm/alpine/Dockerfile index 4adb0700..916ca2d9 100644 --- a/7.2-rc/fpm/alpine/Dockerfile +++ b/7.2-rc/fpm/alpine/Dockerfile @@ -22,7 +22,9 @@ RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ curl \ tar \ - xz + xz \ +# https://github.com/docker-library/php/issues/494 + libressl # ensure www-data user exists RUN set -x \ @@ -60,7 +62,6 @@ RUN set -xe; \ \ apk add --no-cache --virtual .fetch-deps \ gnupg \ - libressl \ ; \ \ mkdir -p /usr/src; \ diff --git a/7.2-rc/zts/alpine/Dockerfile b/7.2-rc/zts/alpine/Dockerfile index f58ac92b..2227c399 100644 --- a/7.2-rc/zts/alpine/Dockerfile +++ b/7.2-rc/zts/alpine/Dockerfile @@ -22,7 +22,9 @@ RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ curl \ tar \ - xz + xz \ +# https://github.com/docker-library/php/issues/494 + libressl # ensure www-data user exists RUN set -x \ @@ -60,7 +62,6 @@ RUN set -xe; \ \ apk add --no-cache --virtual .fetch-deps \ gnupg \ - libressl \ ; \ \ mkdir -p /usr/src; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 9b1a38c9..63b2a3ce 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -16,7 +16,9 @@ RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ curl \ tar \ - xz + xz \ +# https://github.com/docker-library/php/issues/494 + libressl # ensure www-data user exists RUN set -x \ @@ -53,7 +55,6 @@ RUN set -xe; \ \ apk add --no-cache --virtual .fetch-deps \ gnupg \ - libressl \ ; \ \ mkdir -p /usr/src; \