Merge pull request #99 from skyred/patch-32

Remove 8.3 branch, and add 8.5 branch with PHP 7.2

Author: tianon

.travis.yml

@@ -2,12 +2,12 @@ language: bash
 services: docker
 
 env:
+  - 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

8.4/apache/Dockerfile

@@ -7,7 +7,7 @@ RUN a2enmod rewrite
 RUN set -ex \
 	&& buildDeps=' \
 		libjpeg62-turbo-dev \
-		libpng12-dev \
+		libpng-dev \
 		libpq-dev \
 	' \
 	&& apt-get update && apt-get install -y --no-install-recommends $buildDeps && rm -rf /var/lib/apt/lists/* \

8.4/fpm/Dockerfile

@@ -5,7 +5,7 @@ FROM php:7.1-fpm
 RUN set -ex \
 	&& buildDeps=' \
 		libjpeg62-turbo-dev \
-		libpng12-dev \
+		libpng-dev \
 		libpq-dev \
 	' \
 	&& apt-get update && apt-get install -y --no-install-recommends $buildDeps && rm -rf /var/lib/apt/lists/* \

8.3/apache/Dockerfile renamed to 8.5/apache/Dockerfile

@@ -1,13 +1,13 @@
 # from https://www.drupal.org/requirements/php#drupalversions
-FROM php:7.1-apache
+FROM php:7.2-apache
 
 RUN a2enmod rewrite
 
 # install the PHP extensions we need
 RUN set -ex \
 	&& buildDeps=' \
 		libjpeg62-turbo-dev \
-		libpng12-dev \
+		libpng-dev \
 		libpq-dev \
 	' \
 	&& apt-get update && apt-get install -y --no-install-recommends $buildDeps && rm -rf /var/lib/apt/lists/* \
@@ -36,8 +36,8 @@ RUN { \
 WORKDIR /var/www/html
 
 # https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 8.3.7
-ENV DRUPAL_MD5 e7b1f382d6bd2b18d4b4aca01d335bc0
+ENV DRUPAL_VERSION 8.5.0-alpha1
+ENV DRUPAL_MD5 415dda1360f95c376870d2a3786483c7
 
 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 - \

8.3/fpm-alpine/Dockerfile renamed to 8.5/fpm-alpine/Dockerfile

@@ -1,5 +1,5 @@
 # from https://www.drupal.org/requirements/php#drupalversions
-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
@@ -38,8 +38,8 @@ RUN { \
 WORKDIR /var/www/html
 
 # https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 8.3.7
-ENV DRUPAL_MD5 e7b1f382d6bd2b18d4b4aca01d335bc0
+ENV DRUPAL_VERSION 8.5.0-alpha1
+ENV DRUPAL_MD5 415dda1360f95c376870d2a3786483c7
 
 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 - \

8.3/fpm/Dockerfile renamed to 8.5/fpm/Dockerfile

@@ -1,11 +1,11 @@
 # from https://www.drupal.org/requirements/php#drupalversions
-FROM php:7.1-fpm
+FROM php:7.2-fpm
 
 # install the PHP extensions we need
 RUN set -ex \
 	&& buildDeps=' \
 		libjpeg62-turbo-dev \
-		libpng12-dev \
+		libpng-dev \
 		libpq-dev \
 	' \
 	&& apt-get update && apt-get install -y --no-install-recommends $buildDeps && rm -rf /var/lib/apt/lists/* \
@@ -34,8 +34,8 @@ RUN { \
 WORKDIR /var/www/html
 
 # https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 8.3.7
-ENV DRUPAL_MD5 e7b1f382d6bd2b18d4b4aca01d335bc0
+ENV DRUPAL_VERSION 8.5.0-alpha1
+ENV DRUPAL_MD5 415dda1360f95c376870d2a3786483c7
 
 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 - \