From 3ac528cf10d42f3f47dcb9ded3477781fb11f714 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 5 Jan 2017 10:06:53 -0800 Subject: [PATCH] Revert "Upgrade alpine to v3.5" --- 5.6/alpine/Dockerfile | 6 +++--- 5.6/fpm/alpine/Dockerfile | 6 +++--- 5.6/zts/alpine/Dockerfile | 6 +++--- 7.0/alpine/Dockerfile | 6 +++--- 7.0/fpm/alpine/Dockerfile | 6 +++--- 7.0/zts/alpine/Dockerfile | 6 +++--- 7.1/alpine/Dockerfile | 6 +++--- 7.1/fpm/alpine/Dockerfile | 6 +++--- 7.1/zts/alpine/Dockerfile | 6 +++--- Dockerfile-alpine.template | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/5.6/alpine/Dockerfile b/5.6/alpine/Dockerfile index 32edc47aca..b38f771424 100644 --- 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 index c6b610342e..96550d17e8 100644 --- 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 index a790ede2d5..dce8f95a43 100644 --- 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 index 31804f1ab1..8000d9257f 100644 --- 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 index e934e08098..ba2fbb12b2 100644 --- 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 index 0d5c0829a1..3331df73d2 100644 --- 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 index 03ce932ecb..37a4a00f15 100644 --- 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 index cfa23d7821..fcee096a26 100644 --- 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 index 3466084a46..7892eb426a 100644 --- 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 index e9eb3d3efe..835de3cc30 100644 --- 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" \