Merge pull request #145 from JG2401/dependabot/docker_compose/projects/vaultwarden/vaultwarden/server-1.37.4

Bump vaultwarden/server from 1.37.3 to 1.37.4 in /projects/vaultwarden

.github/dependabot.yml

@@ -19,13 +19,6 @@ updates:
       interval: "weekly"
     labels: 
       - "immich"
-  #n8n
-  - package-ecosystem: "docker-compose"
-    directory: "/projects/n8n"
-    schedule:
-      interval: "weekly"
-    labels: 
-      - "n8n"
   #paperless
   - package-ecosystem: "docker-compose"
     directory: "/projects/paperless"
@@ -33,13 +26,6 @@ updates:
       interval: "weekly"
     labels: 
       - "paperless"
-  #tandoor
-  - package-ecosystem: "docker-compose"
-    directory: "/projects/tandoor"
-    schedule:
-      interval: "weekly"
-    labels: 
-      - "tandoor"
   #jellyseer
   - package-ecosystem: "docker-compose"
     directory: "/projects/jellyseer"

projects/audiobookshelf/docker-compose.yml

@@ -1,10 +1,19 @@
-version: "3.8"
 services:
   audiobookshelf:
     image: ghcr.io/advplyr/audiobookshelf:2.37.1
     restart: unless-stopped
-    ports:
+    expose:
       - 80
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "timeout 10 ls /audiobooks >/dev/null 2>&1 || exit 1"
+        ]
+      interval: 30s
+      timeout: 15s
+      retries: 3
+      start_period: 60s
     environment:
       - TZ=Europe/Berlin
     volumes:

projects/bentopdf/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   bentopdf:
     image: ghcr.io/alam00000/bentopdf-simple:2.8.8

projects/firefly/docker-compose.yml

@@ -1,15 +1,33 @@
-version: '3.8'
-
 services:
   firefly:
-    image: fireflyiii/core:latest
+    image: fireflyiii/core:version-6.6.2
+    deploy:
+      resources:
+        limits:
+          cpus: "1.0"
+          memory: 1.5G
     hostname: app
     container_name: firefly_iii_core
     restart: unless-stopped
     labels:
       - rclone.storage=storagebox-crypt
     volumes:
-      - /opt/media/storagebox/firefly/upload:/var/www/html/storage/upload
+      - type: bind
+        source: /opt/media/storagebox/firefly/upload
+        target: /var/www/html/storage/upload
+        bind:
+          propagation: rslave
+          create_host_path: false
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "timeout 10 ls /var/www/html/storage/upload >/dev/null 2>&1 || exit 1"
+        ]
+      interval: 30s
+      timeout: 15s
+      retries: 3
+      start_period: 60s
     environment:
       SITE_OWNER: ${SITE_OWNER}
       DB_CONNECTION: ${DB_CONNECTION}

projects/gitea/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   gitea:
     image: docker.gitea.com/gitea:1.27.3

projects/immich/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   immich-server:
     image: ghcr.io/immich-app/immich-server:v3.2.2
@@ -11,7 +9,12 @@ services:
     labels:
       - rclone.storage=storagebox-crypt
     volumes:
-      - /opt/media/storagebox/immich/library:/usr/src/app/upload
+      - type: bind
+        source: /opt/media/storagebox/immich/library
+        target: /usr/src/app/upload
+        bind:
+          propagation: rslave
+          create_host_path: false
       - /etc/localtime:/etc/localtime:ro
     depends_on:
       immich-redis:
@@ -34,10 +37,15 @@ services:
       UPLOAD_LOCATION: ${UPLOAD_LOCATION}
     restart: always
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:2283/server-info/ping"]
+      test:
+        [
+          "CMD-SHELL",
+          "curl -f http://localhost:2283/api/server/ping >/dev/null 2>&1 && timeout 10 ls /usr/src/app/upload >/dev/null 2>&1 || exit 1"
+        ]
       interval: 30s
-      timeout: 10s
+      timeout: 15s
       retries: 3
+      start_period: 60s
 
   immich-machine-learning:
     image: ghcr.io/immich-app/immich-machine-learning:v3.1.0
@@ -77,7 +85,11 @@ services:
 
   immich-database:
     image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0
-
+    deploy:
+      resources:
+        limits:
+          cpus: "1.0"
+          memory: 2G
     volumes:
       - immich-postgres:/var/lib/postgresql/data
     environment:

projects/jellyfin/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3.8"
 services:
   jellyfin:
     image: jellyfin/jellyfin:12
@@ -29,4 +28,3 @@ services:
 volumes:
   config:
   cache:
-  media:

projects/mealie/docker-compose.yml

@@ -1,13 +1,30 @@
 services:
   mealie:
-    image: ghcr.io/mealie-recipes/mealie:latest
+    image: ghcr.io/mealie-recipes/mealie:v3.25.1
     deploy:
       resources:
         limits:
           cpus: "1.0"
           memory: 1G
+    labels:
+      - rclone.storage=storagebox-crypt
     volumes:
-      - /opt/media/storagebox/mealie:/app/data/
+      - type: bind
+        source: /opt/media/storagebox/mealie
+        target: /app/data/
+        bind:
+          propagation: rslave
+          create_host_path: false
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "timeout 10 ls /app/data >/dev/null 2>&1 || exit 1"
+        ]
+      interval: 30s
+      timeout: 15s
+      retries: 3
+      start_period: 60s
     environment:
       PUID: 1000
       PGID: 1000
@@ -31,3 +48,4 @@ services:
       SMTP_FROM_EMAIL: ${SMTP_FROM_EMAIL}
       SMTP_USER: ${SMTP_USER}
       SMTP_PASSWORD: ${SMTP_PASSWORD}
+    restart: unless-stopped

projects/n8n/README.md

@@ -1,33 +0,0 @@
-# [n8n](https://n8n.io)
-
-## n8n
-
-### General
-
-- Compose Path: `./projects/n8n/n8n.yml`
-
-### Environment
-
-- N8N_HOST: same as host in #[domains](#domains)
-- N8N_PORT: #default `5678`
-- N8N_PROTOCOL: #default: `http`
-- NODE_ENV: #default: `production`
-- WEBHOOK_URL: #default: `https://${N8N_HOST}/`
-- GENERIC_TIMEZONE: #local time zone - example: `Europe/Berlin`
-- N8N_SECURE_COOKIE: #default `false`
-
-### Domains
-
-- Service Name: `n8n`
-- Container Port: `5678`
-- HTTPS: `true`
-- Certificate Provider: `Let's Encrypt`
-
-### Volume Backups
-
-- Task Name: `n8n`
-- Schedule `0 0 * * *`
-- Service Name: `n8n`
-- Volume: `n8n-n8n-xxx`
-- Keep Latest Backups: `7`
-- Enabled: true

projects/n8n/docker-compose.yml

@@ -1,21 +0,0 @@
-services:
-  n8n:
-    image: docker.n8n.io/n8nio/n8n:2.29.10
-    restart: always
-    labels:
-      - rclone.storage=storagebox-crypt
-    environment:
-      - N8N_HOST=${N8N_HOST}
-      - N8N_PORT=${N8N_PORT}
-      - N8N_PROTOCOL=http
-      - NODE_ENV=production
-      - WEBHOOK_URL=https://${N8N_HOST}/
-      - GENERIC_TIMEZONE=${GENERIC_TIMEZONE}
-      - N8N_SECURE_COOKIE=false
-      - N8N_RESTRICT_FILE_ACCESS_TO=/home/node
-    volumes:
-      - /opt/media/storagebox/paperless/consume:/home/node/paperless/consume:rw
-      - n8n_data:/home/node/.n8n
-
-volumes:
-  n8n_data:

projects/nextcloud/docker-compose.yml

@@ -1,6 +1,11 @@
 services:
   nextcloud:
     image: nextcloud:35.0.1
+    deploy:
+      resources:
+        limits:
+          cpus: "1.0"
+          memory: 2G
     restart: unless-stopped
     labels:
       - rclone.storage=storagebox-crypt
@@ -8,7 +13,22 @@ services:
       - traefik.http.routers.nextcloud.middlewares=nextcloud-buffering
     volumes:
       - nextcloud_data:/var/www/html
-      - /opt/media/storagebox/nextcloud:/mnt/storagebox
+      - type: bind
+        source: /opt/media/storagebox/nextcloud
+        target: /mnt/storagebox
+        bind:
+          propagation: rslave
+          create_host_path: false
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "timeout 10 ls /mnt/storagebox >/dev/null 2>&1 || exit 1"
+        ]
+      interval: 30s
+      timeout: 15s
+      retries: 3
+      start_period: 60s
     environment:
       - NEXTCLOUD_TRUSTED_DOMAINS=${NEXTCLOUD_DOMAIN}
       - MYSQL_HOST=nextcloud_db
@@ -21,6 +41,11 @@ services:
 
   nextcloud_db:
     image: mariadb
+    deploy:
+      resources:
+        limits:
+          cpus: "0.75"
+          memory: 1G
     restart: unless-stopped
     volumes:
       - nextcloud_db_data:/var/lib/mysql

projects/paperless/README.md

@@ -16,10 +16,11 @@
 - PAPERLESS_URL: #same as [domains](#domains) host
 - PAPERLESS_ALLOWED_HOSTS: 
 - PAPERLESS_DBHOST: #db container-name
+- PAPERLESS_DBNAME: #default: `paperless`
+- PAPERLESS_DBUSER:
 - PAPERLESS_DBPASS: #same as db POSTGRES_PASSWORD
