From e4afe0e66bb0c410d62fc9953a0a3a060fe72057 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 21 Apr 2017 17:55:12 -0700 Subject: [PATCH] Add back 8.2 (which is still supported by upstream after all; see https://www.drupal.org/project/drupal/releases/8.2.8) --- .travis.yml | 3 +++ 8.2/apache/Dockerfile | 46 +++++++++++++++++++++++++++++++++++ 8.2/fpm-alpine/Dockerfile | 50 +++++++++++++++++++++++++++++++++++++++ 8.2/fpm/Dockerfile | 44 ++++++++++++++++++++++++++++++++++ 4 files changed, 143 insertions(+) create mode 100644 8.2/apache/Dockerfile create mode 100644 8.2/fpm-alpine/Dockerfile create mode 100644 8.2/fpm/Dockerfile diff --git a/.travis.yml b/.travis.yml index 24f1aeaaa..6acf300df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,9 @@ env: - VERSION=8.3 VARIANT=apache - VERSION=8.3 VARIANT=fpm - VERSION=8.3 VARIANT=fpm-alpine + - VERSION=8.2 VARIANT=apache + - VERSION=8.2 VARIANT=fpm + - VERSION=8.2 VARIANT=fpm-alpine - VERSION=7 VARIANT=apache - VERSION=7 VARIANT=fpm - VERSION=7 VARIANT=fpm-alpine diff --git a/8.2/apache/Dockerfile b/8.2/apache/Dockerfile new file mode 100644 index 000000000..da9e81123 --- /dev/null +++ b/8.2/apache/Dockerfile @@ -0,0 +1,46 @@ +# from https://www.drupal.org/requirements/php#drupalversions +FROM php:7.1-apache + +RUN a2enmod rewrite + +# install the PHP extensions we need +RUN set -ex \ + && buildDeps=' \ + libjpeg62-turbo-dev \ + libpng12-dev \ + libpq-dev \ + ' \ + && apt-get update && apt-get install -y --no-install-recommends $buildDeps && rm -rf /var/lib/apt/lists/* \ + && docker-php-ext-configure gd \ + --with-jpeg-dir=/usr \ + --with-png-dir=/usr \ + && docker-php-ext-install -j "$(nproc)" gd mbstring opcache pdo pdo_mysql pdo_pgsql zip \ +# PHP Warning: PHP Startup: Unable to load dynamic library '/usr/local/lib/php/extensions/no-debug-non-zts-20151012/gd.so' - libjpeg.so.62: cannot open shared object file: No such file or directory in Unknown on line 0 +# PHP Warning: PHP Startup: Unable to load dynamic library '/usr/local/lib/php/extensions/no-debug-non-zts-20151012/pdo_pgsql.so' - libpq.so.5: cannot open shared object file: No such file or directory in Unknown on line 0 + && apt-mark manual \ + libjpeg62-turbo \ + libpq5 \ + && apt-get purge -y --auto-remove $buildDeps + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ + echo 'opcache.enable_cli=1'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini + +WORKDIR /var/www/html + +# https://www.drupal.org/node/3060/release +ENV DRUPAL_VERSION 8.2.8 +ENV DRUPAL_MD5 039507247f3712c3fb022805eb13faf4 + +RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \ + && echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \ + && tar -xz --strip-components=1 -f drupal.tar.gz \ + && rm drupal.tar.gz \ + && chown -R www-data:www-data sites modules themes diff --git a/8.2/fpm-alpine/Dockerfile b/8.2/fpm-alpine/Dockerfile new file mode 100644 index 000000000..a760e04c1 --- /dev/null +++ b/8.2/fpm-alpine/Dockerfile @@ -0,0 +1,50 @@ +# from https://www.drupal.org/requirements/php#drupalversions +FROM php:7.1-fpm-alpine + +# install the PHP extensions we need +# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642 +RUN set -ex \ + && apk add --no-cache --virtual .build-deps \ + coreutils \ + freetype-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + postgresql-dev \ + && docker-php-ext-configure gd \ + --with-freetype-dir=/usr/include/ \ + --with-jpeg-dir=/usr/include/ \ + --with-png-dir=/usr/include/ \ + && docker-php-ext-install -j "$(nproc)" gd mbstring opcache pdo pdo_mysql pdo_pgsql zip \ + && runDeps="$( \ + scanelf --needed --nobanner --recursive \ + /usr/local/lib/php/extensions \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --virtual .drupal-phpexts-rundeps $runDeps \ + && apk del .build-deps + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ + echo 'opcache.enable_cli=1'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini + +WORKDIR /var/www/html + +# https://www.drupal.org/node/3060/release +ENV DRUPAL_VERSION 8.2.8 +ENV DRUPAL_MD5 039507247f3712c3fb022805eb13faf4 + +RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \ + && echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \ + && tar -xz --strip-components=1 -f drupal.tar.gz \ + && rm drupal.tar.gz \ + && chown -R www-data:www-data sites modules themes diff --git a/8.2/fpm/Dockerfile b/8.2/fpm/Dockerfile new file mode 100644 index 000000000..8b8f162ae --- /dev/null +++ b/8.2/fpm/Dockerfile @@ -0,0 +1,44 @@ +# from https://www.drupal.org/requirements/php#drupalversions +FROM php:7.1-fpm + +# install the PHP extensions we need +RUN set -ex \ + && buildDeps=' \ + libjpeg62-turbo-dev \ + libpng12-dev \ + libpq-dev \ + ' \ + && apt-get update && apt-get install -y --no-install-recommends $buildDeps && rm -rf /var/lib/apt/lists/* \ + && docker-php-ext-configure gd \ + --with-jpeg-dir=/usr \ + --with-png-dir=/usr \ + && docker-php-ext-install -j "$(nproc)" gd mbstring opcache pdo pdo_mysql pdo_pgsql zip \ +# PHP Warning: PHP Startup: Unable to load dynamic library '/usr/local/lib/php/extensions/no-debug-non-zts-20151012/gd.so' - libjpeg.so.62: cannot open shared object file: No such file or directory in Unknown on line 0 +# PHP Warning: PHP Startup: Unable to load dynamic library '/usr/local/lib/php/extensions/no-debug-non-zts-20151012/pdo_pgsql.so' - libpq.so.5: cannot open shared object file: No such file or directory in Unknown on line 0 + && apt-mark manual \ + libjpeg62-turbo \ + libpq5 \ + && apt-get purge -y --auto-remove $buildDeps + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ + echo 'opcache.enable_cli=1'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini + +WORKDIR /var/www/html + +# https://www.drupal.org/node/3060/release +ENV DRUPAL_VERSION 8.2.8 +ENV DRUPAL_MD5 039507247f3712c3fb022805eb13faf4 + +RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \ + && echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \ + && tar -xz --strip-components=1 -f drupal.tar.gz \ + && rm drupal.tar.gz \ + && chown -R www-data:www-data sites modules themes