Update Nextcloud config

roles/nextcloud-docker/files/nextcloud/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '2.2'
+version: '3'
 
 networks:
   proxy-tier:
@@ -7,43 +7,63 @@ networks:
 
 services:
   web:
-    image: nginx
+    build: ./web
     volumes:
-      - ./config/nginx.conf:/etc/nginx/nginx.conf:ro
+      - /var/lib/nextcloud:/var/www/html:ro
       - /etc/localtime:/etc/localtime:ro
-    links:
-      - app
-      - collabora
-    volumes_from:
-      - app
     environment:
       - VIRTUAL_HOST=${CLOUD_DOMAIN}
       - VIRTUAL_NETWORK=nginx-proxy
       - VIRTUAL_PORT=80
+    depends_on:
+      - app
+      - collabora
     networks:
       - proxy-tier
+      - default
     restart: always
 
   app:
-    build:
-      context: .
-      dockerfile: Dockerfile.cron
-    links:
-      - db
+    build: ./app
     volumes:
-      - /var/lib/nextcloud/apps:/var/www/html/apps
-      - ./config:/var/www/html/config
-      - /var/lib/nextcloud/data:/var/www/html/data
+      - ./config/config.php:/var/www/html/config/config.php
+      - /var/lib/nextcloud:/var/www/html
       - /media:/media
       - /etc/localtime:/etc/localtime:ro
-    networks:
-      - proxy-tier
+    environment:
+      - MYSQL_HOST=db
+    env_file:
+      - db.env
+    depends_on:
+      - db
+      - redis
     restart: always
 
+  cron:
+    build: ./app
+    restart: always
+    volumes:
+      - /var/lib/nextcloud:/var/www/html
+    user: www-data
+    entrypoint: |
+      bash -c 'bash -s <<EOF
+        trap "break;exit" SIGHUP SIGINT SIGTERM
+        while [ ! -f /var/www/html/config/config.php ]; do
+          sleep 1
+        done
+        while true; do
+          php -f /var/www/html/cron.php
+          sleep 15m
+        done
+      EOF'
+    depends_on:
+      - db
+      - redis
+
   db:
     image: mariadb
     volumes:
-      - /var/lib/nextcloud/db:/var/lib/mysql
+      - /var/lib/mariadb/nextcloud:/var/lib/mysql
       - /backups/nextcloud:/backups
       - /etc/localtime:/etc/localtime:ro
     environment:
@@ -51,14 +71,12 @@ services:
       - MYSQL_DATABASE=${MYSQL_DATABASE}
       - MYSQL_USER=${MYSQL_USER}
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-    networks:
-      - proxy-tier
+    env_file:
+      - db.env
     restart: always
 
   redis:
     image: redis
-    networks:
-      - proxy-tier
     restart: always
 
   collabora:
@@ -72,9 +90,10 @@ services:
       - VIRTUAL_HOST=${COLLABORA_DOMAIN}
       - VIRTUAL_NETWORK=nginx-proxy
       - VIRTUAL_PORT=9980
-        #- VIRTUAL_PROTO=https
+    #  - VIRTUAL_PROTO=https
 #      - LETSENCRYPT_HOST=${COLLABORA_DOMAIN}
 #      - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
     networks:
       - proxy-tier
+      - default
     restart: always