Merge pull request #113 from bushong1/revert-php-version

yosifkit · web-flow · commit ec38c48b57bc · 2018-03-29T11:33:09.000-07:00
Reverts PHP Version to 7.1 for Drupal 8.3/8.4. Resolves Issue #112
diff --git a/7/apache/Dockerfile b/7/apache/Dockerfile
@@ -1,4 +1,4 @@
-# from https://www.drupal.org/requirements/php#drupalversions
+# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
 FROM php:7.0-apache
 
 # install the PHP extensions we need
diff --git a/7/fpm-alpine/Dockerfile b/7/fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-# from https://www.drupal.org/requirements/php#drupalversions
+# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
 FROM php:7.0-fpm-alpine
 
 # install the PHP extensions we need
diff --git a/7/fpm/Dockerfile b/7/fpm/Dockerfile
@@ -1,4 +1,4 @@
-# from https://www.drupal.org/requirements/php#drupalversions
+# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
 FROM php:7.0-fpm
 
 # install the PHP extensions we need
diff --git a/8.3/apache/Dockerfile b/8.3/apache/Dockerfile
@@ -1,5 +1,5 @@
-# from https://www.drupal.org/requirements/php#drupalversions
-FROM php:7.2-apache
+# 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; \
diff --git a/8.3/fpm-alpine/Dockerfile b/8.3/fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
-# from https://www.drupal.org/requirements/php#drupalversions
-FROM php:7.2-fpm-alpine
+# 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
diff --git a/8.3/fpm/Dockerfile b/8.3/fpm/Dockerfile
@@ -1,5 +1,5 @@
-# from https://www.drupal.org/requirements/php#drupalversions
-FROM php:7.2-fpm
+# 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; \
diff --git a/8.4/apache/Dockerfile b/8.4/apache/Dockerfile
@@ -1,5 +1,5 @@
-# from https://www.drupal.org/requirements/php#drupalversions
-FROM php:7.2-apache
+# 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; \
diff --git a/8.4/fpm-alpine/Dockerfile b/8.4/fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
-# from https://www.drupal.org/requirements/php#drupalversions
-FROM php:7.2-fpm-alpine
+# 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
diff --git a/8.4/fpm/Dockerfile b/8.4/fpm/Dockerfile
@@ -1,5 +1,5 @@
-# from https://www.drupal.org/requirements/php#drupalversions
-FROM php:7.2-fpm
+# 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; \
diff --git a/8.5/apache/Dockerfile b/8.5/apache/Dockerfile
@@ -1,4 +1,4 @@
-# from https://www.drupal.org/requirements/php#drupalversions
+# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
 FROM php:7.2-apache
 
 # install the PHP extensions we need
diff --git a/8.5/fpm-alpine/Dockerfile b/8.5/fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-# from https://www.drupal.org/requirements/php#drupalversions
+# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
 FROM php:7.2-fpm-alpine
 
 # install the PHP extensions we need
diff --git a/8.5/fpm/Dockerfile b/8.5/fpm/Dockerfile
@@ -1,4 +1,4 @@
-# from https://www.drupal.org/requirements/php#drupalversions
+# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
 FROM php:7.2-fpm
 
 # install the PHP extensions we need
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -1,4 +1,4 @@
-# from https://www.drupal.org/requirements/php#drupalversions
+# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
 FROM php:%%PHP_VERSION%%-%%VARIANT%%
 
 # install the PHP extensions we need
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -1,4 +1,4 @@
-# from https://www.drupal.org/requirements/php#drupalversions
+# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
 FROM php:%%PHP_VERSION%%-%%VARIANT%%
 
 # install the PHP extensions we need
diff --git a/update.sh b/update.sh
@@ -12,6 +12,8 @@ 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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# from https://www.drupal.org/requirements/php#drupalversions`
	`1`	`+# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements`
`2`	`2`	`FROM php:7.0-apache`
`3`	`3`
`4`	`4`	`# install the PHP extensions we need`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ versions=( "${versions[@]%/}" )`
`12`	`12`	`defaultPhpVersion='7.2'`
`13`	`13`	`declare -A phpVersions=(`
`14`	`14`	`[7]='7.0'`
	`15`	`+ [8.3]='7.1'`
	`16`	`+ [8.4]='7.1'`
`15`	`17`	`)`
`16`	`18`
`17`	`19`	`curl -fsSL 'https://www.drupal.org/node/3060/release' -o release`