From 5630a5f102773d3008a9b887ee628a06694be8eb Mon Sep 17 00:00:00 2001 From: Thorben Nissen Date: Fri, 16 Nov 2018 18:30:10 +0100 Subject: [PATCH] [TASK] Make Debian based images smaller Do not permanently install `${PHPIZE_DEPS}` in debian based images, but install and remove them just around the build process to make images about 190 MB lighter. --- 5.6/jessie/apache/Dockerfile | 2 +- 5.6/jessie/cli/Dockerfile | 2 +- 5.6/jessie/fpm/Dockerfile | 2 +- 5.6/jessie/zts/Dockerfile | 2 +- 5.6/stretch/apache/Dockerfile | 2 +- 5.6/stretch/cli/Dockerfile | 2 +- 5.6/stretch/fpm/Dockerfile | 2 +- 5.6/stretch/zts/Dockerfile | 2 +- 7.0/jessie/apache/Dockerfile | 2 +- 7.0/jessie/cli/Dockerfile | 2 +- 7.0/jessie/fpm/Dockerfile | 2 +- 7.0/jessie/zts/Dockerfile | 2 +- 7.0/stretch/apache/Dockerfile | 2 +- 7.0/stretch/cli/Dockerfile | 2 +- 7.0/stretch/fpm/Dockerfile | 2 +- 7.0/stretch/zts/Dockerfile | 2 +- 7.1/jessie/apache/Dockerfile | 2 +- 7.1/jessie/cli/Dockerfile | 2 +- 7.1/jessie/fpm/Dockerfile | 2 +- 7.1/jessie/zts/Dockerfile | 2 +- 7.1/stretch/apache/Dockerfile | 2 +- 7.1/stretch/cli/Dockerfile | 2 +- 7.1/stretch/fpm/Dockerfile | 2 +- 7.1/stretch/zts/Dockerfile | 2 +- 7.2/stretch/apache/Dockerfile | 2 +- 7.2/stretch/cli/Dockerfile | 2 +- 7.2/stretch/fpm/Dockerfile | 2 +- 7.2/stretch/zts/Dockerfile | 2 +- 7.3-rc/alpine3.8/cli/Dockerfile | 2 +- 7.3-rc/alpine3.8/fpm/Dockerfile | 2 +- 7.3-rc/alpine3.8/zts/Dockerfile | 2 +- 7.3-rc/stretch/apache/Dockerfile | 4 ++-- 7.3-rc/stretch/cli/Dockerfile | 4 ++-- 7.3-rc/stretch/fpm/Dockerfile | 4 ++-- 7.3-rc/stretch/zts/Dockerfile | 4 ++-- Dockerfile-debian.template | 2 +- 36 files changed, 40 insertions(+), 40 deletions(-) diff --git a/5.6/jessie/apache/Dockerfile b/5.6/jessie/apache/Dockerfile index b4032a5f79..f02a453b74 100644 --- a/5.6/jessie/apache/Dockerfile +++ b/5.6/jessie/apache/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -166,6 +165,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/5.6/jessie/cli/Dockerfile b/5.6/jessie/cli/Dockerfile index d7f82a67ce..be79040212 100644 --- a/5.6/jessie/cli/Dockerfile +++ b/5.6/jessie/cli/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -105,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/5.6/jessie/fpm/Dockerfile b/5.6/jessie/fpm/Dockerfile index ad44abf6cc..3c6128161f 100644 --- a/5.6/jessie/fpm/Dockerfile +++ b/5.6/jessie/fpm/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -106,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/5.6/jessie/zts/Dockerfile b/5.6/jessie/zts/Dockerfile index b2a76c9c78..5044c5fd5d 100644 --- a/5.6/jessie/zts/Dockerfile +++ b/5.6/jessie/zts/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -106,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/5.6/stretch/apache/Dockerfile b/5.6/stretch/apache/Dockerfile index ff5b32488c..5de56a73cd 100644 --- a/5.6/stretch/apache/Dockerfile +++ b/5.6/stretch/apache/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -166,6 +165,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/5.6/stretch/cli/Dockerfile b/5.6/stretch/cli/Dockerfile index 2dcfb1cdcd..e3b7e9771e 100644 --- a/5.6/stretch/cli/Dockerfile +++ b/5.6/stretch/cli/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -105,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/5.6/stretch/fpm/Dockerfile b/5.6/stretch/fpm/Dockerfile index dff7e566b9..6dd6f9c4ae 100644 --- a/5.6/stretch/fpm/Dockerfile +++ b/5.6/stretch/fpm/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -106,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/5.6/stretch/zts/Dockerfile b/5.6/stretch/zts/Dockerfile index 069c9c62ea..88a2a93e7b 100644 --- a/5.6/stretch/zts/Dockerfile +++ b/5.6/stretch/zts/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -106,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.0/jessie/apache/Dockerfile b/7.0/jessie/apache/Dockerfile index 8fe802852e..b2ee2373a6 100644 --- a/7.0/jessie/apache/Dockerfile +++ b/7.0/jessie/apache/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -166,6 +165,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.0/jessie/cli/Dockerfile b/7.0/jessie/cli/Dockerfile index de8e36a02d..302af1a44c 100644 --- a/7.0/jessie/cli/Dockerfile +++ b/7.0/jessie/cli/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -105,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.0/jessie/fpm/Dockerfile b/7.0/jessie/fpm/Dockerfile index 5a5186f2c1..556e006725 100644 --- a/7.0/jessie/fpm/Dockerfile +++ b/7.0/jessie/fpm/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -106,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.0/jessie/zts/Dockerfile b/7.0/jessie/zts/Dockerfile index 926fb72d57..9b73ee03f5 100644 --- a/7.0/jessie/zts/Dockerfile +++ b/7.0/jessie/zts/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -106,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.0/stretch/apache/Dockerfile b/7.0/stretch/apache/Dockerfile index bea2942ab3..9743354a2b 100644 --- a/7.0/stretch/apache/Dockerfile +++ b/7.0/stretch/apache/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -166,6 +165,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.0/stretch/cli/Dockerfile b/7.0/stretch/cli/Dockerfile index cbfdb2808d..560d15d017 100644 --- a/7.0/stretch/cli/Dockerfile +++ b/7.0/stretch/cli/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -105,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.0/stretch/fpm/Dockerfile b/7.0/stretch/fpm/Dockerfile index 4b07dfc1f5..d2794ea349 100644 --- a/7.0/stretch/fpm/Dockerfile +++ b/7.0/stretch/fpm/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -106,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.0/stretch/zts/Dockerfile b/7.0/stretch/zts/Dockerfile index 323d7ace74..30b650dc78 100644 --- a/7.0/stretch/zts/Dockerfile +++ b/7.0/stretch/zts/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -106,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.1/jessie/apache/Dockerfile b/7.1/jessie/apache/Dockerfile index 614dbdafd1..9b62247a80 100644 --- a/7.1/jessie/apache/Dockerfile +++ b/7.1/jessie/apache/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -166,6 +165,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.1/jessie/cli/Dockerfile b/7.1/jessie/cli/Dockerfile index 0a4e919cef..93e277a30e 100644 --- a/7.1/jessie/cli/Dockerfile +++ b/7.1/jessie/cli/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -105,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.1/jessie/fpm/Dockerfile b/7.1/jessie/fpm/Dockerfile index d2a9704528..0a019ddb6b 100644 --- a/7.1/jessie/fpm/Dockerfile +++ b/7.1/jessie/fpm/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -106,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.1/jessie/zts/Dockerfile b/7.1/jessie/zts/Dockerfile index ead7865b49..9289ec164c 100644 --- a/7.1/jessie/zts/Dockerfile +++ b/7.1/jessie/zts/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -106,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.1/stretch/apache/Dockerfile b/7.1/stretch/apache/Dockerfile index f9cbf8556d..e44727b856 100644 --- a/7.1/stretch/apache/Dockerfile +++ b/7.1/stretch/apache/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -166,6 +165,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.1/stretch/cli/Dockerfile b/7.1/stretch/cli/Dockerfile index 817f141759..9aff56c90b 100644 --- a/7.1/stretch/cli/Dockerfile +++ b/7.1/stretch/cli/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -105,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.1/stretch/fpm/Dockerfile b/7.1/stretch/fpm/Dockerfile index 6d37eaca74..25a079c3e7 100644 --- a/7.1/stretch/fpm/Dockerfile +++ b/7.1/stretch/fpm/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -106,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.1/stretch/zts/Dockerfile b/7.1/stretch/zts/Dockerfile index d006ad34f5..beffa9c600 100644 --- a/7.1/stretch/zts/Dockerfile +++ b/7.1/stretch/zts/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -106,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsqlite3-dev \ diff --git a/7.2/stretch/apache/Dockerfile b/7.2/stretch/apache/Dockerfile index de86cf3950..c60b4751d1 100644 --- a/7.2/stretch/apache/Dockerfile +++ b/7.2/stretch/apache/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -166,6 +165,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsodium-dev \ diff --git a/7.2/stretch/cli/Dockerfile b/7.2/stretch/cli/Dockerfile index 24f8b4e56f..d17d0eacc7 100644 --- a/7.2/stretch/cli/Dockerfile +++ b/7.2/stretch/cli/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -105,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsodium-dev \ diff --git a/7.2/stretch/fpm/Dockerfile b/7.2/stretch/fpm/Dockerfile index 4de45eb97a..32ef8e952a 100644 --- a/7.2/stretch/fpm/Dockerfile +++ b/7.2/stretch/fpm/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -106,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsodium-dev \ diff --git a/7.2/stretch/zts/Dockerfile b/7.2/stretch/zts/Dockerfile index d2d12dd72b..7d555230e2 100644 --- a/7.2/stretch/zts/Dockerfile +++ b/7.2/stretch/zts/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -106,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsodium-dev \ diff --git a/7.3-rc/alpine3.8/cli/Dockerfile b/7.3-rc/alpine3.8/cli/Dockerfile index 975be52e88..1063eeb14e 100644 --- a/7.3-rc/alpine3.8/cli/Dockerfile +++ b/7.3-rc/alpine3.8/cli/Dockerfile @@ -56,7 +56,7 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D ENV PHP_VERSION 7.3.0RC5 -ENV PHP_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz.asc" +ENV PHP_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz" PHP_ASC_URL="" ENV PHP_SHA256="0bf6a6bdfd37576b9a341559023b0adf90063b8970ab08ea7a4d8e83b82136cd" PHP_MD5="" RUN set -xe; \ diff --git a/7.3-rc/alpine3.8/fpm/Dockerfile b/7.3-rc/alpine3.8/fpm/Dockerfile index 2e2bfa06d1..42970009a0 100644 --- a/7.3-rc/alpine3.8/fpm/Dockerfile +++ b/7.3-rc/alpine3.8/fpm/Dockerfile @@ -57,7 +57,7 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D ENV PHP_VERSION 7.3.0RC5 -ENV PHP_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz.asc" +ENV PHP_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz" PHP_ASC_URL="" ENV PHP_SHA256="0bf6a6bdfd37576b9a341559023b0adf90063b8970ab08ea7a4d8e83b82136cd" PHP_MD5="" RUN set -xe; \ diff --git a/7.3-rc/alpine3.8/zts/Dockerfile b/7.3-rc/alpine3.8/zts/Dockerfile index 9894e7a9be..e74e492ba6 100644 --- a/7.3-rc/alpine3.8/zts/Dockerfile +++ b/7.3-rc/alpine3.8/zts/Dockerfile @@ -57,7 +57,7 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D ENV PHP_VERSION 7.3.0RC5 -ENV PHP_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz.asc" +ENV PHP_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz" PHP_ASC_URL="" ENV PHP_SHA256="0bf6a6bdfd37576b9a341559023b0adf90063b8970ab08ea7a4d8e83b82136cd" PHP_MD5="" RUN set -xe; \ diff --git a/7.3-rc/stretch/apache/Dockerfile b/7.3-rc/stretch/apache/Dockerfile index a236dad738..c1ae289de0 100644 --- a/7.3-rc/stretch/apache/Dockerfile +++ b/7.3-rc/stretch/apache/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -116,7 +115,7 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D ENV PHP_VERSION 7.3.0RC5 -ENV PHP_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz.asc" +ENV PHP_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz" PHP_ASC_URL="" ENV PHP_SHA256="0bf6a6bdfd37576b9a341559023b0adf90063b8970ab08ea7a4d8e83b82136cd" PHP_MD5="" RUN set -xe; \ @@ -166,6 +165,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsodium-dev \ diff --git a/7.3-rc/stretch/cli/Dockerfile b/7.3-rc/stretch/cli/Dockerfile index 944d203245..67762d5c2e 100644 --- a/7.3-rc/stretch/cli/Dockerfile +++ b/7.3-rc/stretch/cli/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -55,7 +54,7 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D ENV PHP_VERSION 7.3.0RC5 -ENV PHP_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz.asc" +ENV PHP_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz" PHP_ASC_URL="" ENV PHP_SHA256="0bf6a6bdfd37576b9a341559023b0adf90063b8970ab08ea7a4d8e83b82136cd" PHP_MD5="" RUN set -xe; \ @@ -105,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsodium-dev \ diff --git a/7.3-rc/stretch/fpm/Dockerfile b/7.3-rc/stretch/fpm/Dockerfile index 870ea4c136..0c766d5ddd 100644 --- a/7.3-rc/stretch/fpm/Dockerfile +++ b/7.3-rc/stretch/fpm/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -56,7 +55,7 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D ENV PHP_VERSION 7.3.0RC5 -ENV PHP_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz.asc" +ENV PHP_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz" PHP_ASC_URL="" ENV PHP_SHA256="0bf6a6bdfd37576b9a341559023b0adf90063b8970ab08ea7a4d8e83b82136cd" PHP_MD5="" RUN set -xe; \ @@ -106,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsodium-dev \ diff --git a/7.3-rc/stretch/zts/Dockerfile b/7.3-rc/stretch/zts/Dockerfile index 10b3792b0a..616ee74f8b 100644 --- a/7.3-rc/stretch/zts/Dockerfile +++ b/7.3-rc/stretch/zts/Dockerfile @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -56,7 +55,7 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D ENV PHP_VERSION 7.3.0RC5 -ENV PHP_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz.asc" +ENV PHP_URL="https://downloads.php.net/~cmb/php-7.3.0RC5.tar.xz" PHP_ASC_URL="" ENV PHP_SHA256="0bf6a6bdfd37576b9a341559023b0adf90063b8970ab08ea7a4d8e83b82136cd" PHP_MD5="" RUN set -xe; \ @@ -106,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsodium-dev \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 72108ab485..3bc10177b3 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -24,7 +24,6 @@ ENV PHPIZE_DEPS \ # persistent / runtime deps RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ xz-utils \ @@ -99,6 +98,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHPIZE_DEPS} \ libcurl4-openssl-dev \ libedit-dev \ libsodium-dev \