-- POSTGRES_DB: #default: `paperless`
+- PAPERLESS_OCR_OUTPUT_TYPE:
-- POSTGRES_USER: 
+- PAPERLESS_SECRET_KEY:
-- POSTGRES_PASSWORD: #database password - same as PAPERLESS_DBPASS
 
 ### Domains
 
@@ -30,15 +31,6 @@
 
 ### Volume Backups
 
-#### redis 
-
-- Task Name: `redis`
-- Schedule `0 0 * * *`
-- Service Name: `redis`
-- Volume: `paperless-paperless-xxx`
-- Keep Latest Backups: `7`
-- Enabled: true
-
 #### db
 
 - Task Name: `db`

projects/paperless/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   paperless:
     image: ghcr.io/paperless-ngx/paperless-ngx:3.2.1
@@ -12,10 +11,30 @@ services:
     labels:
       - rclone.storage=storagebox-crypt
     volumes:
-      - /opt/media/storagebox/paperless/data:/usr/src/paperless/data
+      - type: bind
-      - /opt/media/storagebox/paperless/media:/usr/src/paperless/media
+        source: /opt/media/storagebox/paperless/data
-      - /opt/media/storagebox/paperless/export:/usr/src/paperless/export
+        target: /usr/src/paperless/data
-      - /opt/media/storagebox/paperless/consume:/usr/src/paperless/consume
+        bind:
+          propagation: rslave
+          create_host_path: false
+      - type: bind
+        source: /opt/media/storagebox/paperless/media
+        target: /usr/src/paperless/media
+        bind:
+          propagation: rslave
+          create_host_path: false
+      - type: bind
+        source: /opt/media/storagebox/paperless/export
+        target: /usr/src/paperless/export
+        bind:
+          propagation: rslave
+          create_host_path: false
+      - type: bind
+        source: /opt/media/storagebox/paperless/consume
+        target: /usr/src/paperless/consume
+        bind:
+          propagation: rslave
+          create_host_path: false
     environment:
       PAPERLESS_REDIS: ${PAPERLESS_REDIS}
       PAPERLESS_TIME_ZONE: ${PAPERLESS_TIME_ZONE}
@@ -25,14 +44,21 @@ services:
       PAPERLESS_URL: https://${PAPERLESS_URL}
       PAPERLESS_ALLOWED_HOSTS: ${PAPERLESS_ALLOWED_HOSTS}
       PAPERLESS_DBHOST: ${PAPERLESS_DBHOST}
+      PAPERLESS_DBNAME: ${PAPERLESS_DBNAME}
+      PAPERLESS_DBUSER: ${PAPERLESS_DBUSER}
       PAPERLESS_DBPASS: ${PAPERLESS_DBPASS}
       PAPERLESS_OCR_OUTPUT_TYPE: ${PAPERLESS_OCR_OUTPUT_TYPE}
       PAPERLESS_SECRET_KEY: ${PAPERLESS_SECRET_KEY}
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000"]
+      test:
+        [
+          "CMD-SHELL",
+          "curl -f http://localhost:8000 >/dev/null 2>&1 && timeout 10 ls /usr/src/paperless/consume >/dev/null 2>&1 || exit 1"
+        ]
       interval: 30s
-      timeout: 10s
+      timeout: 15s
       retries: 5
+      start_period: 60s
     networks:
       - dokploy-network
 
@@ -45,8 +71,6 @@ services:
           memory: 256M
     container_name: paperless-redis
     restart: unless-stopped
-    volumes:
-      - paperlessredis:/user/local/etc/redis
     networks:
       - dokploy-network
 
@@ -70,7 +94,6 @@ services:
 
 volumes:
   paperlessdb:
-  paperlessredis:
 
 networks:
   dokploy-network:

projects/rclone/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   rclone-seedbox:
     image: rclone/rclone:1.75.1
@@ -48,6 +46,16 @@ services:
       - /opt/media/seedbox:/data:rshared
       - ./logs/seedbox:/logs
 
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "timeout 10 ls /data >/dev/null 2>&1 || exit 1"
+        ]
+      interval: 30s
+      timeout: 15s
+      retries: 3
+      start_period: 60s
 
   rclone-storagebox-crypt:
     image: rclone/rclone:1.75.1
@@ -93,3 +101,14 @@ services:
       - /opt/rclone/ssh:/root/.ssh:ro
       - /opt/media/storagebox:/data:rshared
       - ./logs/storagebox:/logs
+
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "timeout 10 ls /data >/dev/null 2>&1 || exit 1"
+        ]
+      interval: 30s
+      timeout: 15s
+      retries: 3
+      start_period: 60s

projects/vaultwarden/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   vaultwarden:
-    image: vaultwarden/server:1.37.3
+    image: vaultwarden/server:1.37.4
     restart: always
     environment:
       DOMAIN: ${DOMAIN}