added updates to nextcloud and other apps

docker-compose.yaml

@@ -2,7 +2,7 @@ name: haven_apps
 include:
   - ./portainer/docker-compose.yaml
   - ./code-server/docker-compose.yaml
-  - ./filebrowser/docker-compose.yaml
+#  - ./filebrowser/docker-compose.yaml
 #  - ./authentik/docker-compose.yaml
 #  - ./homepage/docker-compose.yaml
 #./nextcloud

filestash/docker-compose.yaml

@@ -0,0 +1,35 @@
+services:
+  app:
+    container_name: filestash
+    image: machines/filestash:latest
+    restart: always
+    environment:
+    - APPLICATION_URL=
+    - CANARY=true
+    - OFFICE_URL=http://wopi_server:9980
+    - OFFICE_FILESTASH_URL=http://app:8334
+    - OFFICE_REWRITE_URL=http://127.0.0.1:9980
+    ports:
+    - "6334:8334"
+    volumes:
+    - filestash:/app/data/state/
+
+  wopi_server:
+    container_name: filestash_wopi
+    image: collabora/code:24.04.10.2.1
+    restart: always
+    environment:
+    - "extra_params=--o:ssl.enable=false"
+    - aliasgroup1="https://.*:443"
+    command:
+    - /bin/bash
+    - -c
+    - |
+         curl -o /usr/share/coolwsd/browser/dist/branding-desktop.css https://gist.githubusercontent.com/mickael-kerjean/bc1f57cd312cf04731d30185cc4e7ba2/raw/d706dcdf23c21441e5af289d871b33defc2770ea/destop.css
+         /bin/su -s /bin/bash -c '/start-collabora-online.sh' cool
+    user: root
+    ports:
+    - "9980:9980"
+
+volumes:
+    filestash_data:

nextcloud/docker-compose-new.yaml

@@ -0,0 +1,41 @@
+services:
+  # Note: MariaDB is external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/mariadb
+  db:
+    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
+    image: mariadb:lts
+    restart: always
+    command: --transaction-isolation=READ-COMMITTED
+    volumes:
+      - db:/var/lib/mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=
+      - MYSQL_PASSWORD=
+      - MYSQL_DATABASE=nextcloud
+      - MYSQL_USER=nextcloud
+
+  # Note: Redis is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/redis
+  redis:
+    image: redis:alpine
+    restart: always
+
+  app:
+    image: nextcloud
+    restart: always
+    ports:
+      - 8080:80
+    depends_on:
+      - redis
+      - db
+    volumes:
+      - nextcloud:/var/www/html
+    environment:
+      - MYSQL_PASSWORD=
+      - MYSQL_DATABASE=nextcloud
+      - MYSQL_USER=nextcloud
+      - MYSQL_HOST=db
+
+volumes:
+  nextcloud:
+  db:

nextcloud/docker-compose.yaml

@@ -1,72 +1,76 @@
 services:
-  nextcloud_maria_db:
-    container_name: nextcloud_maria_db
-    image: mariadb:lts
+  # Note: PostgreSQL is external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/postgres
+  nextcloud_db:
+   # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
+    image: postgres:alpine
     restart: always
-    command: --transaction-isolation=READ-COMMITTED
     volumes:
-      - nextcloud_maria_db:/var/lib/mysql
+      -   nextcloud_db:/var/lib/postgresql/data
     environment:
-      - MYSQL_ROOT_PASSWORD=Swissbank01
-      - MYSQL_PASSWORD=Swissbank01
-      - MYSQL_DATABASE=nextcloud
-      - MYSQL_USER=nextcloud
+      - POSTGRES_DB_FILE=/run/secrets/postgres_db
+      - POSTGRES_USER_FILE=/run/secrets/postgres_user
+      - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+    secrets:
+      - postgres_db
+      - postgres_password
+      - postgres_user
     networks:
       - haven_internal
 
-  nextcloud_redis_db:
-    container_name: nextcloud_redis_db
+  # Note: Redis is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/redis
+  nextcloud_redis:
     image: redis:alpine
     restart: always
     networks:
       - haven_internal
 
-  nextcloud_proxy:
-    image: nginx:alpine-slim
-    restart: always
-    user: 1000:1000
-    ports:
-      - 8090:80
-    depends_on:
-      - nextcloud_app
-    volumes:
-      # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
-      - nextcloud_nginx_data/nginx.conf:/etc/nginx/nginx.conf:ro
-    volumes_from:
-      - nextcloud_app
-
   nextcloud_app:
     image: nextcloud
-    user: 1000:1000
-    container_name: nextcloud_app
     restart: always
-    depends_on:
-      - nextcloud_redis_db
-      - nextcloud_maria_db
+    ports:
+      - 8080:80
     volumes:
