From ed36ba6c8d9d93a399b12004ee625e99184340bb Mon Sep 17 00:00:00 2001
From: Simon L <szaimen@e.mail.de>
Date: Sun, 2 Apr 2023 11:26:42 +0200
Subject: [PATCH] define updaterdirectory and add forgotten exit

Signed-off-by: Simon L <szaimen@e.mail.de>
---
 Containers/nextcloud/Dockerfile    | 5 +++++
 Containers/nextcloud/entrypoint.sh | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile
index dfa5bc6c..59368c83 100644
--- a/Containers/nextcloud/Dockerfile
+++ b/Containers/nextcloud/Dockerfile
@@ -264,6 +264,11 @@ RUN set -ex; \
 
 VOLUME /mnt/ncdata
 
+RUN set -ex; \
+    mkdir -p /nc-updater; \
+    chown -R www-data:www-data /nc-updater; \
+    chmod -R 770 /nc-updater
+
 # Give root a random password
 RUN echo "root:$(openssl rand -base64 12)" | chpasswd
 
diff --git a/Containers/nextcloud/entrypoint.sh b/Containers/nextcloud/entrypoint.sh
index 1b9f8d90..2efc872a 100644
--- a/Containers/nextcloud/entrypoint.sh
+++ b/Containers/nextcloud/entrypoint.sh
@@ -252,11 +252,13 @@ DATADIR_PERMISSION_CONF
 
             if [ "$INSTALL_LATEST_MAJOR" = yes ]; then
                 php /var/www/html/occ config:system:set updater.release.channel --value=beta
+                php /var/www/html/occ config:system:set updatedirectory --value="/nc-updater"
                 php /var/www/html/updater/updater.phar --no-interaction
                 php /var/www/html/occ app:enable nextcloud-aio --force
                 if ! php /var/www/html/occ -V || php /var/www/html/occ status | grep maintenance | grep -q 'true'; then
                     echo "Installation of Nextcloud failed!"
                     touch "$NEXTCLOUD_DATA_DIR/install.failed"
+                    exit 1
                 fi
                 php /var/www/html/occ config:system:set updater.release.channel --value=stable
                 php /var/www/html/occ db:add-missing-indices
@@ -427,6 +429,7 @@ php /var/www/html/occ app:enable support
 echo "Adjusting log files..."
 php /var/www/html/occ config:system:set logfile --value="/var/www/html/data/nextcloud.log"
 php /var/www/html/occ config:app:set admin_audit logfile --value="/var/www/html/data/audit.log"
+php /var/www/html/occ config:system:set updatedirectory --value="/nc-updater"
 
 # Apply network settings
 echo "Applying network settings..."