From dbeb7934669b014a88158ffe81fd403f729a4b1e Mon Sep 17 00:00:00 2001
From: Nathan Fretz <nmfretz@gmail.com>
Date: Tue, 27 Aug 2024 09:13:33 +1000
Subject: [PATCH] Update Nextcloud to v29.0.5 (#1369)

---
 nextcloud/docker-compose.yml | 6 +++---
 nextcloud/hooks/pre-start    | 4 ++--
 nextcloud/umbrel-app.yml     | 9 ++++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index 3e71ba7..8eb0767 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -28,7 +28,7 @@ services:
       - "${APP_DATA_DIR}/data/redis:/data"
 
   web:
-    image: nextcloud:29.0.4-apache@sha256:12c7bb0da1d41a08583971d5ba9771c4f37592ddd0aae5f5ce6a306961caa674
+    image: nextcloud:29.0.5-apache@sha256:5bbc6e9f207bfddd1515ac82f647c19edf6cdd075d7d253c3118a87c835204f0
     # Currently needs to be run as root, if we run as uid 1000 this fails
     # https://github.com/nextcloud/docker/blob/05026b029d37fc5cd488d4a4a2a79480e39841ba/21.0/apache/entrypoint.sh#L53-L77
     # user: "1000:1000"
@@ -41,7 +41,7 @@ services:
       - MYSQL_PASSWORD=moneyprintergobrrr
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
-      - TRUSTED_PROXIES="${NETWORK_IP}/16"
+      - TRUSTED_PROXIES=${NETWORK_IP}/16
       - NEXTCLOUD_ADMIN_USER=umbrel
       - NEXTCLOUD_ADMIN_PASSWORD=${APP_PASSWORD}
       - NEXTCLOUD_TRUSTED_DOMAINS=${APP_DOMAIN}:${APP_NEXTCLOUD_PORT} ${APP_HIDDEN_SERVICE} ${DEVICE_HOSTNAME}:${APP_NEXTCLOUD_PORT} ${APP_NEXTCLOUD_LOCAL_IPS} nextcloud_web_1
@@ -51,7 +51,7 @@ services:
       - redis
 
   cron:
-    image: nextcloud:29.0.4-apache@sha256:12c7bb0da1d41a08583971d5ba9771c4f37592ddd0aae5f5ce6a306961caa674
+    image: nextcloud:29.0.5-apache@sha256:5bbc6e9f207bfddd1515ac82f647c19edf6cdd075d7d253c3118a87c835204f0
     # Currently needs to be run as root, if we run as uid 1000 this fails
     # https://github.com/nextcloud/docker/blob/05026b029d37fc5cd488d4a4a2a79480e39841ba/21.0/apache/entrypoint.sh#L53-L77
     # user: "1000:1000"
diff --git a/nextcloud/hooks/pre-start b/nextcloud/hooks/pre-start
index 2e2f924..2f62a0d 100755
--- a/nextcloud/hooks/pre-start
+++ b/nextcloud/hooks/pre-start
@@ -21,7 +21,7 @@ VERSIONS+=( "25.0.1.1" )
 VERSIONS+=( "26.0.9.1" )
 VERSIONS+=( "27.0.2.1" )
 VERSIONS+=( "28.0.3.2" )
-VERSIONS+=( "29.0.4.1" )
+VERSIONS+=( "29.0.5.1" )
 
 
 IMAGES=()
@@ -33,7 +33,7 @@ IMAGES+=( "nextcloud:25.0.1-apache@sha256:a200319b132c01ec3486e0dcaf052092b560ec
 IMAGES+=( "nextcloud:26.0.9-apache@sha256:23180fbe8169d428ce0058bfc8d47793628a16e00e40b495d82e4504a124b3fa" )
 IMAGES+=( "nextcloud:27.0.2-apache@sha256:3c8040278bdc991cbc025278eaffc4978a9c2fd4ac34e95b10f646dcadb7c3fb" )
 IMAGES+=( "nextcloud:28.0.3-apache@sha256:ed07f89119dcca2a3711897c48a8ac969542d96d69384445d8fcdc7804ca946f" )
-IMAGES+=( "nextcloud:29.0.4-apache@sha256:12c7bb0da1d41a08583971d5ba9771c4f37592ddd0aae5f5ce6a306961caa674" )
+IMAGES+=( "nextcloud:29.0.5-apache@sha256:5bbc6e9f207bfddd1515ac82f647c19edf6cdd075d7d253c3118a87c835204f0" )
 
 find_index() {
 	local -r value="${1}"
diff --git a/nextcloud/umbrel-app.yml b/nextcloud/umbrel-app.yml
index 1636c5c..319ccdc 100644
--- a/nextcloud/umbrel-app.yml
+++ b/nextcloud/umbrel-app.yml
@@ -2,7 +2,7 @@ manifestVersion: 1.1
 id: nextcloud
 category: files
 name: Nextcloud
-version: "29.0.4"
+version: "29.0.5"
 tagline: Productivity platform that keeps you in control
 description: >-
   Nextcloud puts your data at your fingertips, under your control.
@@ -25,10 +25,13 @@ description: >-
 
   Note: After logging in to Nextcloud please change the password to something secure before sharing the address with anyone.
 releaseNotes: >-
-  This is a major upgrade of Nextcloud on umbrelOS, updating from version 28.0.3 to 29.0.4. The Nextcloud app on the Umbrel app store will now receive updates in alignment with the official Nextcloud release schedule.
+  ⚠️ If you are upgrading from a version older than 29.0.4, this update may take several minutes to complete. Please be patient.
 
 
-  This update may take several minutes to complete. Nextcloud may be unavailable for a few minutes during the update process.
+  Key highlights:
+    - Enhanced performance and stability
+    - Improved file sharing and collaboration features
+    - Various security enhancements
 
 
   Full release notes can be found at https://github.com/nextcloud/server/releases