Merge: resolve conflict in routes/backups.js, keep storage-info + maxStorageBytes

2026-05-28 15:00:41 -07:00
parent ea9bdf9598
commit ad9400490d
6 changed files with 387 additions and 14 deletions
@@ -7,15 +7,28 @@ services:
    volumes:
      - {{API_PATH}}:/app
      - /var/run/docker.sock:/var/run/docker.sock
+      - dashcaddy-backups:/app/backups
    environment:
      - NODE_ENV=production
      - PORT={{API_PORT}}
      - SERVICES_FILE=/app/services.json
      - CADDY_ADMIN_URL=http://host.docker.internal:2019
+      - BACKUP_DIR=/app/backups
+      - BACKUP_MAX_STORAGE_BYTES={{BACKUP_MAX_STORAGE_BYTES}}
+      - BACKUP_CONFIG_FILE=/app/backup-config.json
+      - BACKUP_HISTORY_FILE=/app/backup-history.json
    restart: unless-stopped
    networks:
      - dashcaddy

+volumes:
+  dashcaddy-backups:
+    driver: local
+    driver_opts:
+      type: none
+      o: bind
+      device: {{BACKUP_DIR}}
+
 networks:
  dashcaddy:
    driver: bridge