From b25abfd65a43d1955367f9b841898ab9f1585817 Mon Sep 17 00:00:00 2001 From: Jingsheng Wang Date: Sun, 22 Jul 2018 10:17:02 +0800 Subject: [PATCH] Added 8.6-rc, removed 8.4 and 8.3 --- .travis.yml | 9 ++-- 8.3/fpm-alpine/Dockerfile | 55 ---------------------- 8.3/fpm/Dockerfile | 66 --------------------------- 8.4/apache/Dockerfile | 66 --------------------------- {8.4/fpm => 8.6-rc/apache}/Dockerfile | 6 +-- {8.4 => 8.6-rc}/fpm-alpine/Dockerfile | 6 +-- {8.3/apache => 8.6-rc/fpm}/Dockerfile | 6 +-- update.sh | 2 - 8 files changed, 12 insertions(+), 204 deletions(-) delete mode 100644 8.3/fpm-alpine/Dockerfile delete mode 100644 8.3/fpm/Dockerfile delete mode 100644 8.4/apache/Dockerfile rename {8.4/fpm => 8.6-rc/apache}/Dockerfile (94%) rename {8.4 => 8.6-rc}/fpm-alpine/Dockerfile (94%) rename {8.3/apache => 8.6-rc/fpm}/Dockerfile (94%) diff --git a/.travis.yml b/.travis.yml index 834c93c4..dd7cd183 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +2,12 @@ language: bash services: docker env: + - VERSION=8.6-rc VARIANT=apache + - VERSION=8.6-rc VARIANT=fpm + - VERSION=8.6-rc VARIANT=fpm-alpine - VERSION=8.5 VARIANT=apache - VERSION=8.5 VARIANT=fpm - VERSION=8.5 VARIANT=fpm-alpine - - VERSION=8.4 VARIANT=apache - - VERSION=8.4 VARIANT=fpm - - VERSION=8.4 VARIANT=fpm-alpine - - VERSION=8.3 VARIANT=apache - - VERSION=8.3 VARIANT=fpm - - VERSION=8.3 VARIANT=fpm-alpine - VERSION=7 VARIANT=apache - VERSION=7 VARIANT=fpm - VERSION=7 VARIANT=fpm-alpine diff --git a/8.3/fpm-alpine/Dockerfile b/8.3/fpm-alpine/Dockerfile deleted file mode 100644 index bdcc6102..00000000 --- a/8.3/fpm-alpine/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements -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 \ - opcache \ - pdo_mysql \ - pdo_pgsql \ - zip \ - && runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )" \ - && 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.3.9 -ENV DRUPAL_MD5 b53f505b0243d608b6a6550ae664bc75 - -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 - -# vim:set ft=dockerfile: diff --git a/8.3/fpm/Dockerfile b/8.3/fpm/Dockerfile deleted file mode 100644 index dc894447..00000000 --- a/8.3/fpm/Dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements -FROM php:7.1-fpm - -# install the PHP extensions we need -RUN set -ex; \ - \ - if command -v a2enmod; then \ - a2enmod rewrite; \ - fi; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - libjpeg-dev \ - libpng-dev \ - libpq-dev \ - ; \ - \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ - docker-php-ext-install -j "$(nproc)" \ - gd \ - opcache \ - pdo_mysql \ - pdo_pgsql \ - zip \ - ; \ - \ -# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark; \ - ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ - | awk '/=>/ { print $3 }' \ - | sort -u \ - | xargs -r dpkg-query -S \ - | cut -d: -f1 \ - | sort -u \ - | xargs -rt apt-mark manual; \ - \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/* - -# 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.3.9 -ENV DRUPAL_MD5 b53f505b0243d608b6a6550ae664bc75 - -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 - -# vim:set ft=dockerfile: diff --git a/8.4/apache/Dockerfile b/8.4/apache/Dockerfile deleted file mode 100644 index a25fad77..00000000 --- a/8.4/apache/Dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements -FROM php:7.1-apache - -# install the PHP extensions we need -RUN set -ex; \ - \ - if command -v a2enmod; then \ - a2enmod rewrite; \ - fi; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - libjpeg-dev \ - libpng-dev \ - libpq-dev \ - ; \ - \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ - docker-php-ext-install -j "$(nproc)" \ - gd \ - opcache \ - pdo_mysql \ - pdo_pgsql \ - zip \ - ; \ - \ -# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark; \ - ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ - | awk '/=>/ { print $3 }' \ - | sort -u \ - | xargs -r dpkg-query -S \ - | cut -d: -f1 \ - | sort -u \ - | xargs -rt apt-mark manual; \ - \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/* - -# 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.4.8 -ENV DRUPAL_MD5 f922c5fead1e05ecf155cfd63983fcf1 - -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 - -# vim:set ft=dockerfile: diff --git a/8.4/fpm/Dockerfile b/8.6-rc/apache/Dockerfile similarity index 94% rename from 8.4/fpm/Dockerfile rename to 8.6-rc/apache/Dockerfile index 15f98bdb..cdacf7a3 100644 --- a/8.4/fpm/Dockerfile +++ b/8.6-rc/apache/Dockerfile @@ -1,5 +1,5 @@ # from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements -FROM php:7.1-fpm +FROM php:7.2-apache # install the PHP extensions we need RUN set -ex; \ @@ -54,8 +54,8 @@ RUN { \ WORKDIR /var/www/html # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 8.4.8 -ENV DRUPAL_MD5 f922c5fead1e05ecf155cfd63983fcf1 +ENV DRUPAL_VERSION 8.6.0-alpha1 +ENV DRUPAL_MD5 15cda0cacdf2287dfa44649d3fc590ef 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 - \ diff --git a/8.4/fpm-alpine/Dockerfile b/8.6-rc/fpm-alpine/Dockerfile similarity index 94% rename from 8.4/fpm-alpine/Dockerfile rename to 8.6-rc/fpm-alpine/Dockerfile index b72da83b..88e3d92c 100644 --- a/8.4/fpm-alpine/Dockerfile +++ b/8.6-rc/fpm-alpine/Dockerfile @@ -1,5 +1,5 @@ # from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements -FROM php:7.1-fpm-alpine +FROM php:7.2-fpm-alpine # install the PHP extensions we need # postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642 @@ -43,8 +43,8 @@ RUN { \ WORKDIR /var/www/html # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 8.4.8 -ENV DRUPAL_MD5 f922c5fead1e05ecf155cfd63983fcf1 +ENV DRUPAL_VERSION 8.6.0-alpha1 +ENV DRUPAL_MD5 15cda0cacdf2287dfa44649d3fc590ef 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 - \ diff --git a/8.3/apache/Dockerfile b/8.6-rc/fpm/Dockerfile similarity index 94% rename from 8.3/apache/Dockerfile rename to 8.6-rc/fpm/Dockerfile index c5967dbf..18054f60 100644 --- a/8.3/apache/Dockerfile +++ b/8.6-rc/fpm/Dockerfile @@ -1,5 +1,5 @@ # from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements -FROM php:7.1-apache +FROM php:7.2-fpm # install the PHP extensions we need RUN set -ex; \ @@ -54,8 +54,8 @@ RUN { \ WORKDIR /var/www/html # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 8.3.9 -ENV DRUPAL_MD5 b53f505b0243d608b6a6550ae664bc75 +ENV DRUPAL_VERSION 8.6.0-alpha1 +ENV DRUPAL_MD5 15cda0cacdf2287dfa44649d3fc590ef 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 - \ diff --git a/update.sh b/update.sh index 5071348e..16a19e19 100755 --- a/update.sh +++ b/update.sh @@ -12,8 +12,6 @@ versions=( "${versions[@]%/}" ) defaultPhpVersion='7.2' declare -A phpVersions=( [7]='7.0' - [8.3]='7.1' - [8.4]='7.1' ) curl -fsSL 'https://www.drupal.org/node/3060/release' -o release