From af486d2fc27c717305530d7a67c3d96707ef0ea8 Mon Sep 17 00:00:00 2001 From: Hive Date: Thu, 8 Aug 2019 22:08:44 +0200 Subject: [PATCH 1/2] Update to nextcloud version 15 We update from nextcloud version 14 to version 15 --- webservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index 5df5424..3f7b646 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:7.0-apache -ENV NEXTCLOUD_VERSION 14.0.0 +ENV NEXTCLOUD_VERSION 15.0.0 RUN \ apt-get update && \ From bf8406bd82605d2489e49a84910c963d2e084e68 Mon Sep 17 00:00:00 2001 From: Valentin Gehrke Date: Thu, 8 Aug 2019 22:11:38 +0200 Subject: [PATCH 2/2] Prevent endless restarting of update-htaccess.sh In version 14 beta there was a bug which let the htaccess fail. Unfortunately supervisord restarted the script in case of an error which led to it being endlessly restarted. To prevent this and similar update issues in the future, we let the update-script exit with code 0 even if there's an error. --- webservice/update-htaccess.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webservice/update-htaccess.sh b/webservice/update-htaccess.sh index c8c814c..0ebfe11 100644 --- a/webservice/update-htaccess.sh +++ b/webservice/update-htaccess.sh @@ -4,3 +4,5 @@ cd /var/www/html sudo -u www-data php occ maintenance:update:htaccess + +exit 0