From 0b85900b71a464f6c2cf00a750c2e11a0141f527 Mon Sep 17 00:00:00 2001
From: Chewing_Bever <roosensjef@gmail.com>
Date: Fri, 23 Apr 2021 15:02:42 +0200
Subject: [PATCH] Improved Nextcloud config

---
 monica/docker-compose.yml    |  2 +-
 nextcloud/.env.example       |  2 +-
 nextcloud/docker-compose.yml | 48 +++++++++++++++++++++---------------
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/monica/docker-compose.yml b/monica/docker-compose.yml
index 87a1ff4..cf6af26 100644
--- a/monica/docker-compose.yml
+++ b/monica/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2.8'
+version: '2.4'
 
 services:
     app:
diff --git a/nextcloud/.env.example b/nextcloud/.env.example
index 526887b..2c43195 100644
--- a/nextcloud/.env.example
+++ b/nextcloud/.env.example
@@ -2,7 +2,7 @@
 POSTGRES_HOST=db
 POSTGRES_DB=nextcloud
 POSTGRES_USER=nextcloud
-POSTGRES_PASSWORD=pass
+POSTGRES_PASSWORD=nextcloud
 
 # Redis
 REDIS_HOST=redis
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index b287465..4ab2edb 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -1,17 +1,24 @@
-version: '3.5'
+version: '2.4'
 
 services:
     app:
-        image: 'nextcloud:20-apache'
+        image: 'nextcloud:21.0.1-apache'
         restart: 'always'
 
+        healthcheck:
+            test: 'curl -f localhost || exit 1'
+            interval: '1m'
+            timeout: '10s'
+            retries: 3
+            start_period: '10s'
         depends_on:
-            - 'db'
-            - 'redis'
+            db:
+                condition: 'service_healthy'
+            redis:
+                condition: 'service_healthy'
+
         env_file:
             - '.env'
-        labels:
-            - 'com.centurylinklabs.watchtower.enable=true'
         networks:
             - 'default'
             - 'nginx'
@@ -21,40 +28,41 @@ services:
             - 'root:/var/www/html'
 
     cron:
-        image: 'nextcloud:20-apache'
-        entrypoint: '/cron.sh'
+        image: 'nextcloud:21.0.1-apache'
         restart: 'always'
+        entrypoint: '/cron.sh'
 
         depends_on:
-            - 'app'
+            app:
+                condition: 'service_healthy'
+
         env_file:
             - '.env'
-        labels:
-            - 'com.centurylinklabs.watchtower.enable=true'
         volumes:
             - 'config:/var/www/html/config'
             - 'data:/var/www/html/data'
             - 'root:/var/www/html'
 
     db:
-        image: 'postgres:13-alpine'
+        image: 'postgres:13.2-alpine'
         restart: 'always'
 
         environment:
-            - 'POSTGRES_DB'
-            - 'POSTGRES_USER'
-            - 'POSTGRES_PASSWORD'
-        labels:
-            - 'com.centurylinklabs.watchtower.enable=true'
+            - 'POSTGRES_DB=nextcloud'
+            - 'POSTGRES_USER=nextcloud'
+            - 'POSTGRES_PASSWORD=nextcloud'
         volumes:
             - 'db-data:/var/lib/postgresql/data'
 
     redis:
-        image: 'redis:6-alpine'
+        image: 'redis:6.0.12-alpine'
         restart: 'always'
 
-        labels:
-            - 'com.centurylinklabs.watchtower.enable=true'
+        healthcheck:
+            test: 'redis-cli -h localhost ping'
+            interval: '10s'
+            timeout: '5s'
+            retries: 3
 
 networks:
     nginx: