diff --git a/2019.06/apache/Dockerfile b/2019.06/apache/Dockerfile index ae2a804..34576ce 100644 --- a/2019.06/apache/Dockerfile +++ b/2019.06/apache/Dockerfile @@ -22,26 +22,17 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - libxml2-dev \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ - openssl \ - libssl-dev \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ - imagemagick \ libmagick++-dev \ libmemcached-dev \ libgraphicsmagick1-dev \ - libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ - libcurl4-openssl-dev \ - curl \ libzip-dev \ ; \ docker-php-ext-configure gd \ @@ -51,18 +42,11 @@ 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 \ - iconv \ pcntl \ ; \ \ diff --git a/2019.06/fpm-alpine/Dockerfile b/2019.06/fpm-alpine/Dockerfile index 0bd49f7..dfa6c0d 100644 --- a/2019.06/fpm-alpine/Dockerfile +++ b/2019.06/fpm-alpine/Dockerfile @@ -14,32 +14,18 @@ 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 \ + $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 \ - curl \ - curl-dev \ - rsync \ - bzip2 \ pcre-dev \ libzip-dev \ ; \ @@ -52,18 +38,10 @@ RUN set -ex; \ ; \ \ docker-php-ext-install -j "$(nproc)" \ - curl \ - pdo \ pdo_mysql \ - xml \ gd \ zip \ opcache \ - mbstring \ - posix \ - ctype \ - json \ - iconv \ pcntl \ ; \ \ diff --git a/2019.06/fpm/Dockerfile b/2019.06/fpm/Dockerfile index 85f57b9..192ed31 100644 --- a/2019.06/fpm/Dockerfile +++ b/2019.06/fpm/Dockerfile @@ -22,26 +22,17 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - libxml2-dev \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ - openssl \ - libssl-dev \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ - imagemagick \ libmagick++-dev \ libmemcached-dev \ libgraphicsmagick1-dev \ - libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ - libcurl4-openssl-dev \ - curl \ libzip-dev \ ; \ docker-php-ext-configure gd \ @@ -51,18 +42,11 @@ 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 \ - iconv \ pcntl \ ; \ \ diff --git a/2019.09-dev/apache/Dockerfile b/2019.09-dev/apache/Dockerfile index bbf8c81..9e6b12a 100644 --- a/2019.09-dev/apache/Dockerfile +++ b/2019.09-dev/apache/Dockerfile @@ -22,26 +22,17 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - libxml2-dev \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ - openssl \ - libssl-dev \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ - imagemagick \ libmagick++-dev \ libmemcached-dev \ libgraphicsmagick1-dev \ - libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ - libcurl4-openssl-dev \ - curl \ libzip-dev \ ; \ docker-php-ext-configure gd \ @@ -51,18 +42,11 @@ 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 \ - iconv \ pcntl \ ; \ \ diff --git a/2019.09-dev/fpm-alpine/Dockerfile b/2019.09-dev/fpm-alpine/Dockerfile index d8fd1c4..da16dbf 100644 --- a/2019.09-dev/fpm-alpine/Dockerfile +++ b/2019.09-dev/fpm-alpine/Dockerfile @@ -14,32 +14,18 @@ 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 \ + $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 \ - curl \ - curl-dev \ - rsync \ - bzip2 \ pcre-dev \ libzip-dev \ ; \ @@ -52,18 +38,10 @@ RUN set -ex; \ ; \ \ docker-php-ext-install -j "$(nproc)" \ - curl \ - pdo \ pdo_mysql \ - xml \ gd \ zip \ opcache \ - mbstring \ - posix \ - ctype \ - json \ - iconv \ pcntl \ ; \ \ diff --git a/2019.09-dev/fpm/Dockerfile b/2019.09-dev/fpm/Dockerfile index 5bb4218..edbccc8 100644 --- a/2019.09-dev/fpm/Dockerfile +++ b/2019.09-dev/fpm/Dockerfile @@ -22,26 +22,17 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - libxml2-dev \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ - openssl \ - libssl-dev \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ - imagemagick \ libmagick++-dev \ libmemcached-dev \ libgraphicsmagick1-dev \ - libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ - libcurl4-openssl-dev \ - curl \ libzip-dev \ ; \ docker-php-ext-configure gd \ @@ -51,18 +42,11 @@ 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 \ - iconv \ pcntl \ ; \ \ diff --git a/2019.09-rc/apache/Dockerfile b/2019.09-rc/apache/Dockerfile index 1d4c8c0..d3d510d 100644 --- a/2019.09-rc/apache/Dockerfile +++ b/2019.09-rc/apache/Dockerfile @@ -22,26 +22,17 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - libxml2-dev \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ - openssl \ - libssl-dev \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ - imagemagick \ libmagick++-dev \ libmemcached-dev \ libgraphicsmagick1-dev \ - libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ - libcurl4-openssl-dev \ - curl \ libzip-dev \ ; \ docker-php-ext-configure gd \ @@ -51,18 +42,11 @@ 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 \ - iconv \ pcntl \ ; \ \ diff --git a/2019.09-rc/fpm-alpine/Dockerfile b/2019.09-rc/fpm-alpine/Dockerfile index 7aa3a9a..2e2ab0f 100644 --- a/2019.09-rc/fpm-alpine/Dockerfile +++ b/2019.09-rc/fpm-alpine/Dockerfile @@ -14,32 +14,18 @@ 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 \ + $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 \ - curl \ - curl-dev \ - rsync \ - bzip2 \ pcre-dev \ libzip-dev \ ; \ @@ -52,18 +38,10 @@ RUN set -ex; \ ; \ \ docker-php-ext-install -j "$(nproc)" \ - curl \ - pdo \ pdo_mysql \ - xml \ gd \ zip \ opcache \ - mbstring \ - posix \ - ctype \ - json \ - iconv \ pcntl \ ; \ \ diff --git a/2019.09-rc/fpm/Dockerfile b/2019.09-rc/fpm/Dockerfile index 13fca77..9115753 100644 --- a/2019.09-rc/fpm/Dockerfile +++ b/2019.09-rc/fpm/Dockerfile @@ -22,26 +22,17 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - libxml2-dev \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ - openssl \ - libssl-dev \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ - imagemagick \ libmagick++-dev \ libmemcached-dev \ libgraphicsmagick1-dev \ - libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ - libcurl4-openssl-dev \ - curl \ libzip-dev \ ; \ docker-php-ext-configure gd \ @@ -51,18 +42,11 @@ 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 \ - iconv \ pcntl \ ; \ \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 0d3e003..485cb58 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -13,32 +13,18 @@ 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 \ + $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 \ - curl \ - curl-dev \ - rsync \ - bzip2 \ pcre-dev \ libzip-dev \ ; \ @@ -51,18 +37,10 @@ RUN set -ex; \ ; \ \ docker-php-ext-install -j "$(nproc)" \ - curl \ - pdo \ pdo_mysql \ - xml \ gd \ zip \ opcache \ - mbstring \ - posix \ - ctype \ - json \ - iconv \ pcntl \ ; \ \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 16ad29c..4cb17d0 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -21,26 +21,17 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ - libxml2-dev \ mysql-client \ bash \ - autoconf \ - g++ \ - make \ - openssl \ - libssl-dev \ + $PHPIZE_DEPS \ libpng-dev \ libjpeg62-turbo-dev \ libtool \ - imagemagick \ libmagick++-dev \ libmemcached-dev \ libgraphicsmagick1-dev \ - libfreetype6 \ libfreetype6-dev \ librsvg2-2 \ - libcurl4-openssl-dev \ - curl \ libzip-dev \ ; \ docker-php-ext-configure gd \ @@ -50,18 +41,11 @@ 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 \ - iconv \ pcntl \ ; \ \