Merge pull request #416 from nextcloud/php-7.2

Switch to php 7.2 for nextcloud 13.0 and greater
2018-08-08 11:42:48 +02:00 · 2018-08-08 11:42:48 +02:00 · e4b29de140
commit e4b29de140
parent 1f67adcf94 c79c5a8883
12 changed files with 8 additions and 18 deletions
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@ -36,7 +36,6 @@ RUN set -ex; \
        gd \
        intl \
        ldap \
-        mcrypt \
        opcache \
        pcntl \
        pdo_mysql \
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@ -42,7 +42,6 @@ RUN set -ex; \
        gd \
        intl \
        ldap \
-        mcrypt \
        opcache \
        pcntl \
        pdo_mysql \
--- 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=(