From f1300ab567a5ed81cd8d5782da49aadcf1e6b2f3 Mon Sep 17 00:00:00 2001 From: Hannes Giesenow Date: Tue, 23 May 2017 13:45:43 +0200 Subject: [PATCH] Reduced size --- 5.6/Dockerfile | 3 +-- 5.6/alpine/docker-php-source | 6 ++++++ 5.6/apache/Dockerfile | 3 +-- 5.6/apache/docker-php-source | 6 ++++++ 5.6/docker-php-source | 6 ++++++ 5.6/fpm/Dockerfile | 3 +-- 5.6/fpm/alpine/docker-php-source | 6 ++++++ 5.6/fpm/docker-php-source | 6 ++++++ 5.6/zts/Dockerfile | 3 +-- 5.6/zts/alpine/docker-php-source | 6 ++++++ 5.6/zts/docker-php-source | 6 ++++++ 7.0/Dockerfile | 3 +-- 7.0/alpine/docker-php-source | 6 ++++++ 7.0/apache/Dockerfile | 3 +-- 7.0/apache/docker-php-source | 6 ++++++ 7.0/docker-php-source | 6 ++++++ 7.0/fpm/Dockerfile | 3 +-- 7.0/fpm/alpine/docker-php-source | 6 ++++++ 7.0/fpm/docker-php-source | 6 ++++++ 7.0/zts/Dockerfile | 3 +-- 7.0/zts/alpine/docker-php-source | 6 ++++++ 7.0/zts/docker-php-source | 6 ++++++ 7.1/Dockerfile | 3 +-- 7.1/alpine/docker-php-source | 6 ++++++ 7.1/apache/Dockerfile | 3 +-- 7.1/apache/docker-php-source | 6 ++++++ 7.1/docker-php-source | 6 ++++++ 7.1/fpm/Dockerfile | 3 +-- 7.1/fpm/alpine/docker-php-source | 6 ++++++ 7.1/fpm/docker-php-source | 6 ++++++ 7.1/zts/Dockerfile | 3 +-- 7.1/zts/alpine/docker-php-source | 6 ++++++ 7.1/zts/docker-php-source | 6 ++++++ Dockerfile-debian.template | 3 +-- docker-php-source | 6 ++++++ 35 files changed, 145 insertions(+), 26 deletions(-) diff --git a/5.6/Dockerfile b/5.6/Dockerfile index 7e2da8cae1..bc3e7e5865 100644 --- a/5.6/Dockerfile +++ b/5.6/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:jessie +FROM debian:jessie-slim # persistent / runtime deps ENV PHPIZE_DEPS \ @@ -19,7 +19,6 @@ ENV PHPIZE_DEPS \ pkg-config \ re2c RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ libedit2 \ diff --git a/5.6/alpine/docker-php-source b/5.6/alpine/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/5.6/alpine/docker-php-source +++ b/5.6/alpine/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile index 851ae46371..8ecafa332d 100644 --- a/5.6/apache/Dockerfile +++ b/5.6/apache/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:jessie +FROM debian:jessie-slim # persistent / runtime deps ENV PHPIZE_DEPS \ @@ -19,7 +19,6 @@ ENV PHPIZE_DEPS \ pkg-config \ re2c RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ libedit2 \ diff --git a/5.6/apache/docker-php-source b/5.6/apache/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/5.6/apache/docker-php-source +++ b/5.6/apache/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/5.6/docker-php-source b/5.6/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/5.6/docker-php-source +++ b/5.6/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile index 1367278273..88d61930af 100644 --- a/5.6/fpm/Dockerfile +++ b/5.6/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:jessie +FROM debian:jessie-slim # persistent / runtime deps ENV PHPIZE_DEPS \ @@ -19,7 +19,6 @@ ENV PHPIZE_DEPS \ pkg-config \ re2c RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ libedit2 \ diff --git a/5.6/fpm/alpine/docker-php-source b/5.6/fpm/alpine/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/5.6/fpm/alpine/docker-php-source +++ b/5.6/fpm/alpine/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/5.6/fpm/docker-php-source b/5.6/fpm/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/5.6/fpm/docker-php-source +++ b/5.6/fpm/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/5.6/zts/Dockerfile b/5.6/zts/Dockerfile index 89315624f1..8bcd8b7dd4 100644 --- a/5.6/zts/Dockerfile +++ b/5.6/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:jessie +FROM debian:jessie-slim # persistent / runtime deps ENV PHPIZE_DEPS \ @@ -19,7 +19,6 @@ ENV PHPIZE_DEPS \ pkg-config \ re2c RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ libedit2 \ diff --git a/5.6/zts/alpine/docker-php-source b/5.6/zts/alpine/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/5.6/zts/alpine/docker-php-source +++ b/5.6/zts/alpine/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/5.6/zts/docker-php-source b/5.6/zts/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/5.6/zts/docker-php-source +++ b/5.6/zts/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/7.0/Dockerfile b/7.0/Dockerfile index c1d84f28ce..30933f6621 100644 --- a/7.0/Dockerfile +++ b/7.0/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:jessie +FROM debian:jessie-slim # persistent / runtime deps ENV PHPIZE_DEPS \ @@ -19,7 +19,6 @@ ENV PHPIZE_DEPS \ pkg-config \ re2c RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ libedit2 \ diff --git a/7.0/alpine/docker-php-source b/7.0/alpine/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/7.0/alpine/docker-php-source +++ b/7.0/alpine/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile index 3d8c7831b2..44f76c3725 100644 --- a/7.0/apache/Dockerfile +++ b/7.0/apache/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:jessie +FROM debian:jessie-slim # persistent / runtime deps ENV PHPIZE_DEPS \ @@ -19,7 +19,6 @@ ENV PHPIZE_DEPS \ pkg-config \ re2c RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ libedit2 \ diff --git a/7.0/apache/docker-php-source b/7.0/apache/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/7.0/apache/docker-php-source +++ b/7.0/apache/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/7.0/docker-php-source b/7.0/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/7.0/docker-php-source +++ b/7.0/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile index 298d4d996a..2eac21a8fa 100644 --- a/7.0/fpm/Dockerfile +++ b/7.0/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:jessie +FROM debian:jessie-slim # persistent / runtime deps ENV PHPIZE_DEPS \ @@ -19,7 +19,6 @@ ENV PHPIZE_DEPS \ pkg-config \ re2c RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ libedit2 \ diff --git a/7.0/fpm/alpine/docker-php-source b/7.0/fpm/alpine/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/7.0/fpm/alpine/docker-php-source +++ b/7.0/fpm/alpine/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/7.0/fpm/docker-php-source b/7.0/fpm/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/7.0/fpm/docker-php-source +++ b/7.0/fpm/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/7.0/zts/Dockerfile b/7.0/zts/Dockerfile index baf205f7f7..4007738aaf 100644 --- a/7.0/zts/Dockerfile +++ b/7.0/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:jessie +FROM debian:jessie-slim # persistent / runtime deps ENV PHPIZE_DEPS \ @@ -19,7 +19,6 @@ ENV PHPIZE_DEPS \ pkg-config \ re2c RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ libedit2 \ diff --git a/7.0/zts/alpine/docker-php-source b/7.0/zts/alpine/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/7.0/zts/alpine/docker-php-source +++ b/7.0/zts/alpine/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/7.0/zts/docker-php-source b/7.0/zts/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/7.0/zts/docker-php-source +++ b/7.0/zts/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/7.1/Dockerfile b/7.1/Dockerfile index e8d39133fa..09e84be0e6 100644 --- a/7.1/Dockerfile +++ b/7.1/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:jessie +FROM debian:jessie-slim # persistent / runtime deps ENV PHPIZE_DEPS \ @@ -19,7 +19,6 @@ ENV PHPIZE_DEPS \ pkg-config \ re2c RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ libedit2 \ diff --git a/7.1/alpine/docker-php-source b/7.1/alpine/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/7.1/alpine/docker-php-source +++ b/7.1/alpine/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/7.1/apache/Dockerfile b/7.1/apache/Dockerfile index 3f0040ace7..228bb9c2aa 100644 --- a/7.1/apache/Dockerfile +++ b/7.1/apache/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:jessie +FROM debian:jessie-slim # persistent / runtime deps ENV PHPIZE_DEPS \ @@ -19,7 +19,6 @@ ENV PHPIZE_DEPS \ pkg-config \ re2c RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ libedit2 \ diff --git a/7.1/apache/docker-php-source b/7.1/apache/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/7.1/apache/docker-php-source +++ b/7.1/apache/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/7.1/docker-php-source b/7.1/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/7.1/docker-php-source +++ b/7.1/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/7.1/fpm/Dockerfile b/7.1/fpm/Dockerfile index dbc26efe44..2d4ff122a0 100644 --- a/7.1/fpm/Dockerfile +++ b/7.1/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:jessie +FROM debian:jessie-slim # persistent / runtime deps ENV PHPIZE_DEPS \ @@ -19,7 +19,6 @@ ENV PHPIZE_DEPS \ pkg-config \ re2c RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ libedit2 \ diff --git a/7.1/fpm/alpine/docker-php-source b/7.1/fpm/alpine/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/7.1/fpm/alpine/docker-php-source +++ b/7.1/fpm/alpine/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/7.1/fpm/docker-php-source b/7.1/fpm/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/7.1/fpm/docker-php-source +++ b/7.1/fpm/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/7.1/zts/Dockerfile b/7.1/zts/Dockerfile index 6b121f0a89..5ae33aad7c 100644 --- a/7.1/zts/Dockerfile +++ b/7.1/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:jessie +FROM debian:jessie-slim # persistent / runtime deps ENV PHPIZE_DEPS \ @@ -19,7 +19,6 @@ ENV PHPIZE_DEPS \ pkg-config \ re2c RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ libedit2 \ diff --git a/7.1/zts/alpine/docker-php-source b/7.1/zts/alpine/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/7.1/zts/alpine/docker-php-source +++ b/7.1/zts/alpine/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/7.1/zts/docker-php-source b/7.1/zts/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/7.1/zts/docker-php-source +++ b/7.1/zts/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *) diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index e3a4135bac..002c0c051b 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:jessie-slim # persistent / runtime deps ENV PHPIZE_DEPS \ @@ -13,7 +13,6 @@ ENV PHPIZE_DEPS \ pkg-config \ re2c RUN apt-get update && apt-get install -y \ - $PHPIZE_DEPS \ ca-certificates \ curl \ libedit2 \ diff --git a/docker-php-source b/docker-php-source index 9033d243de..9ffad2c447 100755 --- a/docker-php-source +++ b/docker-php-source @@ -20,11 +20,17 @@ case "$1" in if [ ! -f "$dir/.docker-extracted" ]; then tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1 touch "$dir/.docker-extracted" + if [ -e /etc/debian_version ]; then + apt-get update && apt-get install -y $PHPIZE_DEPS --no-install-recommends && rm -r /var/lib/apt/lists/* + fi fi ;; delete) rm -rf "$dir" + if [ -e /etc/debian_version ]; then + apt-get purge -y --auto-remove $PHPIZE_DEPS + fi ;; *)