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 \