From 9c0a7d8d1db2ba5ab01f5182a122617d7e3e7f4b Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Tue, 24 Oct 2023 09:57:50 +0200
Subject: [PATCH] push to 27.1.2

---
 Dockerfile                  | 16 ++++++++--------
 rootfs/bin/nextcloud-config | 25 ++++++++++++-------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 96c39d9..5cbaf4c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM docker.io/alpine:3.18 AS builder
 
-ENV NC_VERSION=27.1.1
-ENV NC_SHA256_SUM=3a91500566874675676fa3b5bfae2587a839cde41dfac5318043b162c1311fab
+ENV NC_VERSION=27.1.2
+ENV NC_SHA256_SUM=0742b247aaee0b7044db0062f0a914aa77338c7a7d8fe7da0917147d76689721
 RUN wget https://download.nextcloud.com/server/releases/nextcloud-$NC_VERSION.tar.bz2
 RUN echo "$NC_SHA256_SUM  nextcloud-$NC_VERSION.tar.bz2" | sha256sum -c - || exit 1
 RUN mkdir -p /var/lib/nextcloud
@@ -21,8 +21,8 @@ RUN echo "$CONTACTS_SHA256_SUM  contacts-$CONTACTS_VERSION.tar.gz" | sha256sum -
 RUN mkdir /var/lib/nextcloud/apps/contacts
 RUN tar xzf contacts-$CONTACTS_VERSION.tar.gz -C /var/lib/nextcloud/apps/contacts --strip 1
 
-ENV CALENDAR_VERSION=v4.5.1
-ENV CALENDAR_SHA256_SUM=20543149da1b3e71b366e97faa246810d90469093440416521e36c95597f8401
+ENV CALENDAR_VERSION=v4.5.2
+ENV CALENDAR_SHA256_SUM=6279967f9c9ba473261d12cae6e253b45fc30fc3490e70ed4ab07124d036d2ed
 RUN wget https://github.com/nextcloud-releases/calendar/releases/download/$CALENDAR_VERSION/calendar-$CALENDAR_VERSION.tar.gz
 RUN echo "$CALENDAR_SHA256_SUM  calendar-$CALENDAR_VERSION.tar.gz" | sha256sum -c - || exit 1
 RUN mkdir /var/lib/nextcloud/apps/calendar
@@ -42,15 +42,15 @@ RUN echo "$NOTES_SHA256_SUM  notes.tar.gz" | sha256sum -c - || exit 1
 RUN mkdir /var/lib/nextcloud/apps/notes
 RUN tar xzf notes.tar.gz -C /var/lib/nextcloud/apps/notes --strip 1
 
-ENV NEWS_VERSION=23.0.0
-ENV NEWS_SHA256_SUM=a0f50e0a0253168a70494eaf114eaaf8c103938709276cb92f2f245f7239499d
+ENV NEWS_VERSION=24.0.0
+ENV NEWS_SHA256_SUM=1ee6e69bdac9099261ab20a3eab19502d4d1a667d32f6565cfe4e842b525d369
 RUN wget https://github.com/nextcloud/news/releases/download/$NEWS_VERSION/news.tar.gz
 RUN echo "$NEWS_SHA256_SUM  news.tar.gz" | sha256sum -c - || exit 1
 RUN mkdir /var/lib/nextcloud/apps/news
 RUN tar xzf news.tar.gz -C /var/lib/nextcloud/apps/news --strip 1
 
-ENV SOCIAL_LOGIN_VERSION=v5.5.3
-ENV SOCIAL_LOGIN_SHA256_SUM=b967a2f96e6dadda0a0523a21156612a25483c5abbe04b2b4146ff5cb643bd75
+ENV SOCIAL_LOGIN_VERSION=v5.5.4
+ENV SOCIAL_LOGIN_SHA256_SUM=4a04c24ca22fb7fd92e896289de633f2387e074b51cb83f654b0ad03973c72cb
 RUN wget https://github.com/zorn-v/nextcloud-social-login/releases/download/$SOCIAL_LOGIN_VERSION/release.tar.gz
 RUN echo "$SOCIAL_LOGIN_SHA256_SUM  release.tar.gz" | sha256sum -c - || exit 1
 RUN mkdir /var/lib/nextcloud/apps/sociallogin
diff --git a/rootfs/bin/nextcloud-config b/rootfs/bin/nextcloud-config
index 4962b3d..6cb84b8 100755
--- a/rootfs/bin/nextcloud-config
+++ b/rootfs/bin/nextcloud-config
@@ -5,19 +5,19 @@ cd /var/lib/nextcloud
 chmod +x ./occ
 
 if [ ! -f /var/lib/nextcloud/data/.installed ]; then
-	s6-setuidgid nginx ./occ maintenance:install \
-		--database=pgsql \
-		--database-host="$DB_HOST" \
-		--database-name="$DB_NAME" \
-		--database-user="$DB_USER" \
-		--database-pass="$DB_PASSWORD" \
-		--database-port="$DB_PORT" \
-		--admin-user="$ADMIN_USER" \
-		--admin-pass="$ADMIN_PASSWORD" \
-		--data-dir=/var/lib/nextcloud/data/ \
-		--no-interaction
+  s6-setuidgid nginx ./occ maintenance:install \
+    --database=pgsql \
+    --database-host="$DB_HOST" \
+    --database-name="$DB_NAME" \
+    --database-user="$DB_USER" \
+    --database-pass="$DB_PASSWORD" \
+    --database-port="$DB_PORT" \
+    --admin-user="$ADMIN_USER" \
+    --admin-pass="$ADMIN_PASSWORD" \
+    --data-dir=/var/lib/nextcloud/data/ \
+    --no-interaction
 
-	touch /var/lib/nextcloud/data/.installed
+  touch /var/lib/nextcloud/data/.installed
 fi
 
 s6-setuidgid nginx ./occ config:app:set --value cron core backgroundjobs_mode
@@ -34,7 +34,6 @@ s6-setuidgid nginx ./occ app:enable news
 s6-setuidgid nginx ./occ app:enable tasks
 s6-setuidgid nginx ./occ app:enable notes
 s6-setuidgid nginx ./occ app:enable sociallogin
-s6-setuidgid nginx ./occ app:enable integration_mastodon
 s6-setuidgid nginx ./occ app:disable activity
 s6-setuidgid nginx ./occ app:disable comments
 s6-setuidgid nginx ./occ app:disable files_trashbin