++ fix

docker-compose.yml

@@ -1,87 +1,79 @@
 services:
   db:
-    image: mariadb:10.11
+    image: mariadb:11.4
     container_name: nextcloud-db
-    restart: always
-    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-file-per-table=1 --skip-innodb-read-only-compressed
+    restart: unless-stopped
+    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+    environment:
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      MYSQL_USER: ${MYSQL_USER}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      TZ: ${TZ}
     volumes:
       - db_data:/var/lib/mysql
-    environment:
-      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-      - MYSQL_DATABASE=${MYSQL_DATABASE}
-      - MYSQL_USER=${MYSQL_USER}
     networks:
-      - nextcloud-network
+      - nextcloud_internal
 
   redis:
-    image: redis:alpine
+    image: redis:7-alpine
     container_name: nextcloud-redis
-    restart: always
+    restart: unless-stopped
+    command: redis-server --requirepass ${REDIS_PASSWORD}
     networks:
-      - nextcloud-network
+      - nextcloud_internal
 
-  nextcloud:
-    image: nextcloud:latest
+  app:
+    image: nextcloud:30-apache
     container_name: nextcloud-app
-    restart: always
-    ports:
-      - "${NEXTCLOUD_PORT}:80"
-    volumes:
-      - nextcloud_data:/var/www/html
-    environment:
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-      - MYSQL_DATABASE=${MYSQL_DATABASE}
-      - MYSQL_USER=${MYSQL_USER}
-      - MYSQL_HOST=db
-      - REDIS_HOST=redis
-      - NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER}
-      - NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD}
-      - NEXTCLOUD_TRUSTED_DOMAINS=${NEXTCLOUD_TRUSTED_DOMAINS}
-      - OVERWRITEPROTOCOL=${OVERWRITEPROTOCOL}
-      - OVERWRITEHOST=${OVERWRITEHOST}
+    restart: unless-stopped
     depends_on:
       - db
       - redis
+    ports:
+      - "${NEXTCLOUD_PORT}:80"
+    environment:
+      MYSQL_HOST: db
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      MYSQL_USER: ${MYSQL_USER}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+      REDIS_HOST: redis
+      REDIS_HOST_PASSWORD: ${REDIS_PASSWORD}
+      NEXTCLOUD_TRUSTED_DOMAINS: ${NEXTCLOUD_DOMAIN}
+      TRUSTED_PROXIES: ${TRUSTED_PROXY_IP}
+      OVERWRITEHOST: ${NEXTCLOUD_DOMAIN}
+      OVERWRITEPROTOCOL: https
+      OVERWRITECLIURL: https://${NEXTCLOUD_DOMAIN}
+      PHP_MEMORY_LIMIT: 1024M
+      PHP_UPLOAD_LIMIT: 20G
+      TZ: ${TZ}
+    volumes:
+      - nextcloud_data:/var/www/html
     networks:
-      - nextcloud-network
+      - nextcloud_internal
 
   collabora:
     image: collabora/code:latest
-    container_name: nextcloud-collabora
-    restart: always
+    container_name: collabora
+    restart: unless-stopped
     ports:
       - "${COLLABORA_PORT}:9980"
     environment:
-      - domain=${COLLABORA_DOMAIN}
-      - username=${COLLABORA_USERNAME}
-      - password=${COLLABORA_PASSWORD}
-      - extra_params=--o:ssl.enable=false --o:ssl.termination=true
-      - dictionaries=${COLLABORA_DICTIONARIES}
+      domain: ${NEXTCLOUD_DOMAIN_REGEX}
+      username: ${COLLABORA_USERNAME}
+      password: ${COLLABORA_PASSWORD}
+      dictionaries: en_US it_IT
+      extra_params: --o:ssl.enable=false --o:ssl.termination=true --o:welcome.enable=false
+      TZ: ${TZ}
     cap_add:
       - MKNOD
     networks:
-      - nextcloud-network
-
-  cron:
-    image: nextcloud:latest
-    container_name: nextcloud-cron
-    restart: always
-    volumes:
-      - nextcloud_data:/var/www/html
-    entrypoint: /cron.sh
-    depends_on:
-      - db
-      - redis
-    networks:
-      - nextcloud-network
+      - nextcloud_internal
 
 volumes:
   db_data:
-    driver: local
   nextcloud_data:
-    driver: local
 
 networks:
-  nextcloud-network:
+  nextcloud_internal:
     driver: bridge