Merge pull request #416 from nextcloud/php-7.214.0.0beta2-fpm-alpine14.0.0beta2-fpm14.0.0beta2-apache14.0.0beta2

 Switch to php 7.2 for nextcloud 13.0 and greater 

12 files changed, 8 insertions, 18 deletions

diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile
index 1459353d..5059594b 100644
--- a/12.0/apache/Dockerfile
+++ b/12.0/apache/Dockerfile
@@ -43,7 +43,6 @@ RUN set -ex; \
         gd \
         intl \
         ldap \
-        mcrypt \
         opcache \
         pcntl \
         pdo_mysql \
diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile
index 7cc1fccb..4f80e619 100644
--- a/12.0/fpm-alpine/Dockerfile
+++ b/12.0/fpm-alpine/Dockerfile
@@ -37,7 +37,6 @@ RUN set -ex; \
         gd \
         intl \
         ldap \
-        mcrypt \
         opcache \
         pcntl \
         pdo_mysql \
diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile
index 065d97c3..0521f7af 100644
--- a/12.0/fpm/Dockerfile
+++ b/12.0/fpm/Dockerfile
@@ -43,7 +43,6 @@ RUN set -ex; \
         gd \
         intl \
         ldap \
-        mcrypt \
         opcache \
         pcntl \
         pdo_mysql \
diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile
index d1a37830..aa106088 100644
--- a/13.0/apache/Dockerfile
+++ b/13.0/apache/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.1-apache-stretch
+FROM php:7.2-apache-stretch
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -43,7 +43,6 @@ RUN set -ex; \
         gd \
         intl \
         ldap \
-        mcrypt \
         opcache \
         pcntl \
         pdo_mysql \
diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile
index 019b1e10..82358a98 100644
--- a/13.0/fpm-alpine/Dockerfile
+++ b/13.0/fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.1-fpm-alpine3.7
+FROM php:7.2-fpm-alpine3.7
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -37,7 +37,6 @@ RUN set -ex; \
         gd \
         intl \
         ldap \
-        mcrypt \
         opcache \
         pcntl \
         pdo_mysql \
diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile
index 107b5609..57d92230 100644
--- a/13.0/fpm/Dockerfile
+++ b/13.0/fpm/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.1-fpm-stretch
+FROM php:7.2-fpm-stretch
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -43,7 +43,6 @@ RUN set -ex; \
         gd \
         intl \
         ldap \
-        mcrypt \
         opcache \
         pcntl \
         pdo_mysql \
diff --git a/14.0-beta/apache/Dockerfile b/14.0-beta/apache/Dockerfile
index 1d6b41fc..5610ae68 100644
--- a/14.0-beta/apache/Dockerfile
+++ b/14.0-beta/apache/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.1-apache-stretch
+FROM php:7.2-apache-stretch
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -43,7 +43,6 @@ RUN set -ex; \
         gd \
         intl \
         ldap \
-        mcrypt \
         opcache \
         pcntl \
         pdo_mysql \
diff --git a/14.0-beta/fpm-alpine/Dockerfile b/14.0-beta/fpm-alpine/Dockerfile
index a0ad1456..69cc168a 100644
--- a/14.0-beta/fpm-alpine/Dockerfile
+++ b/14.0-beta/fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.1-fpm-alpine3.7
+FROM php:7.2-fpm-alpine3.7
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -37,7 +37,6 @@ RUN set -ex; \
         gd \
         intl \
         ldap \
-        mcrypt \
         opcache \
         pcntl \
         pdo_mysql \
diff --git a/14.0-beta/fpm/Dockerfile b/14.0-beta/fpm/Dockerfile
index 6d4a511f..9fca3318 100644
--- a/14.0-beta/fpm/Dockerfile
+++ b/14.0-beta/fpm/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.1-fpm-stretch
+FROM php:7.2-fpm-stretch
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -43,7 +43,6 @@ RUN set -ex; \
         gd \
         intl \
         ldap \
-        mcrypt \
         opcache \
         pcntl \
         pdo_mysql \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 6a453171..034271eb 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -36,7 +36,6 @@ RUN set -ex; \
         gd \
         intl \
         ldap \
-        mcrypt \
         opcache \
         pcntl \
         pdo_mysql \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index ca113a43..6d3da1d2 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -42,7 +42,6 @@ RUN set -ex; \
         gd \
         intl \
         ldap \
-        mcrypt \
         opcache \
         pcntl \
         pdo_mysql \
diff --git a/update.sh b/update.sh
index af4f761d..868b70d9 100755
--- a/update.sh
+++ b/update.sh
@@ -2,7 +2,8 @@
 set -eo pipefail
 
 declare -A php_version=(
-	[default]='7.1'
+	[default]='7.2'
+	[12.0]='7.1'
 )
 
 declare -A cmd=(