From 323dc9034f7911e260def5e1da4b6c42fe918b86 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Tue, 7 Aug 2018 18:52:00 +0200 Subject: [PATCH 1/3] Switch to php 7.2 for nextcloud 13.0 and greater Signed-off-by: Tilo Spannagel --- update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/update.sh b/update.sh index af4f761..868b70d 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=( From bb4523958d7146da7bb8abd1db0dae2b7d74f2e9 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Tue, 7 Aug 2018 18:56:33 +0200 Subject: [PATCH 2/3] Remove the php module mcrypt Signed-off-by: Tilo Spannagel --- Dockerfile-alpine.template | 1 - Dockerfile-debian.template | 1 - 2 files changed, 2 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 6eabcf8..17b9466 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 a11f62f..ddcbc2b 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -42,7 +42,6 @@ RUN set -ex; \ gd \ intl \ ldap \ - mcrypt \ opcache \ pcntl \ pdo_mysql \ From c79c5a888394161167f057e8dd0d3a2dc5affe1d Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Tue, 7 Aug 2018 18:57:12 +0200 Subject: [PATCH 3/3] Run update.sh Signed-off-by: Tilo Spannagel --- 12.0/apache/Dockerfile | 1 - 12.0/fpm-alpine/Dockerfile | 1 - 12.0/fpm/Dockerfile | 1 - 13.0/apache/Dockerfile | 3 +-- 13.0/fpm-alpine/Dockerfile | 3 +-- 13.0/fpm/Dockerfile | 3 +-- 14.0-beta/apache/Dockerfile | 3 +-- 14.0-beta/fpm-alpine/Dockerfile | 3 +-- 14.0-beta/fpm/Dockerfile | 3 +-- 9 files changed, 6 insertions(+), 15 deletions(-) diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile index 77b8ef4..d8ba68d 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 16e43ba..b95f407 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 1ba8c1f..b357a07 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 ace5fdf..861d9dc 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 e6e8e71..985e494 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 aff6fe0..c1d4b44 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 81f6414..3d1877b 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 ff97e7a..7b122d2 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 e434e76..1f9d54f 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 \