diff --git a/php55/Dockerfile b/php55/Dockerfile index a8414da..2ed766b 100644 --- a/php55/Dockerfile +++ b/php55/Dockerfile @@ -9,13 +9,14 @@ ENV APACHE_RUN_GROUP www-data ENV APACHE_REQUEST_WORKERS 150 ENV PATH=/var/www/vendor/bin:$PATH -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list \ + && apt-get update && apt-get install -y --no-install-recommends \ # for bz2 bzip2 libbz2-dev \ # for ftp libssl-dev \ # for gd - libfreetype6-dev libjpeg62-turbo-dev libpng12-dev \ + libfreetype6-dev libjpeg62-turbo-dev libpng-dev \ # for intl libicu-dev \ # for dom @@ -26,14 +27,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libmcrypt-dev \ # for mysql mysql-client \ - # for git - git \ # for ssh client only openssh-client \ # For image optimization jpegoptim \ optipng \ pngquant \ + # We need git >= 2.11 - see https://github.com/cweagans/composer-patches/issues/174. + && apt-get -t jessie-backports install -y git \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ diff --git a/php55/Dockerfile.dev b/php55/Dockerfile.dev index a734219..0c1a26f 100644 --- a/php55/Dockerfile.dev +++ b/php55/Dockerfile.dev @@ -9,13 +9,14 @@ ENV APACHE_RUN_GROUP www-data ENV APACHE_REQUEST_WORKERS 150 ENV PATH=/var/www/vendor/bin:$PATH -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list \ + && apt-get update && apt-get install -y --no-install-recommends \ # for bz2 bzip2 libbz2-dev \ # for ftp libssl-dev \ # for gd - libfreetype6-dev libjpeg62-turbo-dev libpng12-dev \ + libfreetype6-dev libjpeg62-turbo-dev libpng-dev \ # for intl libicu-dev \ # for dom @@ -26,14 +27,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libmcrypt-dev \ # for mysql mysql-client \ - # for git - git \ # for ssh client only openssh-client \ # For image optimization jpegoptim \ optipng \ pngquant \ + # We need git >= 2.11 - see https://github.com/cweagans/composer-patches/issues/174. + && apt-get -t jessie-backports install -y git \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ diff --git a/php56/Dockerfile b/php56/Dockerfile index c701183..b50a709 100644 --- a/php56/Dockerfile +++ b/php56/Dockerfile @@ -9,13 +9,14 @@ ENV APACHE_RUN_GROUP www-data ENV APACHE_REQUEST_WORKERS 150 ENV PATH=/var/www/vendor/bin:$PATH -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list \ + && apt-get update && apt-get install -y --no-install-recommends \ # for bz2 bzip2 libbz2-dev \ # for ftp libssl-dev \ # for gd - libfreetype6-dev libjpeg62-turbo-dev libpng12-dev \ + libfreetype6-dev libjpeg62-turbo-dev libpng-dev \ # for intl libicu-dev \ # for dom @@ -26,14 +27,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libmcrypt-dev \ # for mysql mysql-client \ - # for git - git \ # for ssh client only openssh-client \ # For image optimization jpegoptim \ optipng \ pngquant \ + # We need git >= 2.11 - see https://github.com/cweagans/composer-patches/issues/174. + && apt-get -t jessie-backports install -y git \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ diff --git a/php56/Dockerfile.dev b/php56/Dockerfile.dev index 736abc3..2344a9b 100644 --- a/php56/Dockerfile.dev +++ b/php56/Dockerfile.dev @@ -9,13 +9,14 @@ ENV APACHE_RUN_GROUP www-data ENV APACHE_REQUEST_WORKERS 150 ENV PATH=/var/www/vendor/bin:$PATH -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list \ + && apt-get update && apt-get install -y --no-install-recommends \ # for bz2 bzip2 libbz2-dev \ # for ftp libssl-dev \ # for gd - libfreetype6-dev libjpeg62-turbo-dev libpng12-dev \ + libfreetype6-dev libjpeg62-turbo-dev libpng-dev \ # for intl libicu-dev \ # for dom @@ -26,14 +27,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libmcrypt-dev \ # for mysql mysql-client \ - # for git - git \ # for ssh client only openssh-client \ # For image optimization jpegoptim \ optipng \ pngquant \ + # We need git >= 2.11 - see https://github.com/cweagans/composer-patches/issues/174. + && apt-get -t jessie-backports install -y git \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ diff --git a/php56/Dockerfile.node b/php56/Dockerfile.node index edb59ce..c3a6850 100644 --- a/php56/Dockerfile.node +++ b/php56/Dockerfile.node @@ -9,13 +9,14 @@ ENV APACHE_RUN_GROUP www-data ENV APACHE_REQUEST_WORKERS 150 ENV PATH=/var/www/vendor/bin:$PATH -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list \ + && apt-get update && apt-get install -y --no-install-recommends \ # for bz2 bzip2 libbz2-dev \ # for ftp libssl-dev \ # for gd - libfreetype6-dev libjpeg62-turbo-dev libpng12-dev \ + libfreetype6-dev libjpeg62-turbo-dev libpng-dev \ # for intl libicu-dev \ # for dom @@ -26,14 +27,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libmcrypt-dev \ # for mysql mysql-client \ - # for git - git \ # for ssh client only openssh-client \ # For image optimization jpegoptim \ optipng \ pngquant \ + # We need git >= 2.11 - see https://github.com/cweagans/composer-patches/issues/174. + && apt-get -t jessie-backports install -y git \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ diff --git a/php70/Dockerfile b/php70/Dockerfile index 9851f96..487b1c8 100644 --- a/php70/Dockerfile +++ b/php70/Dockerfile @@ -9,13 +9,14 @@ ENV APACHE_RUN_GROUP www-data ENV APACHE_REQUEST_WORKERS 150 ENV PATH=/var/www/vendor/bin:$PATH -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list \ + && apt-get update && apt-get install -y --no-install-recommends \ # for bz2 bzip2 libbz2-dev \ # for ftp libssl-dev \ # for gd - libfreetype6-dev libjpeg62-turbo-dev libpng12-dev \ + libfreetype6-dev libjpeg62-turbo-dev libpng-dev \ # for intl libicu-dev \ # for dom @@ -26,14 +27,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libmcrypt-dev \ # for mysql mysql-client \ - # for git - git \ # for ssh client only openssh-client \ # For image optimization jpegoptim \ optipng \ pngquant \ + # We need git >= 2.11 - see https://github.com/cweagans/composer-patches/issues/174. + && apt-get -t jessie-backports install -y git \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ diff --git a/php70/Dockerfile.dev b/php70/Dockerfile.dev index 68ab4d2..208c190 100644 --- a/php70/Dockerfile.dev +++ b/php70/Dockerfile.dev @@ -9,13 +9,14 @@ ENV APACHE_RUN_GROUP www-data ENV APACHE_REQUEST_WORKERS 150 ENV PATH=/var/www/vendor/bin:$PATH -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list \ + && apt-get update && apt-get install -y --no-install-recommends \ # for bz2 bzip2 libbz2-dev \ # for ftp libssl-dev \ # for gd - libfreetype6-dev libjpeg62-turbo-dev libpng12-dev \ + libfreetype6-dev libjpeg62-turbo-dev libpng-dev \ # for intl libicu-dev \ # for dom @@ -26,14 +27,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libmcrypt-dev \ # for mysql mysql-client \ - # for git - git \ # for ssh client only openssh-client \ # For image optimization jpegoptim \ optipng \ pngquant \ + # We need git >= 2.11 - see https://github.com/cweagans/composer-patches/issues/174. + && apt-get -t jessie-backports install -y git \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ diff --git a/php71/Dockerfile b/php71/Dockerfile index d82d418..1d082ab 100644 --- a/php71/Dockerfile +++ b/php71/Dockerfile @@ -9,13 +9,14 @@ ENV APACHE_RUN_GROUP www-data ENV APACHE_REQUEST_WORKERS 150 ENV PATH=/var/www/vendor/bin:$PATH -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list \ + && apt-get update && apt-get install -y --no-install-recommends \ # for bz2 bzip2 libbz2-dev \ # for ftp libssl-dev \ # for gd - libfreetype6-dev libjpeg62-turbo-dev libpng12-dev \ + libfreetype6-dev libjpeg62-turbo-dev libpng-dev \ # for intl libicu-dev \ # for dom @@ -26,14 +27,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libmcrypt-dev \ # for mysql mysql-client \ - # for git - git \ # for ssh client only openssh-client \ # For image optimization jpegoptim \ optipng \ pngquant \ + # We need git >= 2.11 - see https://github.com/cweagans/composer-patches/issues/174. + && apt-get -t jessie-backports install -y git \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ diff --git a/php71/Dockerfile.dev b/php71/Dockerfile.dev index d91aa36..85d6e0f 100644 --- a/php71/Dockerfile.dev +++ b/php71/Dockerfile.dev @@ -9,13 +9,14 @@ ENV APACHE_RUN_GROUP www-data ENV APACHE_REQUEST_WORKERS 150 ENV PATH=/var/www/vendor/bin:$PATH -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list \ + && apt-get update && apt-get install -y --no-install-recommends \ # for bz2 bzip2 libbz2-dev \ # for ftp libssl-dev \ # for gd - libfreetype6-dev libjpeg62-turbo-dev libpng12-dev \ + libfreetype6-dev libjpeg62-turbo-dev libpng-dev \ # for intl libicu-dev \ # for dom @@ -26,14 +27,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libmcrypt-dev \ # for mysql mysql-client \ - # for git - git \ # for ssh client only openssh-client \ # For image optimization jpegoptim \ optipng \ pngquant \ + # We need git >= 2.11 - see https://github.com/cweagans/composer-patches/issues/174. + && apt-get -t jessie-backports install -y git \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \