From c6bf4e3fa08a8ff495275a5b268c2b7f0743bae4 Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Thu, 24 Oct 2024 14:07:46 +0000 Subject: [PATCH] use full storage path not path to volumes --- firefoxsync/docker-compose.yaml | 4 ++-- git/docker-compose.yaml | 4 ++-- news/docker-compose.yaml | 2 +- nextcloud/docker-compose.yaml | 20 ++++++++++---------- proxy/docker-compose.yaml | 2 +- push/docker-compose.yaml | 4 ++-- rustdesk/docker-compose.yml | 4 ++-- wallabag/docker-compose.yaml | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/firefoxsync/docker-compose.yaml b/firefoxsync/docker-compose.yaml index 3f3e17b..ba34de7 100644 --- a/firefoxsync/docker-compose.yaml +++ b/firefoxsync/docker-compose.yaml @@ -3,7 +3,7 @@ services: syncserver: image: mozilla/syncserver:latest volumes: - - ${VOLUMES_PATH}/firefoxsync/syncserver:/data + - ${STORAGE_PATH}/syncserver:/data user: ${UID}:${GID} networks: - web @@ -38,7 +38,7 @@ services: networks: - firefoxsync volumes: - - ${VOLUMES_PATH}/firefoxsync/db:/var/lib/postgresql/data + - ${STORAGE_PATH}/db:/var/lib/postgresql/data healthcheck: test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"] interval: 10s diff --git a/git/docker-compose.yaml b/git/docker-compose.yaml index e81b4de..223451c 100644 --- a/git/docker-compose.yaml +++ b/git/docker-compose.yaml @@ -3,7 +3,7 @@ services: forgejo: image: codeberg.org/forgejo/forgejo:${FORGEJO_VERSION} volumes: - - ${VOLUMES_PATH}/git/forgejo_data:/data + - ${STORAGE_PATH}/forgejo_data:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: @@ -51,7 +51,7 @@ services: networks: - git volumes: - - ${VOLUMES_PATH}/git/forgejo_db:/var/lib/postgresql/data + - ${STORAGE_PATH}/forgejo_db:/var/lib/postgresql/data healthcheck: test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"] interval: 10s diff --git a/news/docker-compose.yaml b/news/docker-compose.yaml index a4d1011..f63aa78 100644 --- a/news/docker-compose.yaml +++ b/news/docker-compose.yaml @@ -40,7 +40,7 @@ services: networks: - news volumes: - - ${VOLUMES_PATH}/news/db:/var/lib/postgresql/data + - ${STORAGE_PATH}/db:/var/lib/postgresql/data healthcheck: test: ["CMD", "pg_isready", "-U", "miniflux"] interval: 10s diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml index 4b58401..fa852a0 100644 --- a/nextcloud/docker-compose.yaml +++ b/nextcloud/docker-compose.yaml @@ -5,7 +5,7 @@ services: depends_on: - app volumes: - - ${VOLUMES_PATH}/nextcloud/html:/var/www/html:ro + - ${STORAGE_PATH}/html:/var/www/html:ro - $PWD/nginx.conf:/etc/nginx/nginx.conf:ro restart: unless-stopped networks: @@ -38,8 +38,8 @@ services: args: - NC_MAIN_VERSION=${NC_MAIN_VERSION} volumes: - - ${VOLUMES_PATH}/nextcloud/html:/var/www/html - - ${VOLUMES_PATH}/nextcloud/data:/var/www/html/data + - ${STORAGE_PATH}/html:/var/www/html + - ${STORAGE_PATH}/data:/var/www/html/data - type: tmpfs target: /tmp restart: unless-stopped @@ -70,8 +70,8 @@ services: networks: - nextcloud volumes: - - ${VOLUMES_PATH}/nextcloud/html:/var/www/html - - ${VOLUMES_PATH}/nextcloud/data:/var/www/html/data + - ${STORAGE_PATH}/html:/var/www/html + - ${STORAGE_PATH}/data:/var/www/html/data entrypoint: /cron.sh depends_on: - db @@ -89,8 +89,8 @@ services: - web - nextcloud volumes: - - ${VOLUMES_PATH}/nextcloud/html:/var/www/html:ro - - ${VOLUMES_PATH}/nextcloud/data:/var/www/html/data:ro + - ${STORAGE_PATH}/html:/var/www/html:ro + - ${STORAGE_PATH}/data:/var/www/html/data:ro environment: - PORT=7867 - NEXTCLOUD_URL=http://web @@ -111,7 +111,7 @@ services: image: mariadb:${MARIADB_VERSION} command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --skip-innodb-read-only-compressed volumes: - - ${VOLUMES_PATH}/nextcloud/db:/var/lib/mysql + - ${STORAGE_PATH}/db:/var/lib/mysql restart: unless-stopped environment: - PUID=1000 @@ -167,7 +167,7 @@ services: networks: - nextcloud volumes: - - ${VOLUMES_PATH}/nextcloud/redis:/data + - ${STORAGE_PATH}/redis:/data healthcheck: test: ["CMD", "redis-cli", "ping"] interval: 5s @@ -212,7 +212,7 @@ services: networks: - nextcloud volumes: - - ${VOLUMES_PATH}/nextcloud/fonts:/usr/share/fonts/drawio + - ${STORAGE_PATH}/fonts:/usr/share/fonts/drawio restart: unless-stopped labels: - "docker.group=netxtcloud" diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml index 3293d31..4881fd7 100755 --- a/proxy/docker-compose.yaml +++ b/proxy/docker-compose.yaml @@ -41,7 +41,7 @@ services: - web - dockersocket volumes: - - ${VOLUMES_PATH}/proxy/letsencrypt:/letsencrypt + - ${STORAGE_PATH}/letsencrypt:/letsencrypt - $PWD/tls.toml:/etc/traefik/tls.toml healthcheck: test: traefik healthcheck --ping diff --git a/push/docker-compose.yaml b/push/docker-compose.yaml index 141144c..ef05c1e 100644 --- a/push/docker-compose.yaml +++ b/push/docker-compose.yaml @@ -22,8 +22,8 @@ services: - NTFY_ENABLE_LOGIN=true - NTFY_ENABLE_RESERVATIONS=false volumes: - - ${VOLUMES_PATH}/push/ntfy/cache/:/var/cache/ntfy - - ${VOLUMES_PATH}/push/ntfy/varlib/:/var/lib/ntfy/ + - ${STORAGE_PATH}/ntfy/cache/:/var/cache/ntfy + - ${STORAGE_PATH}/ntfy/varlib/:/var/lib/ntfy/ labels: - "traefik.enable=true" - "traefik.http.routers.push.rule=Host(`${FQDN_PUSH}`)" diff --git a/rustdesk/docker-compose.yml b/rustdesk/docker-compose.yml index 6a01a16..68a6627 100644 --- a/rustdesk/docker-compose.yml +++ b/rustdesk/docker-compose.yml @@ -9,7 +9,7 @@ services: image: rustdesk/rustdesk-server:${RUSTDESK_VERSION} command: hbbs -r ${DOMAIN}:21117 -k _ volumes: - - ${VOLUMES_PATH}/rustdesk:/root + - ${STORAGE_PATH}:/root networks: - rustdesk depends_on: @@ -26,7 +26,7 @@ services: image: rustdesk/rustdesk-server:latest command: hbbr -k _ volumes: - - ${VOLUMES_PATH}/rustdesk:/root + - ${STORAGE_PATH}:/root networks: - rustdesk restart: unless-stopped diff --git a/wallabag/docker-compose.yaml b/wallabag/docker-compose.yaml index e011ecb..d8c9970 100644 --- a/wallabag/docker-compose.yaml +++ b/wallabag/docker-compose.yaml @@ -20,7 +20,7 @@ services: - web - wallabag volumes: - - ${VOLUMES_PATH}/wallabag/images:/var/www/wallabag/web/assets/images + - ${STORAGE_PATH}/images:/var/www/wallabag/web/assets/images healthcheck: test: ["CMD", "curl" ,"--fail", "http://localhost/api/info"] interval: 10s @@ -44,7 +44,7 @@ services: networks: - wallabag volumes: - - /var/dockervolumes/wallabag/db:/var/lib/mysql + - ${STORAGE_PATH}/db:/var/lib/mysql labels: - "docker.group=wallabag"