From 683c2885d33b77f1afdd7becfa780a2e9bad1a99 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sat, 7 Sep 2019 15:32:27 +0200 Subject: [PATCH 1/3] docker-77 Deduplicate dependencies - remove curl - remove mbstring --- 2019.06/apache/Dockerfile | 2 -- 2019.06/fpm-alpine/Dockerfile | 2 -- 2019.06/fpm/Dockerfile | 2 -- 2019.09-dev/apache/Dockerfile | 2 -- 2019.09-dev/fpm-alpine/Dockerfile | 2 -- 2019.09-dev/fpm/Dockerfile | 2 -- 2019.09-rc/apache/Dockerfile | 2 -- 2019.09-rc/fpm-alpine/Dockerfile | 2 -- 2019.09-rc/fpm/Dockerfile | 2 -- Dockerfile-alpine.template | 2 -- Dockerfile-debian.template | 2 -- 11 files changed, 22 deletions(-) diff --git a/2019.06/apache/Dockerfile b/2019.06/apache/Dockerfile index ae2a804..2c7e19c 100644 --- a/2019.06/apache/Dockerfile +++ b/2019.06/apache/Dockerfile @@ -51,14 +51,12 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ docker-php-ext-install -j "$(nproc)" \ - curl \ pdo \ pdo_mysql \ xml \ gd \ zip \ opcache \ - mbstring \ posix \ ctype \ json \ diff --git a/2019.06/fpm-alpine/Dockerfile b/2019.06/fpm-alpine/Dockerfile index 0bd49f7..a3106df 100644 --- a/2019.06/fpm-alpine/Dockerfile +++ b/2019.06/fpm-alpine/Dockerfile @@ -52,14 +52,12 @@ RUN set -ex; \ ; \ \ docker-php-ext-install -j "$(nproc)" \ - curl \ pdo \ pdo_mysql \ xml \ gd \ zip \ opcache \ - mbstring \ posix \ ctype \ json \ diff --git a/2019.06/fpm/Dockerfile b/2019.06/fpm/Dockerfile index 85f57b9..478f939 100644 --- a/2019.06/fpm/Dockerfile +++ b/2019.06/fpm/Dockerfile @@ -51,14 +51,12 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ docker-php-ext-install -j "$(nproc)" \ - curl \ pdo \ pdo_mysql \ xml \ gd \ zip \ opcache \ - mbstring \ posix \ ctype \ json \ diff --git a/2019.09-dev/apache/Dockerfile b/2019.09-dev/apache/Dockerfile index bbf8c81..bef2e80 100644 --- a/2019.09-dev/apache/Dockerfile +++ b/2019.09-dev/apache/Dockerfile @@ -51,14 +51,12 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ docker-php-ext-install -j "$(nproc)" \ - curl \ pdo \ pdo_mysql \ xml \ gd \ zip \ opcache \ - mbstring \ posix \ ctype \ json \ diff --git a/2019.09-dev/fpm-alpine/Dockerfile b/2019.09-dev/fpm-alpine/Dockerfile index d8fd1c4..9ed2c3f 100644 --- a/2019.09-dev/fpm-alpine/Dockerfile +++ b/2019.09-dev/fpm-alpine/Dockerfile @@ -52,14 +52,12 @@ RUN set -ex; \ ; \ \ docker-php-ext-install -j "$(nproc)" \ - curl \ pdo \ pdo_mysql \ xml \ gd \ zip \ opcache \ - mbstring \ posix \ ctype \ json \ diff --git a/2019.09-dev/fpm/Dockerfile b/2019.09-dev/fpm/Dockerfile index 5bb4218..b5961cb 100644 --- a/2019.09-dev/fpm/Dockerfile +++ b/2019.09-dev/fpm/Dockerfile @@ -51,14 +51,12 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ docker-php-ext-install -j "$(nproc)" \ - curl \ pdo \ pdo_mysql \ xml \ gd \ zip \ opcache \ - mbstring \ posix \ ctype \ json \ diff --git a/2019.09-rc/apache/Dockerfile b/2019.09-rc/apache/Dockerfile index 1d4c8c0..2135927 100644 --- a/2019.09-rc/apache/Dockerfile +++ b/2019.09-rc/apache/Dockerfile @@ -51,14 +51,12 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ docker-php-ext-install -j "$(nproc)" \ - curl \ pdo \ pdo_mysql \ xml \ gd \ zip \ opcache \ - mbstring \ posix \ ctype \ json \ diff --git a/2019.09-rc/fpm-alpine/Dockerfile b/2019.09-rc/fpm-alpine/Dockerfile index 7aa3a9a..9357d13 100644 --- a/2019.09-rc/fpm-alpine/Dockerfile +++ b/2019.09-rc/fpm-alpine/Dockerfile @@ -52,14 +52,12 @@ RUN set -ex; \ ; \ \ docker-php-ext-install -j "$(nproc)" \ - curl \ pdo \ pdo_mysql \ xml \ gd \ zip \ opcache \ - mbstring \ posix \ ctype \ json \ diff --git a/2019.09-rc/fpm/Dockerfile b/2019.09-rc/fpm/Dockerfile index 13fca77..3c683ea 100644 --- a/2019.09-rc/fpm/Dockerfile +++ b/2019.09-rc/fpm/Dockerfile @@ -51,14 +51,12 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ docker-php-ext-install -j "$(nproc)" \ - curl \ pdo \ pdo_mysql \ xml \ gd \ zip \ opcache \ - mbstring \ posix \ ctype \ json \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 0d3e003..51e9d1e 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -51,14 +51,12 @@ RUN set -ex; \ ; \ \ docker-php-ext-install -j "$(nproc)" \ - curl \ pdo \ pdo_mysql \ xml \ gd \ zip \ opcache \ - mbstring \ posix \ ctype \ json \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 16ad29c..301b049 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -50,14 +50,12 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ docker-php-ext-install -j "$(nproc)" \ - curl \ pdo \ pdo_mysql \ xml \ gd \ zip \ opcache \ - mbstring \ posix \ ctype \ json \ From e1066901ae975f21826354802bf762f210b97553 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sun, 8 Sep 2019 14:11:01 +0200 Subject: [PATCH 2/3] Deduplicate dependencies - remove ctype - remove iconv - remove json - remove pdo - remove posix - remove xml --- 2019.06/apache/Dockerfile | 10 ---------- 2019.06/fpm-alpine/Dockerfile | 11 ----------- 2019.06/fpm/Dockerfile | 10 ---------- 2019.09-dev/apache/Dockerfile | 10 ---------- 2019.09-dev/fpm-alpine/Dockerfile | 11 ----------- 2019.09-dev/fpm/Dockerfile | 10 ---------- 2019.09-rc/apache/Dockerfile | 10 ---------- 2019.09-rc/fpm-alpine/Dockerfile | 11 ----------- 2019.09-rc/fpm/Dockerfile | 10 ---------- Dockerfile-alpine.template | 11 ----------- Dockerfile-debian.template | 10 ---------- 11 files changed, 114 deletions(-) diff --git a/2019.06/apache/Dockerfile b/2019.06/apache/Dockerfile index 2c7e19c..30153f4 100644 --- a/2019.06/apache/Dockerfile +++ b/2019.06/apache/Dockerfile @@ -22,14 +22,11 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - libxml2-dev \ mysql-client \ bash \ autoconf \ g++ \ make \ - openssl \ - libssl-dev \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ @@ -40,8 +37,6 @@ RUN set -ex; \ libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ - libcurl4-openssl-dev \ - curl \ libzip-dev \ ; \ docker-php-ext-configure gd \ @@ -51,16 +46,11 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ docker-php-ext-install -j "$(nproc)" \ - pdo \ pdo_mysql \ - xml \ gd \ zip \ opcache \ - posix \ ctype \ - json \ - iconv \ pcntl \ ; \ \ diff --git a/2019.06/fpm-alpine/Dockerfile b/2019.06/fpm-alpine/Dockerfile index a3106df..35c68b6 100644 --- a/2019.06/fpm-alpine/Dockerfile +++ b/2019.06/fpm-alpine/Dockerfile @@ -14,14 +14,11 @@ RUN set -ex; \ RUN set -ex; \ \ apk add -U --no-cache --virtual .build-deps \ - libxml2-dev \ mysql-client \ bash \ autoconf \ g++ \ make \ - openssl \ - openssl-dev \ libpng \ libpng-dev \ libjpeg-turbo-dev \ @@ -36,8 +33,6 @@ RUN set -ex; \ freetype-dev \ librsvg \ libcurl \ - curl \ - curl-dev \ rsync \ bzip2 \ pcre-dev \ @@ -52,16 +47,10 @@ RUN set -ex; \ ; \ \ docker-php-ext-install -j "$(nproc)" \ - pdo \ pdo_mysql \ - xml \ gd \ zip \ opcache \ - posix \ - ctype \ - json \ - iconv \ pcntl \ ; \ \ diff --git a/2019.06/fpm/Dockerfile b/2019.06/fpm/Dockerfile index 478f939..f7f6ab9 100644 --- a/2019.06/fpm/Dockerfile +++ b/2019.06/fpm/Dockerfile @@ -22,14 +22,11 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - libxml2-dev \ mysql-client \ bash \ autoconf \ g++ \ make \ - openssl \ - libssl-dev \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ @@ -40,8 +37,6 @@ RUN set -ex; \ libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ - libcurl4-openssl-dev \ - curl \ libzip-dev \ ; \ docker-php-ext-configure gd \ @@ -51,16 +46,11 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ docker-php-ext-install -j "$(nproc)" \ - pdo \ pdo_mysql \ - xml \ gd \ zip \ opcache \ - posix \ ctype \ - json \ - iconv \ pcntl \ ; \ \ diff --git a/2019.09-dev/apache/Dockerfile b/2019.09-dev/apache/Dockerfile index bef2e80..9b9ac5c 100644 --- a/2019.09-dev/apache/Dockerfile +++ b/2019.09-dev/apache/Dockerfile @@ -22,14 +22,11 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - libxml2-dev \ mysql-client \ bash \ autoconf \ g++ \ make \ - openssl \ - libssl-dev \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ @@ -40,8 +37,6 @@ RUN set -ex; \ libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ - libcurl4-openssl-dev \ - curl \ libzip-dev \ ; \ docker-php-ext-configure gd \ @@ -51,16 +46,11 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ docker-php-ext-install -j "$(nproc)" \ - pdo \ pdo_mysql \ - xml \ gd \ zip \ opcache \ - posix \ ctype \ - json \ - iconv \ pcntl \ ; \ \ diff --git a/2019.09-dev/fpm-alpine/Dockerfile b/2019.09-dev/fpm-alpine/Dockerfile index 9ed2c3f..1dd2fda 100644 --- a/2019.09-dev/fpm-alpine/Dockerfile +++ b/2019.09-dev/fpm-alpine/Dockerfile @@ -14,14 +14,11 @@ RUN set -ex; \ RUN set -ex; \ \ apk add -U --no-cache --virtual .build-deps \ - libxml2-dev \ mysql-client \ bash \ autoconf \ g++ \ make \ - openssl \ - openssl-dev \ libpng \ libpng-dev \ libjpeg-turbo-dev \ @@ -36,8 +33,6 @@ RUN set -ex; \ freetype-dev \ librsvg \ libcurl \ - curl \ - curl-dev \ rsync \ bzip2 \ pcre-dev \ @@ -52,16 +47,10 @@ RUN set -ex; \ ; \ \ docker-php-ext-install -j "$(nproc)" \ - pdo \ pdo_mysql \ - xml \ gd \ zip \ opcache \ - posix \ - ctype \ - json \ - iconv \ pcntl \ ; \ \ diff --git a/2019.09-dev/fpm/Dockerfile b/2019.09-dev/fpm/Dockerfile index b5961cb..3620a85 100644 --- a/2019.09-dev/fpm/Dockerfile +++ b/2019.09-dev/fpm/Dockerfile @@ -22,14 +22,11 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - libxml2-dev \ mysql-client \ bash \ autoconf \ g++ \ make \ - openssl \ - libssl-dev \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ @@ -40,8 +37,6 @@ RUN set -ex; \ libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ - libcurl4-openssl-dev \ - curl \ libzip-dev \ ; \ docker-php-ext-configure gd \ @@ -51,16 +46,11 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ docker-php-ext-install -j "$(nproc)" \ - pdo \ pdo_mysql \ - xml \ gd \ zip \ opcache \ - posix \ ctype \ - json \ - iconv \ pcntl \ ; \ \ diff --git a/2019.09-rc/apache/Dockerfile b/2019.09-rc/apache/Dockerfile index 2135927..e9265f6 100644 --- a/2019.09-rc/apache/Dockerfile +++ b/2019.09-rc/apache/Dockerfile @@ -22,14 +22,11 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - libxml2-dev \ mysql-client \ bash \ autoconf \ g++ \ make \ - openssl \ - libssl-dev \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ @@ -40,8 +37,6 @@ RUN set -ex; \ libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ - libcurl4-openssl-dev \ - curl \ libzip-dev \ ; \ docker-php-ext-configure gd \ @@ -51,16 +46,11 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ docker-php-ext-install -j "$(nproc)" \ - pdo \ pdo_mysql \ - xml \ gd \ zip \ opcache \ - posix \ ctype \ - json \ - iconv \ pcntl \ ; \ \ diff --git a/2019.09-rc/fpm-alpine/Dockerfile b/2019.09-rc/fpm-alpine/Dockerfile index 9357d13..e0383ca 100644 --- a/2019.09-rc/fpm-alpine/Dockerfile +++ b/2019.09-rc/fpm-alpine/Dockerfile @@ -14,14 +14,11 @@ RUN set -ex; \ RUN set -ex; \ \ apk add -U --no-cache --virtual .build-deps \ - libxml2-dev \ mysql-client \ bash \ autoconf \ g++ \ make \ - openssl \ - openssl-dev \ libpng \ libpng-dev \ libjpeg-turbo-dev \ @@ -36,8 +33,6 @@ RUN set -ex; \ freetype-dev \ librsvg \ libcurl \ - curl \ - curl-dev \ rsync \ bzip2 \ pcre-dev \ @@ -52,16 +47,10 @@ RUN set -ex; \ ; \ \ docker-php-ext-install -j "$(nproc)" \ - pdo \ pdo_mysql \ - xml \ gd \ zip \ opcache \ - posix \ - ctype \ - json \ - iconv \ pcntl \ ; \ \ diff --git a/2019.09-rc/fpm/Dockerfile b/2019.09-rc/fpm/Dockerfile index 3c683ea..bb1945d 100644 --- a/2019.09-rc/fpm/Dockerfile +++ b/2019.09-rc/fpm/Dockerfile @@ -22,14 +22,11 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - libxml2-dev \ mysql-client \ bash \ autoconf \ g++ \ make \ - openssl \ - libssl-dev \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ @@ -40,8 +37,6 @@ RUN set -ex; \ libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ - libcurl4-openssl-dev \ - curl \ libzip-dev \ ; \ docker-php-ext-configure gd \ @@ -51,16 +46,11 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ docker-php-ext-install -j "$(nproc)" \ - pdo \ pdo_mysql \ - xml \ gd \ zip \ opcache \ - posix \ ctype \ - json \ - iconv \ pcntl \ ; \ \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 51e9d1e..3f900e2 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -13,14 +13,11 @@ RUN set -ex; \ RUN set -ex; \ \ apk add -U --no-cache --virtual .build-deps \ - libxml2-dev \ mysql-client \ bash \ autoconf \ g++ \ make \ - openssl \ - openssl-dev \ libpng \ libpng-dev \ libjpeg-turbo-dev \ @@ -35,8 +32,6 @@ RUN set -ex; \ freetype-dev \ librsvg \ libcurl \ - curl \ - curl-dev \ rsync \ bzip2 \ pcre-dev \ @@ -51,16 +46,10 @@ RUN set -ex; \ ; \ \ docker-php-ext-install -j "$(nproc)" \ - pdo \ pdo_mysql \ - xml \ gd \ zip \ opcache \ - posix \ - ctype \ - json \ - iconv \ pcntl \ ; \ \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 301b049..419d912 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -21,14 +21,11 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - libxml2-dev \ mysql-client \ bash \ autoconf \ g++ \ make \ - openssl \ - libssl-dev \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ @@ -39,8 +36,6 @@ RUN set -ex; \ libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ - libcurl4-openssl-dev \ - curl \ libzip-dev \ ; \ docker-php-ext-configure gd \ @@ -50,16 +45,11 @@ RUN set -ex; \ --with-jpeg-dir=/usr/include/ \ ; \ docker-php-ext-install -j "$(nproc)" \ - pdo \ pdo_mysql \ - xml \ gd \ zip \ opcache \ - posix \ ctype \ - json \ - iconv \ pcntl \ ; \ \ From 714883836a7da44255853cc49182fb8cfdbc336b Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sun, 8 Sep 2019 21:05:53 +0200 Subject: [PATCH 3/3] Deduplicate dependencies - Use $PHPIZE_DEPS - remove imagemick - remove libfreetype6 - remove freetype - remove libpng - remove libcurl --- 2019.06/apache/Dockerfile | 6 +----- 2019.06/fpm-alpine/Dockerfile | 11 +---------- 2019.06/fpm/Dockerfile | 6 +----- 2019.09-dev/apache/Dockerfile | 6 +----- 2019.09-dev/fpm-alpine/Dockerfile | 11 +---------- 2019.09-dev/fpm/Dockerfile | 6 +----- 2019.09-rc/apache/Dockerfile | 6 +----- 2019.09-rc/fpm-alpine/Dockerfile | 11 +---------- 2019.09-rc/fpm/Dockerfile | 6 +----- Dockerfile-alpine.template | 11 +---------- Dockerfile-debian.template | 6 +----- 11 files changed, 11 insertions(+), 75 deletions(-) diff --git a/2019.06/apache/Dockerfile b/2019.06/apache/Dockerfile index 30153f4..34576ce 100644 --- a/2019.06/apache/Dockerfile +++ b/2019.06/apache/Dockerfile @@ -24,17 +24,13 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ - imagemagick \ libmagick++-dev \ libmemcached-dev \ libgraphicsmagick1-dev \ - libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ libzip-dev \ diff --git a/2019.06/fpm-alpine/Dockerfile b/2019.06/fpm-alpine/Dockerfile index 35c68b6..dfa6c0d 100644 --- a/2019.06/fpm-alpine/Dockerfile +++ b/2019.06/fpm-alpine/Dockerfile @@ -16,25 +16,16 @@ RUN set -ex; \ apk add -U --no-cache --virtual .build-deps \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ - libpng \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg-turbo-dev \ imagemagick-dev \ - imagemagick \ libtool \ libmemcached-dev \ cyrus-sasl-dev \ - freetype \ - libpng \ libjpeg-turbo-dev \ freetype-dev \ librsvg \ - libcurl \ - rsync \ - bzip2 \ pcre-dev \ libzip-dev \ ; \ diff --git a/2019.06/fpm/Dockerfile b/2019.06/fpm/Dockerfile index f7f6ab9..192ed31 100644 --- a/2019.06/fpm/Dockerfile +++ b/2019.06/fpm/Dockerfile @@ -24,17 +24,13 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ - imagemagick \ libmagick++-dev \ libmemcached-dev \ libgraphicsmagick1-dev \ - libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ libzip-dev \ diff --git a/2019.09-dev/apache/Dockerfile b/2019.09-dev/apache/Dockerfile index 9b9ac5c..9e6b12a 100644 --- a/2019.09-dev/apache/Dockerfile +++ b/2019.09-dev/apache/Dockerfile @@ -24,17 +24,13 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ - imagemagick \ libmagick++-dev \ libmemcached-dev \ libgraphicsmagick1-dev \ - libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ libzip-dev \ diff --git a/2019.09-dev/fpm-alpine/Dockerfile b/2019.09-dev/fpm-alpine/Dockerfile index 1dd2fda..da16dbf 100644 --- a/2019.09-dev/fpm-alpine/Dockerfile +++ b/2019.09-dev/fpm-alpine/Dockerfile @@ -16,25 +16,16 @@ RUN set -ex; \ apk add -U --no-cache --virtual .build-deps \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ - libpng \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg-turbo-dev \ imagemagick-dev \ - imagemagick \ libtool \ libmemcached-dev \ cyrus-sasl-dev \ - freetype \ - libpng \ libjpeg-turbo-dev \ freetype-dev \ librsvg \ - libcurl \ - rsync \ - bzip2 \ pcre-dev \ libzip-dev \ ; \ diff --git a/2019.09-dev/fpm/Dockerfile b/2019.09-dev/fpm/Dockerfile index 3620a85..edbccc8 100644 --- a/2019.09-dev/fpm/Dockerfile +++ b/2019.09-dev/fpm/Dockerfile @@ -24,17 +24,13 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ - imagemagick \ libmagick++-dev \ libmemcached-dev \ libgraphicsmagick1-dev \ - libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ libzip-dev \ diff --git a/2019.09-rc/apache/Dockerfile b/2019.09-rc/apache/Dockerfile index e9265f6..d3d510d 100644 --- a/2019.09-rc/apache/Dockerfile +++ b/2019.09-rc/apache/Dockerfile @@ -24,17 +24,13 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ - imagemagick \ libmagick++-dev \ libmemcached-dev \ libgraphicsmagick1-dev \ - libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ libzip-dev \ diff --git a/2019.09-rc/fpm-alpine/Dockerfile b/2019.09-rc/fpm-alpine/Dockerfile index e0383ca..2e2ab0f 100644 --- a/2019.09-rc/fpm-alpine/Dockerfile +++ b/2019.09-rc/fpm-alpine/Dockerfile @@ -16,25 +16,16 @@ RUN set -ex; \ apk add -U --no-cache --virtual .build-deps \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ - libpng \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg-turbo-dev \ imagemagick-dev \ - imagemagick \ libtool \ libmemcached-dev \ cyrus-sasl-dev \ - freetype \ - libpng \ libjpeg-turbo-dev \ freetype-dev \ librsvg \ - libcurl \ - rsync \ - bzip2 \ pcre-dev \ libzip-dev \ ; \ diff --git a/2019.09-rc/fpm/Dockerfile b/2019.09-rc/fpm/Dockerfile index bb1945d..9115753 100644 --- a/2019.09-rc/fpm/Dockerfile +++ b/2019.09-rc/fpm/Dockerfile @@ -24,17 +24,13 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ - imagemagick \ libmagick++-dev \ libmemcached-dev \ libgraphicsmagick1-dev \ - libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ libzip-dev \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 3f900e2..485cb58 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -15,25 +15,16 @@ RUN set -ex; \ apk add -U --no-cache --virtual .build-deps \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ - libpng \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg-turbo-dev \ imagemagick-dev \ - imagemagick \ libtool \ libmemcached-dev \ cyrus-sasl-dev \ - freetype \ - libpng \ libjpeg-turbo-dev \ freetype-dev \ librsvg \ - libcurl \ - rsync \ - bzip2 \ pcre-dev \ libzip-dev \ ; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 419d912..4cb17d0 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -23,17 +23,13 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ - imagemagick \ libmagick++-dev \ libmemcached-dev \ libgraphicsmagick1-dev \ - libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ libzip-dev \