From a4745f5852c6063d70b328f9b51461ff0cfe88f0 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Fri, 1 Dec 2017 07:44:45 +0100 Subject: [PATCH 1/3] Fix #87: Add PHP7.2 (#84) * Add PHP7.2 preview * Use rc- images * Updated 7.2.0RC6 to released * Replace libpng12-dev with libpng-dev * Remove preview notice --- .travis.yml | 5 +++++ 7.2/Dockerfile-alpine-cli | 26 ++++++++++++++++++++++++++ 7.2/Dockerfile-alpine-fpm | 15 +++++++++++++++ 7.2/Dockerfile-apache | 15 +++++++++++++++ 7.2/Dockerfile-cli | 25 +++++++++++++++++++++++++ 7.2/Dockerfile-fpm | 14 ++++++++++++++ 7.2/cli/drupal-cli.ini | 3 +++ 7.2/drupal-00.ini | 10 ++++++++++ 7.2/drupal-opcache.ini | 6 ++++++ README.md | 6 ++++++ 10 files changed, 125 insertions(+) create mode 100644 7.2/Dockerfile-alpine-cli create mode 100644 7.2/Dockerfile-alpine-fpm create mode 100644 7.2/Dockerfile-apache create mode 100644 7.2/Dockerfile-cli create mode 100644 7.2/Dockerfile-fpm create mode 100644 7.2/cli/drupal-cli.ini create mode 100644 7.2/drupal-00.ini create mode 100644 7.2/drupal-opcache.ini diff --git a/.travis.yml b/.travis.yml index 42ac8e7..9ed7a1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,11 @@ env: - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.1" - DOCKERFILE="Dockerfile-alpine-cli" DOCKERPATH="7.1" - DOCKERFILE="Dockerfile-alpine-fpm" DOCKERPATH="7.1" + - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.2" + - DOCKERFILE="Dockerfile-apache" DOCKERPATH="7.2" + - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.2" + - DOCKERFILE="Dockerfile-alpine-cli" DOCKERPATH="7.2" + - DOCKERFILE="Dockerfile-alpine-fpm" DOCKERPATH="7.2" before_script: - docker version diff --git a/7.2/Dockerfile-alpine-cli b/7.2/Dockerfile-alpine-cli new file mode 100644 index 0000000..cbacb94 --- /dev/null +++ b/7.2/Dockerfile-alpine-cli @@ -0,0 +1,26 @@ +FROM php:7.2-alpine +MAINTAINER drupal-docker + +VOLUME /var/www/html +WORKDIR /var/www/html + +RUN apk add --no-cache --virtual .dd-build-deps libpng-dev libjpeg-turbo-dev postgresql-dev libxml2-dev $PHPIZE_DEPS \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache bcmath soap \ + && pecl install redis-3.1.1 \ + && docker-php-ext-enable redis \ + && curl -sS https://getcomposer.org/installer | php \ + && mv composer.phar /usr/local/bin/composer \ + && curl -L -o drush.phar https://github.com/drush-ops/drush-launcher/releases/download/0.4.2/drush.phar \ + && chmod +x drush.phar \ + && mv drush.phar /usr/local/bin/drush \ + && curl -L -o drupal.phar https://drupalconsole.com/installer \ + && chmod +x drupal.phar \ + && mv drupal.phar /usr/local/bin/drupal \ + && echo "export PATH=~/.composer/vendor/bin:\$PATH" >> ~/.bash_profile \ + && apk add --no-cache sudo git libpng libjpeg libpq libxml2 mysql-client openssh-client rsync \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ +COPY cli/drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.2/Dockerfile-alpine-fpm b/7.2/Dockerfile-alpine-fpm new file mode 100644 index 0000000..39707a9 --- /dev/null +++ b/7.2/Dockerfile-alpine-fpm @@ -0,0 +1,15 @@ +FROM php:7.2-fpm-alpine +MAINTAINER drupal-docker + +VOLUME /var/www/html + +RUN apk add --no-cache --virtual .dd-build-deps libpng-dev libjpeg-turbo-dev postgresql-dev libxml2-dev $PHPIZE_DEPS \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache bcmath soap \ + && pecl install redis-3.1.1 \ + && docker-php-ext-enable redis \ + && apk add --no-cache libpng libjpeg libpq libxml2 \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.2/Dockerfile-apache b/7.2/Dockerfile-apache new file mode 100644 index 0000000..ea076eb --- /dev/null +++ b/7.2/Dockerfile-apache @@ -0,0 +1,15 @@ +FROM php:7.2-apache +MAINTAINER drupal-docker + +VOLUME /var/www/html + +RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev libxml2-dev \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache bcmath soap \ + && pecl install redis-3.1.1 \ + && docker-php-ext-enable redis \ + && a2enmod rewrite \ + && rm -rf /var/lib/apt/lists/* + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.2/Dockerfile-cli b/7.2/Dockerfile-cli new file mode 100644 index 0000000..16789a1 --- /dev/null +++ b/7.2/Dockerfile-cli @@ -0,0 +1,25 @@ +FROM php:7.2-cli +MAINTAINER drupal-docker + +VOLUME /var/www/html +WORKDIR /var/www/html + +RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev libxml2-dev sudo git mysql-client openssh-client rsync \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache bcmath soap \ + && pecl install redis-3.1.1 \ + && docker-php-ext-enable redis \ + && curl -sS https://getcomposer.org/installer | php \ + && mv composer.phar /usr/local/bin/composer \ + && curl -L -o drush.phar https://github.com/drush-ops/drush-launcher/releases/download/0.4.2/drush.phar \ + && chmod +x drush.phar \ + && mv drush.phar /usr/local/bin/drush \ + && curl -L -o drupal.phar https://drupalconsole.com/installer \ + && chmod +x drupal.phar \ + && mv drupal.phar /usr/local/bin/drupal \ + && echo "export PATH=~/.composer/vendor/bin:\$PATH" >> ~/.bash_profile \ + && rm -rf /var/lib/apt/lists/* + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ +COPY cli/drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.2/Dockerfile-fpm b/7.2/Dockerfile-fpm new file mode 100644 index 0000000..1375d7f --- /dev/null +++ b/7.2/Dockerfile-fpm @@ -0,0 +1,14 @@ +FROM php:7.2-fpm +MAINTAINER drupal-docker + +VOLUME /var/www/html + +RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev libxml2-dev \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache bcmath soap \ + && pecl install redis-3.1.1 \ + && docker-php-ext-enable redis \ + && rm -rf /var/lib/apt/lists/* + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.2/cli/drupal-cli.ini b/7.2/cli/drupal-cli.ini new file mode 100644 index 0000000..588ab91 --- /dev/null +++ b/7.2/cli/drupal-cli.ini @@ -0,0 +1,3 @@ +allow_url_fopen = On +display_errors = On +memory_limit = -1 diff --git a/7.2/drupal-00.ini b/7.2/drupal-00.ini new file mode 100644 index 0000000..5f76a4a --- /dev/null +++ b/7.2/drupal-00.ini @@ -0,0 +1,10 @@ +session.cache_limiter = nocache +session.auto_start = 0 +expose_php = Off +allow_url_fopen = Off +register_globals = Off +display_errors = Off +memory_limit = 512M +date.timezone = "UTC" +upload_max_filesize = 20M +post_max_size = 20M diff --git a/7.2/drupal-opcache.ini b/7.2/drupal-opcache.ini new file mode 100644 index 0000000..7964455 --- /dev/null +++ b/7.2/drupal-opcache.ini @@ -0,0 +1,6 @@ +opcache.memory_consumption=128 +opcache.interned_strings_buffer=8 +opcache.max_accelerated_files=4000 +opcache.revalidate_freq=60 +opcache.fast_shutdown=1 +opcache.enable_cli=1 diff --git a/README.md b/README.md index 4996cbe..32b1b74 100644 --- a/README.md +++ b/README.md @@ -20,5 +20,11 @@ PHP | | apache | `7.1-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1/Dockerfile-apache) | | | fpm | `7.1-fpm`, `7.1` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1/Dockerfile-fpm) | | | | `7.1-alpine-fpm` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1/Dockerfile-alpine-fpm) | +| 7.2 | cli | `7.2-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.2/Dockerfile-cli) | +| | | `7.2-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.2/Dockerfile-alpine-cli) | +| | apache | `7.2-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.2/Dockerfile-apache) | +| | fpm | `7.2-fpm`, `7.2` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.2/Dockerfile-fpm) | +| | | `7.2-alpine-fpm` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.2/Dockerfile-alpine-fpm) | + Read more: http://www.drupaldocker.org/images/PHP.html From d8715d6ef020cf7663d9d5d20ea3f965d0a87da8 Mon Sep 17 00:00:00 2001 From: zaporylie Date: Sun, 8 Apr 2018 23:23:12 +0200 Subject: [PATCH 2/3] PDO build error --- 5.6/Dockerfile-alpine-cli | 2 +- 5.6/Dockerfile-alpine-fpm | 2 +- 5.6/Dockerfile-apache | 2 +- 5.6/Dockerfile-cli | 2 +- 5.6/Dockerfile-fpm | 2 +- 7.0/Dockerfile-alpine-cli | 2 +- 7.0/Dockerfile-alpine-fpm | 2 +- 7.0/Dockerfile-apache | 2 +- 7.0/Dockerfile-cli | 2 +- 7.0/Dockerfile-fpm | 2 +- 7.1/Dockerfile-alpine-cli | 2 +- 7.1/Dockerfile-alpine-fpm | 2 +- 7.1/Dockerfile-apache | 2 +- 7.1/Dockerfile-cli | 2 +- 7.1/Dockerfile-fpm | 2 +- 7.2/Dockerfile-alpine-cli | 2 +- 7.2/Dockerfile-alpine-fpm | 2 +- 7.2/Dockerfile-apache | 2 +- 7.2/Dockerfile-cli | 2 +- 7.2/Dockerfile-fpm | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/5.6/Dockerfile-alpine-cli b/5.6/Dockerfile-alpine-cli index e33325c..518f072 100644 --- a/5.6/Dockerfile-alpine-cli +++ b/5.6/Dockerfile-alpine-cli @@ -6,7 +6,7 @@ WORKDIR /var/www/html RUN apk add --no-cache --virtual .dd-build-deps libpng-dev libjpeg-turbo-dev postgresql-dev libxml2-dev $PHPIZE_DEPS \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-2.2.8 \ && docker-php-ext-enable redis \ diff --git a/5.6/Dockerfile-alpine-fpm b/5.6/Dockerfile-alpine-fpm index f7eba4e..f19856a 100644 --- a/5.6/Dockerfile-alpine-fpm +++ b/5.6/Dockerfile-alpine-fpm @@ -5,7 +5,7 @@ VOLUME /var/www/html RUN apk add --no-cache --virtual .dd-build-deps libpng-dev libjpeg-turbo-dev postgresql-dev libxml2-dev $PHPIZE_DEPS \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-2.2.8 \ && docker-php-ext-enable redis \ diff --git a/5.6/Dockerfile-apache b/5.6/Dockerfile-apache index f65f72d..c71cdde 100644 --- a/5.6/Dockerfile-apache +++ b/5.6/Dockerfile-apache @@ -5,7 +5,7 @@ VOLUME /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-2.2.8 \ && docker-php-ext-enable redis \ diff --git a/5.6/Dockerfile-cli b/5.6/Dockerfile-cli index 0516719..a2be363 100644 --- a/5.6/Dockerfile-cli +++ b/5.6/Dockerfile-cli @@ -6,7 +6,7 @@ WORKDIR /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev sudo git mysql-client openssh-client rsync \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-2.2.8 \ && docker-php-ext-enable redis \ diff --git a/5.6/Dockerfile-fpm b/5.6/Dockerfile-fpm index b7b56cd..96c0ed3 100644 --- a/5.6/Dockerfile-fpm +++ b/5.6/Dockerfile-fpm @@ -5,7 +5,7 @@ VOLUME /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-2.2.8 \ && docker-php-ext-enable redis \ diff --git a/7.0/Dockerfile-alpine-cli b/7.0/Dockerfile-alpine-cli index 555adec..c0b0e06 100644 --- a/7.0/Dockerfile-alpine-cli +++ b/7.0/Dockerfile-alpine-cli @@ -6,7 +6,7 @@ WORKDIR /var/www/html RUN apk add --no-cache --virtual .dd-build-deps libpng-dev libjpeg-turbo-dev postgresql-dev libxml2-dev $PHPIZE_DEPS \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-3.1.1 \ && docker-php-ext-enable redis \ diff --git a/7.0/Dockerfile-alpine-fpm b/7.0/Dockerfile-alpine-fpm index 2214481..790aca0 100644 --- a/7.0/Dockerfile-alpine-fpm +++ b/7.0/Dockerfile-alpine-fpm @@ -5,7 +5,7 @@ VOLUME /var/www/html RUN apk add --no-cache --virtual .dd-build-deps libpng-dev libjpeg-turbo-dev postgresql-dev libxml2-dev $PHPIZE_DEPS \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-3.1.1 \ && docker-php-ext-enable redis \ diff --git a/7.0/Dockerfile-apache b/7.0/Dockerfile-apache index cec876d..61dca4b 100644 --- a/7.0/Dockerfile-apache +++ b/7.0/Dockerfile-apache @@ -5,7 +5,7 @@ VOLUME /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-3.1.1 \ && docker-php-ext-enable redis \ diff --git a/7.0/Dockerfile-cli b/7.0/Dockerfile-cli index e3fde8c..7e455cc 100644 --- a/7.0/Dockerfile-cli +++ b/7.0/Dockerfile-cli @@ -6,7 +6,7 @@ WORKDIR /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev sudo git mysql-client openssh-client rsync \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-3.1.1 \ && docker-php-ext-enable redis \ diff --git a/7.0/Dockerfile-fpm b/7.0/Dockerfile-fpm index f7aac84..12dc8de 100644 --- a/7.0/Dockerfile-fpm +++ b/7.0/Dockerfile-fpm @@ -6,7 +6,7 @@ VOLUME /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-3.1.1 \ && docker-php-ext-enable redis \ diff --git a/7.1/Dockerfile-alpine-cli b/7.1/Dockerfile-alpine-cli index b7bf3bd..7ccaf80 100644 --- a/7.1/Dockerfile-alpine-cli +++ b/7.1/Dockerfile-alpine-cli @@ -6,7 +6,7 @@ WORKDIR /var/www/html RUN apk add --no-cache --virtual .dd-build-deps libpng-dev libjpeg-turbo-dev postgresql-dev libxml2-dev $PHPIZE_DEPS \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-3.1.1 \ && docker-php-ext-enable redis \ diff --git a/7.1/Dockerfile-alpine-fpm b/7.1/Dockerfile-alpine-fpm index 247916a..a9f97f0 100644 --- a/7.1/Dockerfile-alpine-fpm +++ b/7.1/Dockerfile-alpine-fpm @@ -5,7 +5,7 @@ VOLUME /var/www/html RUN apk add --no-cache --virtual .dd-build-deps libpng-dev libjpeg-turbo-dev postgresql-dev libxml2-dev $PHPIZE_DEPS \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-3.1.1 \ && docker-php-ext-enable redis \ diff --git a/7.1/Dockerfile-apache b/7.1/Dockerfile-apache index 6c01bf8..fde0eb7 100644 --- a/7.1/Dockerfile-apache +++ b/7.1/Dockerfile-apache @@ -5,7 +5,7 @@ VOLUME /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-3.1.1 \ && docker-php-ext-enable redis \ diff --git a/7.1/Dockerfile-cli b/7.1/Dockerfile-cli index 49571a6..892d5b0 100644 --- a/7.1/Dockerfile-cli +++ b/7.1/Dockerfile-cli @@ -6,7 +6,7 @@ WORKDIR /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev sudo git mysql-client openssh-client rsync \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-3.1.1 \ && docker-php-ext-enable redis \ diff --git a/7.1/Dockerfile-fpm b/7.1/Dockerfile-fpm index 0932678..29fa9ba 100644 --- a/7.1/Dockerfile-fpm +++ b/7.1/Dockerfile-fpm @@ -5,7 +5,7 @@ VOLUME /var/www/html RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-3.1.1 \ && docker-php-ext-enable redis \ diff --git a/7.2/Dockerfile-alpine-cli b/7.2/Dockerfile-alpine-cli index cbacb94..66dd1fd 100644 --- a/7.2/Dockerfile-alpine-cli +++ b/7.2/Dockerfile-alpine-cli @@ -6,7 +6,7 @@ WORKDIR /var/www/html RUN apk add --no-cache --virtual .dd-build-deps libpng-dev libjpeg-turbo-dev postgresql-dev libxml2-dev $PHPIZE_DEPS \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-3.1.1 \ && docker-php-ext-enable redis \ diff --git a/7.2/Dockerfile-alpine-fpm b/7.2/Dockerfile-alpine-fpm index 39707a9..8cd80e4 100644 --- a/7.2/Dockerfile-alpine-fpm +++ b/7.2/Dockerfile-alpine-fpm @@ -5,7 +5,7 @@ VOLUME /var/www/html RUN apk add --no-cache --virtual .dd-build-deps libpng-dev libjpeg-turbo-dev postgresql-dev libxml2-dev $PHPIZE_DEPS \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-3.1.1 \ && docker-php-ext-enable redis \ diff --git a/7.2/Dockerfile-apache b/7.2/Dockerfile-apache index ea076eb..1717c07 100644 --- a/7.2/Dockerfile-apache +++ b/7.2/Dockerfile-apache @@ -5,7 +5,7 @@ VOLUME /var/www/html RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev libxml2-dev \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-3.1.1 \ && docker-php-ext-enable redis \ diff --git a/7.2/Dockerfile-cli b/7.2/Dockerfile-cli index 16789a1..2deb511 100644 --- a/7.2/Dockerfile-cli +++ b/7.2/Dockerfile-cli @@ -6,7 +6,7 @@ WORKDIR /var/www/html RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev libxml2-dev sudo git mysql-client openssh-client rsync \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-3.1.1 \ && docker-php-ext-enable redis \ diff --git a/7.2/Dockerfile-fpm b/7.2/Dockerfile-fpm index 1375d7f..9348cae 100644 --- a/7.2/Dockerfile-fpm +++ b/7.2/Dockerfile-fpm @@ -5,7 +5,7 @@ VOLUME /var/www/html RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev libxml2-dev \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ && pecl install redis-3.1.1 \ && docker-php-ext-enable redis \ From 6ae85eb07b2c693997d243be50848771222e0d63 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 21 Jun 2018 13:19:00 +0200 Subject: [PATCH 3/3] Fix libpng12-dev --- 5.6/Dockerfile-apache | 2 +- 5.6/Dockerfile-cli | 2 +- 5.6/Dockerfile-fpm | 2 +- 7.0/Dockerfile-apache | 2 +- 7.0/Dockerfile-cli | 2 +- 7.0/Dockerfile-fpm | 2 +- 7.1/Dockerfile-apache | 2 +- 7.1/Dockerfile-cli | 2 +- 7.1/Dockerfile-fpm | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/5.6/Dockerfile-apache b/5.6/Dockerfile-apache index c71cdde..c9bbd35 100644 --- a/5.6/Dockerfile-apache +++ b/5.6/Dockerfile-apache @@ -3,7 +3,7 @@ MAINTAINER drupal-docker VOLUME /var/www/html -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev \ +RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev libxml2-dev \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ diff --git a/5.6/Dockerfile-cli b/5.6/Dockerfile-cli index a2be363..51f848c 100644 --- a/5.6/Dockerfile-cli +++ b/5.6/Dockerfile-cli @@ -4,7 +4,7 @@ MAINTAINER drupal-docker VOLUME /var/www/html WORKDIR /var/www/html -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev sudo git mysql-client openssh-client rsync \ +RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev libxml2-dev sudo git mysql-client openssh-client rsync \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ diff --git a/5.6/Dockerfile-fpm b/5.6/Dockerfile-fpm index 96c0ed3..6922536 100644 --- a/5.6/Dockerfile-fpm +++ b/5.6/Dockerfile-fpm @@ -3,7 +3,7 @@ MAINTAINER drupal-docker VOLUME /var/www/html -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev \ +RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev libxml2-dev \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ diff --git a/7.0/Dockerfile-apache b/7.0/Dockerfile-apache index 61dca4b..a8cd755 100644 --- a/7.0/Dockerfile-apache +++ b/7.0/Dockerfile-apache @@ -3,7 +3,7 @@ MAINTAINER drupal-docker VOLUME /var/www/html -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev \ +RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev libxml2-dev \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ diff --git a/7.0/Dockerfile-cli b/7.0/Dockerfile-cli index 7e455cc..743cbcd 100644 --- a/7.0/Dockerfile-cli +++ b/7.0/Dockerfile-cli @@ -4,7 +4,7 @@ MAINTAINER drupal-docker VOLUME /var/www/html WORKDIR /var/www/html -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev sudo git mysql-client openssh-client rsync \ +RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev libxml2-dev sudo git mysql-client openssh-client rsync \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ diff --git a/7.0/Dockerfile-fpm b/7.0/Dockerfile-fpm index 12dc8de..cd0889f 100644 --- a/7.0/Dockerfile-fpm +++ b/7.0/Dockerfile-fpm @@ -4,7 +4,7 @@ MAINTAINER drupal-docker VOLUME /var/www/html -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev \ +RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev libxml2-dev \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ diff --git a/7.1/Dockerfile-apache b/7.1/Dockerfile-apache index fde0eb7..64954c1 100644 --- a/7.1/Dockerfile-apache +++ b/7.1/Dockerfile-apache @@ -3,7 +3,7 @@ MAINTAINER drupal-docker VOLUME /var/www/html -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev \ +RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev libxml2-dev \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ diff --git a/7.1/Dockerfile-cli b/7.1/Dockerfile-cli index 892d5b0..782f9c4 100644 --- a/7.1/Dockerfile-cli +++ b/7.1/Dockerfile-cli @@ -4,7 +4,7 @@ MAINTAINER drupal-docker VOLUME /var/www/html WORKDIR /var/www/html -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev sudo git mysql-client openssh-client rsync \ +RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev libxml2-dev sudo git mysql-client openssh-client rsync \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \ diff --git a/7.1/Dockerfile-fpm b/7.1/Dockerfile-fpm index 29fa9ba..f252200 100644 --- a/7.1/Dockerfile-fpm +++ b/7.1/Dockerfile-fpm @@ -3,7 +3,7 @@ MAINTAINER drupal-docker VOLUME /var/www/html -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev libxml2-dev \ +RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev libxml2-dev \ && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ && docker-php-ext-install gd mbstring pdo_mysql pdo_pgsql zip \ && docker-php-ext-install opcache bcmath soap \