-      - nextcloud_data/root:/var/www/html
-      - nextcloud_data/custom_apps:/var/www/html/custom_apps
-      - nextcloud_data/config:/var/www/html/config
-      - nextcloud_data/data:/var/www/html/data
-      - nextcloud_data/themes:/var/www/html/themes
+      - nextcloud_data:/var/www/html
+      - havenuser_data:/var/www/html/data
     environment:
-      - MYSQL_PASSWORD=Swissbank01
-      - MYSQL_DATABASE=nextcloud
-      - MYSQL_USER=nextcloud
-      - MYSQL_HOST=nextcloud_maria_db
-      - OVERWRITEHOST=nextcloud.grungyriffchugger.hvn.nz
-      - OVERWRITEPROTOCOL=https
-      - TRUSTED_PROXIES=172.21.0.0/16
-      - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.grungyriffchugger.hvn.nz
-      - NEXTCLOUD_ADMIN_USER=havenuser
-      - NEXTCLOUD_ADMIN_PASSWORD=Swissbank01
+      - POSTGRES_HOST=nextcloud_db
+      - POSTGRES_DB_FILE=/run/secrets/postgres_db
+      - POSTGRES_USER_FILE=/run/secrets/postgres_user
+      - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+      - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
+      - NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user
+    depends_on:
+      - nextcloud_redis
+      - nextcloud_db
+    secrets:
+      - nextcloud_admin_password
+      - nextcloud_admin_user
+      - postgres_db
+      - postgres_password
+      - postgres_user
     networks:
       - haven_internal
+
 networks:
   haven_internal:
     name: haven_internal
     external: true
+
 volumes:
+  nextcloud_db:
   nextcloud_data:
-  nextcloud_maria_db:
-  nextcloud_nginx_data:
+  havenuser_data:
+
+secrets:
+  nextcloud_admin_password:
+    file: ./nextcloud_admin_password.txt # put admin password in this file
+  nextcloud_admin_user:
+    file: ./nextcloud_admin_user.txt # put admin username in this file
+  postgres_db:
+    file: ./postgres_db.txt # put postgresql db name in this file
+  postgres_password:
+    file: ./postgres_password.txt # put postgresql password in this file
+  postgres_user:
+    file: ./postgres_user.txt # put postgresql username in this file

nextcloud/docker-compose.yaml.old

@@ -0,0 +1,72 @@
+services:
+  nextcloud_maria_db:
+    container_name: nextcloud_maria_db
+    image: mariadb:lts
+    restart: always
+    command: --transaction-isolation=READ-COMMITTED
+    volumes:
+      - nextcloud_maria_db:/var/lib/mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=Swissbank01
+      - MYSQL_PASSWORD=Swissbank01
+      - MYSQL_DATABASE=nextcloud
+      - MYSQL_USER=nextcloud
+    networks:
+      - haven_internal
+
+  nextcloud_redis_db:
+    container_name: nextcloud_redis_db
+    image: redis:alpine
+    restart: always
+    networks:
+      - haven_internal
+
+  nextcloud_proxy:
+    image: nginx:alpine-slim
+    restart: always
+    user: 1000:1000
+    ports:
+      - 8090:80
+    depends_on:
+      - nextcloud_app
+    volumes:
+      # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
+      - nextcloud_nginx_data/nginx.conf:/etc/nginx/nginx.conf:ro
+    volumes_from:
+      - nextcloud_app
+
+  nextcloud_app:
+    image: nextcloud
+    user: 1000:1000
+    container_name: nextcloud_app
+    restart: always
+    depends_on:
+      - nextcloud_redis_db
+      - nextcloud_maria_db
+    volumes:
+      - nextcloud_data/root:/var/www/html
+      - nextcloud_data/custom_apps:/var/www/html/custom_apps
+      - nextcloud_data/config:/var/www/html/config
+      - nextcloud_data/data:/var/www/html/data
+      - nextcloud_data/themes:/var/www/html/themes
+    environment:
+      - MYSQL_PASSWORD=Swissbank01
+      - MYSQL_DATABASE=nextcloud
+      - MYSQL_USER=nextcloud
+      - MYSQL_HOST=nextcloud_maria_db
+      - OVERWRITEHOST=nextcloud.grungyriffchugger.hvn.nz
+      - OVERWRITEPROTOCOL=https
+      - TRUSTED_PROXIES=172.21.0.0/16
+      - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.grungyriffchugger.hvn.nz
+      - NEXTCLOUD_ADMIN_USER=havenuser
+      - NEXTCLOUD_ADMIN_PASSWORD=Swissbank01
+    networks:
+      - haven_internal
+networks:
+  haven_internal:
+    name: haven_internal
+    external: true
+volumes:
+  nextcloud_data:
+  nextcloud_maria_db:
+  nextcloud_nginx_data: