Merge pull request #126 from skyred/patch-35

Added 8.6-rc, removed 8.4 and 8.3
docker-library · Jul 23, 2018 · 417e61f · 417e61f
2 parents aeb1d5f + b25abfd
commit 417e61f
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 204 deletions.
diff --git 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
diff --git a/8.3/fpm/Dockerfile b/8.3/fpm/Dockerfile
diff --git a/8.4/apache/Dockerfile b/8.4/apache/Dockerfile
diff --git a/8.4/fpm/Dockerfile → 8.6-rc/apache/Dockerfile b/8.4/fpm/Dockerfile → 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 → 8.6-rc/fpm-alpine/Dockerfile b/8.4/fpm-alpine/Dockerfile → 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 → 8.6-rc/fpm/Dockerfile b/8.3/apache/Dockerfile → 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
@@ -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