From 3b6ba7e258daa0e07e5d5a517467edc16f8d7080 Mon Sep 17 00:00:00 2001
From: mrwacka <jonas@theboxhub.ch>
Date: Tue, 8 Sep 2026 14:00:20 +0200
Subject: [PATCH] -

---
 compose/nextcloud/compose.yaml | 68 +++++++++++++++-------------------
 1 file changed, 30 insertions(+), 38 deletions(-)

diff --git a/compose/nextcloud/compose.yaml b/compose/nextcloud/compose.yaml
index b0ea78f..408d0ae 100644
--- a/compose/nextcloud/compose.yaml
+++ b/compose/nextcloud/compose.yaml
@@ -22,6 +22,12 @@ services:
       TZ: Europe/Zurich
     volumes:
       - /srv/apps-int01/data/nextcloud/mariadb:/var/lib/mysql
+    healthcheck:
+      test: ["CMD-SHELL", "mariadb-admin ping -h localhost -uroot -p$$MYSQL_ROOT_PASSWORD || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+      start_period: 20s
     logging: *default-logging
 
   redis:
@@ -34,15 +40,23 @@ services:
       - superSTITION_105
     volumes:
       - /srv/apps-int01/data/nextcloud/redis:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "-a", "superSTITION_105", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+      start_period: 10s
     logging: *default-logging
 
   nextcloud:
-    image: nextcloud:latest
+    image: nextcloud:34.0.3-apache
     container_name: nextcloud
     restart: unless-stopped
     depends_on:
-      - mariadb
-      - redis
+      mariadb:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
     environment:
       MYSQL_HOST: mariadb
       MYSQL_DATABASE: nextDB
@@ -50,31 +64,35 @@ services:
       MYSQL_PASSWORD: "#L963a.bID,.BOJ;W1iwL@E:j]F|U3"
       REDIS_HOST: redis
       REDIS_HOST_PASSWORD: "superSTITION_105"
+      NEXTCLOUD_ADMIN_USER: admin
+      NEXTCLOUD_ADMIN_PASSWORD: "HIER_EIN_NEUES_STARKES_ADMIN_PASSWORT"
+      NEXTCLOUD_TRUSTED_DOMAINS: "nextcloud.theboxhub.ch"
+      OVERWRITEHOST: "nextcloud.theboxhub.ch"
+      OVERWRITEPROTOCOL: "https"
       TZ: Europe/Zurich
     volumes:
       - /srv/apps-int01/data/nextcloud/config:/var/www/html/config
       - /srv/apps-int01/data/nextcloud/custom_apps:/var/www/html/custom_apps
       - /srv/apps-int01/data/nextcloud/data:/var/www/html/data
-    extra_hosts:
-      - "nextcloud.theboxhub.ch:10.100.20.10"
-      - "theboxhub.ch:10.100.20.10"
     ports:
       - "8083:80"
     healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost/status.php || exit 1"]
+      test: ["CMD-SHELL", "curl -fsS http://localhost/status.php | grep -q 'installed' || exit 1"]
       interval: 30s
       timeout: 10s
-      retries: 5
-      start_period: 60s
+      retries: 10
+      start_period: 120s
     logging: *default-logging
 
   nextcloud-cron:
-    image: nextcloud:latest
+    image: nextcloud:34.0.3-apache
     container_name: nextcloud-cron
     restart: unless-stopped
     depends_on:
-      - mariadb
-      - redis
+      mariadb:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
     entrypoint: /cron.sh
     environment:
       MYSQL_HOST: mariadb
@@ -90,32 +108,6 @@ services:
       - /srv/apps-int01/data/nextcloud/data:/var/www/html/data
     logging: *default-logging
 
-  notify_push:
-    image: icewind1991/notify_push:latest
-    container_name: notify_push
-    restart: unless-stopped
-    depends_on:
-      - nextcloud
-      - redis
-    environment:
-      NEXTCLOUD_URL: "https://nextcloud.theboxhub.ch"
-      NEXTCLOUD_TRUSTED_DOMAINS: "nextcloud.theboxhub.ch"
-      PORT: 7867
-      REDIS_HOST: redis
-      REDIS_HOST_PASSWORD: "superSTITION_105"
-    entrypoint: ["/notify_push", "/nextcloud-config/config.php"]
-    volumes:
-      - /srv/apps-int01/data/nextcloud/config:/nextcloud-config:ro
-    ports:
-      - "7867:7867"
-    healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:7867/"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-      start_period: 20s
-    logging: *default-logging
-
   imaginary:
     image: h2non/imaginary:latest
     container_name: imaginary