From f252cc6c2b797c669001df3ac01c7fec8e1969b6 Mon Sep 17 00:00:00 2001 From: Jack Spiering <46534141+jackspiering@users.noreply.github.com> Date: Mon, 6 Jan 2025 15:03:08 +0100 Subject: [PATCH] Changed ${SERVICE} to ${SERVICE}-data (#62) --- services/adguardhome/docker-compose.yml | 4 ++-- services/bazarr/docker-compose.yml | 6 +++--- services/beszel/hub/docker-compose.yml | 2 +- services/changedetection/docker-compose.yml | 2 +- services/ddns-updater/docker-compose.yml | 2 +- services/dozzle/docker-compose.yml | 2 +- services/excalidraw/docker-compose.yml | 2 +- services/gokapi/docker-compose.yml | 4 ++-- services/isley/docker-compose.yml | 4 ++-- services/languagetool/docker-compose.yml | 2 +- services/nextcloud/docker-compose.yml | 2 +- services/nodered/docker-compose.yml | 2 +- services/pihole/docker-compose.yml | 4 ++-- services/pingvin-share/docker-compose.yml | 4 ++-- services/plex/docker-compose.yml | 6 +++--- services/portainer/docker-compose.yml | 2 +- services/qbittorrent/docker-compose.yml | 4 ++-- services/radarr/docker-compose.yml | 6 +++--- services/resilio-sync/docker-compose.yml | 6 +++--- services/slink/docker-compose.yml | 4 ++-- services/sonarr/docker-compose.yml | 6 +++--- services/stirlingpdf/docker-compose.yml | 8 ++++---- services/tautulli/docker-compose.yml | 2 +- services/technitium/docker-compose.yml | 2 +- services/traefik/docker-compose.yml | 4 ++-- services/uptime-kuma/docker-compose.yml | 2 +- services/vaultwarden/docker-compose.yml | 2 +- templates/service-template/docker-compose.yml | 2 +- 28 files changed, 49 insertions(+), 49 deletions(-) diff --git a/services/adguardhome/docker-compose.yml b/services/adguardhome/docker-compose.yml index 85010f2..6861274 100644 --- a/services/adguardhome/docker-compose.yml +++ b/services/adguardhome/docker-compose.yml @@ -43,8 +43,8 @@ services: environment: - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/workdir:/opt/adguardhome/work # Work directory for Adguard Home - you may need to change the path - - ${PWD}/${SERVICE}/configdir:/opt/adguardhome/conf # Config directory for Adguard Home - you may need to change the path + - ${PWD}/${SERVICE}-data/workdir:/opt/adguardhome/work # Work directory for Adguard Home - you may need to change the path + - ${PWD}/${SERVICE}-data/configdir:/opt/adguardhome/conf # Config directory for Adguard Home - you may need to change the path depends_on: tailscale: condition: service_healthy diff --git a/services/bazarr/docker-compose.yml b/services/bazarr/docker-compose.yml index 4662d12..2b55078 100644 --- a/services/bazarr/docker-compose.yml +++ b/services/bazarr/docker-compose.yml @@ -44,9 +44,9 @@ services: - PGID=1000 - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/config:/config - - ${PWD}/${SERVICE}/media/movies:/movies - - ${PWD}/${SERVICE}/media/tvseries:/tv + - ${PWD}/${SERVICE}-data/config:/config + - ${PWD}/${SERVICE}-data/media/movies:/movies + - ${PWD}/${SERVICE}-data/media/tvseries:/tv depends_on: tailscale: condition: service_healthy diff --git a/services/beszel/hub/docker-compose.yml b/services/beszel/hub/docker-compose.yml index 087b144..b37134d 100644 --- a/services/beszel/hub/docker-compose.yml +++ b/services/beszel/hub/docker-compose.yml @@ -44,7 +44,7 @@ services: - PGID=1000 - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/beszel_data:/beszel_data # Work directory for Beszel Hub - you may need to change the path + - ${PWD}/${SERVICE}-data/beszel_data:/beszel_data # Work directory for Beszel Hub - you may need to change the path depends_on: tailscale: condition: service_healthy diff --git a/services/changedetection/docker-compose.yml b/services/changedetection/docker-compose.yml index aebeb55..d1096aa 100644 --- a/services/changedetection/docker-compose.yml +++ b/services/changedetection/docker-compose.yml @@ -44,7 +44,7 @@ services: - PGID=1000 - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/datastore:/datastore + - ${PWD}/${SERVICE}-data/datastore:/datastore depends_on: tailscale: condition: service_healthy diff --git a/services/ddns-updater/docker-compose.yml b/services/ddns-updater/docker-compose.yml index 4c781d5..7dc9643 100644 --- a/services/ddns-updater/docker-compose.yml +++ b/services/ddns-updater/docker-compose.yml @@ -65,7 +65,7 @@ services: - LOG_CALLER=hidden #- SHOUTRRR_ADDRESSES= volumes: - - ${PWD}/${SERVICE}/data:/updater/data + - ${PWD}/${SERVICE}-data/data:/updater/data depends_on: tailscale: condition: service_healthy diff --git a/services/dozzle/docker-compose.yml b/services/dozzle/docker-compose.yml index 45b035a..710f392 100644 --- a/services/dozzle/docker-compose.yml +++ b/services/dozzle/docker-compose.yml @@ -42,7 +42,7 @@ services: environment: DOZZLE_AUTH_PROVIDER: simple volumes: - - ${PWD}/${SERVICE}/dozzle-data:/data + - ${PWD}/${SERVICE}-data/dozzle-data:/data - /var/run/docker.sock:/var/run/docker.sock:ro depends_on: tailscale: diff --git a/services/excalidraw/docker-compose.yml b/services/excalidraw/docker-compose.yml index 11dcead..e15bb7f 100644 --- a/services/excalidraw/docker-compose.yml +++ b/services/excalidraw/docker-compose.yml @@ -44,7 +44,7 @@ services: - TZ=Europe/Amsterdam stdin_open: true volumes: - - ${PWD}/${SERVICE}/app/config:/config + - ${PWD}/${SERVICE}-data/app/config:/config depends_on: tailscale: condition: service_healthy diff --git a/services/gokapi/docker-compose.yml b/services/gokapi/docker-compose.yml index f775368..5293f4d 100644 --- a/services/gokapi/docker-compose.yml +++ b/services/gokapi/docker-compose.yml @@ -42,8 +42,8 @@ services: environment: - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/gokapi-data:/app/data - - ${PWD}/${SERVICE}/gokapi-config:/app/config + - ${PWD}/${SERVICE}-data/gokapi-data:/app/data + - ${PWD}/${SERVICE}-data/gokapi-config:/app/config depends_on: tailscale: condition: service_healthy diff --git a/services/isley/docker-compose.yml b/services/isley/docker-compose.yml index 139a117..2187229 100644 --- a/services/isley/docker-compose.yml +++ b/services/isley/docker-compose.yml @@ -42,8 +42,8 @@ services: environment: - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/isley-db:/app/data - - ${PWD}/${SERVICE}/isley-uploads:/app/uploads + - ${PWD}/${SERVICE}-data/isley-db:/app/data + - ${PWD}/${SERVICE}-data/isley-uploads:/app/uploads depends_on: tailscale: condition: service_healthy diff --git a/services/languagetool/docker-compose.yml b/services/languagetool/docker-compose.yml index 282b8df..91a1a9e 100644 --- a/services/languagetool/docker-compose.yml +++ b/services/languagetool/docker-compose.yml @@ -45,7 +45,7 @@ services: - Java_Xmx=1g # OPTIONAL: Setting a maximum Java heap size of 1 Gib - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/ngrams:/ngrams + - ${PWD}/${SERVICE}-data/ngrams:/ngrams depends_on: tailscale: condition: service_healthy diff --git a/services/nextcloud/docker-compose.yml b/services/nextcloud/docker-compose.yml index 1ae74a0..7095d6b 100644 --- a/services/nextcloud/docker-compose.yml +++ b/services/nextcloud/docker-compose.yml @@ -46,7 +46,7 @@ services: - MYSQL_HOST=db # Please note, this variable should reflect the service name of the database itself, in this case db - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/nextcloud_data/:/var/www/html + - ${PWD}/${SERVICE}-data/nextcloud_data/:/var/www/html depends_on: tailscale: condition: service_healthy diff --git a/services/nodered/docker-compose.yml b/services/nodered/docker-compose.yml index 985d8cc..3689e12 100644 --- a/services/nodered/docker-compose.yml +++ b/services/nodered/docker-compose.yml @@ -44,7 +44,7 @@ services: - PGID=1000 - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/app/config:/data + - ${PWD}/${SERVICE}-data/app/config:/data depends_on: tailscale: condition: service_healthy diff --git a/services/pihole/docker-compose.yml b/services/pihole/docker-compose.yml index 6ab4f8f..776ae78 100644 --- a/services/pihole/docker-compose.yml +++ b/services/pihole/docker-compose.yml @@ -44,8 +44,8 @@ services: - PGID=1000 - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/etc-pihole:/etc/pihole - - ${PWD}/${SERVICE}/etc-dnsmasq.d:/etc/dnsmasq.d + - ${PWD}/${SERVICE}-data/etc-pihole:/etc/pihole + - ${PWD}/${SERVICE}-data/etc-dnsmasq.d:/etc/dnsmasq.d # https://github.com/pi-hole/docker-pi-hole#note-on-capabilities depends_on: tailscale: diff --git a/services/pingvin-share/docker-compose.yml b/services/pingvin-share/docker-compose.yml index 654ca8a..0f95f2c 100644 --- a/services/pingvin-share/docker-compose.yml +++ b/services/pingvin-share/docker-compose.yml @@ -43,8 +43,8 @@ services: - TRUST_PROXY=false # Set to true if a reverse proxy is in front of the container - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/data:/opt/app/backend/data - - ${PWD}/${SERVICE}/images:/opt/app/frontend/public/img + - ${PWD}/${SERVICE}-data/data:/opt/app/backend/data + - ${PWD}/${SERVICE}-data/images:/opt/app/frontend/public/img depends_on: tailscale: condition: service_healthy diff --git a/services/plex/docker-compose.yml b/services/plex/docker-compose.yml index bcc3e36..df858f4 100644 --- a/services/plex/docker-compose.yml +++ b/services/plex/docker-compose.yml @@ -46,9 +46,9 @@ services: - VERSION=docker - PLEX_CLAIM= #optional volumes: - - ${PWD}/${SERVICE}/config:/config - - ${PWD}/${SERVICE}/media/tvseries:/tv - - ${PWD}/${SERVICE}/media/movies:/movies + - ${PWD}/${SERVICE}-data/config:/config + - ${PWD}/${SERVICE}-data/media/tvseries:/tv + - ${PWD}/${SERVICE}-data/media/movies:/movies depends_on: tailscale: condition: service_healthy diff --git a/services/portainer/docker-compose.yml b/services/portainer/docker-compose.yml index 097753f..66175bf 100644 --- a/services/portainer/docker-compose.yml +++ b/services/portainer/docker-compose.yml @@ -45,7 +45,7 @@ services: - TZ=Europe/Amsterdam volumes: - /var/run/docker.sock:/var/run/docker.sock - - ${PWD}/${SERVICE}/portainer_data:/data + - ${PWD}/${SERVICE}-data/portainer_data:/data depends_on: tailscale: condition: service_healthy diff --git a/services/qbittorrent/docker-compose.yml b/services/qbittorrent/docker-compose.yml index 9bdc7ce..f7d9a6d 100644 --- a/services/qbittorrent/docker-compose.yml +++ b/services/qbittorrent/docker-compose.yml @@ -46,8 +46,8 @@ services: - WEBUI_PORT=8080 # - TORRENTING_PORT=6881 #optional volumes: - - ${PWD}/${SERVICE}/config:/config - - ${PWD}/${SERVICE}/downloads:/downloads + - ${PWD}/${SERVICE}-data/config:/config + - ${PWD}/${SERVICE}-data/downloads:/downloads depends_on: tailscale: condition: service_healthy diff --git a/services/radarr/docker-compose.yml b/services/radarr/docker-compose.yml index 233752f..f97c662 100644 --- a/services/radarr/docker-compose.yml +++ b/services/radarr/docker-compose.yml @@ -44,9 +44,9 @@ services: - PGID=1000 - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/config:/config - - ${PWD}/${SERVICE}/media/movies:/movies #Optional - - ${PWD}/${SERVICE}/downloads:/downloads #Optional + - ${PWD}/${SERVICE}-data/config:/config + - ${PWD}/${SERVICE}-data/media/movies:/movies #Optional + - ${PWD}/${SERVICE}-data/downloads:/downloads #Optional depends_on: tailscale: condition: service_healthy diff --git a/services/resilio-sync/docker-compose.yml b/services/resilio-sync/docker-compose.yml index 431efb2..d9b463d 100644 --- a/services/resilio-sync/docker-compose.yml +++ b/services/resilio-sync/docker-compose.yml @@ -44,9 +44,9 @@ services: - PGID=1000 - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/config:/config - - ${PWD}/${SERVICE}/downloads:/downloads - - ${PWD}/${SERVICE}/data:/sync + - ${PWD}/${SERVICE}-data/config:/config + - ${PWD}/${SERVICE}-data/downloads:/downloads + - ${PWD}/${SERVICE}-data/data:/sync depends_on: tailscale: condition: service_healthy diff --git a/services/slink/docker-compose.yml b/services/slink/docker-compose.yml index b61cc0f..9358621 100644 --- a/services/slink/docker-compose.yml +++ b/services/slink/docker-compose.yml @@ -59,8 +59,8 @@ services: # Available options are local and smb - STORAGE_PROVIDER=local volumes: - - ${PWD}/${SERVICE}/var/data:/app/var/data - - ${PWD}/${SERVICE}/images:/app/slink/images + - ${PWD}/${SERVICE}-data/var/data:/app/var/data + - ${PWD}/${SERVICE}-data/images:/app/slink/images depends_on: tailscale: condition: service_healthy diff --git a/services/sonarr/docker-compose.yml b/services/sonarr/docker-compose.yml index 1237eaa..c3c9c60 100644 --- a/services/sonarr/docker-compose.yml +++ b/services/sonarr/docker-compose.yml @@ -44,9 +44,9 @@ services: - PGID=1000 - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/config:/config - - ${PWD}/${SERVICE}/media/tvseries:/tv - - ${PWD}/${SERVICE}/downloads:/downloads + - ${PWD}/${SERVICE}-data/config:/config + - ${PWD}/${SERVICE}-data/media/tvseries:/tv + - ${PWD}/${SERVICE}-data/downloads:/downloads depends_on: tailscale: condition: service_healthy diff --git a/services/stirlingpdf/docker-compose.yml b/services/stirlingpdf/docker-compose.yml index bcfbb10..7b5f5f3 100644 --- a/services/stirlingpdf/docker-compose.yml +++ b/services/stirlingpdf/docker-compose.yml @@ -44,10 +44,10 @@ services: - INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false - LANGS=en_GB volumes: - - ${PWD}/${SERVICE}/trainingData:/usr/share/tessdata # Required for extra OCR languages - - ${PWD}/${SERVICE}/extraConfigs:/configs -# - ${PWD}/${SERVICE}/customFiles:/customFiles/ # May be enabled if desired -# - ${PWD}/${SERVICE}/logs:/logs/ # May be enabled if desired + - ${PWD}/${SERVICE}-data/trainingData:/usr/share/tessdata # Required for extra OCR languages + - ${PWD}/${SERVICE}-data/extraConfigs:/configs +# - ${PWD}/${SERVICE}-data/customFiles:/customFiles/ # May be enabled if desired +# - ${PWD}/${SERVICE}-data/logs:/logs/ # May be enabled if desired depends_on: tailscale: condition: service_healthy diff --git a/services/tautulli/docker-compose.yml b/services/tautulli/docker-compose.yml index 660b30f..76b725d 100644 --- a/services/tautulli/docker-compose.yml +++ b/services/tautulli/docker-compose.yml @@ -44,7 +44,7 @@ services: - PGID=1000 - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/app/config:/config + - ${PWD}/${SERVICE}-data/app/config:/config depends_on: tailscale: condition: service_healthy diff --git a/services/technitium/docker-compose.yml b/services/technitium/docker-compose.yml index 492eb11..cf140dc 100644 --- a/services/technitium/docker-compose.yml +++ b/services/technitium/docker-compose.yml @@ -68,7 +68,7 @@ services: # - DNS_SERVER_FORWARDER_PROTOCOL=Tcp #Forwarder protocol options: Udp, Tcp, Tls, Https, HttpsJson. # - DNS_SERVER_LOG_USING_LOCAL_TIME=true #Enable this option to use local time instead of UTC for logging. volumes: - - ${PWD}/${SERVICE}/app/config:/config + - ${PWD}/${SERVICE}-data/app/config:/config depends_on: tailscale: condition: service_healthy diff --git a/services/traefik/docker-compose.yml b/services/traefik/docker-compose.yml index e9e2aed..9721d41 100644 --- a/services/traefik/docker-compose.yml +++ b/services/traefik/docker-compose.yml @@ -55,9 +55,9 @@ services: restart: always volumes: - type: bind - source: ${PWD}/${SERVICE}/app/traefik.yml + source: ${PWD}/${SERVICE}-data/app/traefik.yml target: /etc/traefik.yml - - ${PWD}/${SERVICE}/log/:/var/log/ + - ${PWD}/${SERVICE}-data/log/:/var/log/ - /var/run/docker.sock:/var/run/docker.sock #Required for the Service Connections command: - "--api.insecure=true" diff --git a/services/uptime-kuma/docker-compose.yml b/services/uptime-kuma/docker-compose.yml index e0ed2fe..2298ed8 100644 --- a/services/uptime-kuma/docker-compose.yml +++ b/services/uptime-kuma/docker-compose.yml @@ -44,7 +44,7 @@ services: - PGID=1000 - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/uptime-kuma-data:/app/data # uptime-kuma data/configuration folder + - ${PWD}/${SERVICE}-data/uptime-kuma-data:/app/data # uptime-kuma data/configuration folder - /var/run/docker.sock:/var/run/docker.sock:ro # Read-only access to the docker.sock depends_on: tailscale: diff --git a/services/vaultwarden/docker-compose.yml b/services/vaultwarden/docker-compose.yml index e613f48..39f1753 100644 --- a/services/vaultwarden/docker-compose.yml +++ b/services/vaultwarden/docker-compose.yml @@ -43,7 +43,7 @@ services: # DOMAIN: "https://vaultwarden.example.com" # required when using a reverse proxy; your domain; vaultwarden needs to know it's https to work properly with attachments SIGNUPS_ALLOWED: "true" # Deactivate this with "false" after you have created your account so that no strangers can register volumes: - - ${PWD}/${SERVICE}/vw-data:/data + - ${PWD}/${SERVICE}-data/vw-data:/data depends_on: tailscale: condition: service_healthy diff --git a/templates/service-template/docker-compose.yml b/templates/service-template/docker-compose.yml index 9aeff36..8a983f5 100644 --- a/templates/service-template/docker-compose.yml +++ b/templates/service-template/docker-compose.yml @@ -44,7 +44,7 @@ services: - PGID=1000 - TZ=Europe/Amsterdam volumes: - - ${PWD}/${SERVICE}/app/config:/config + - ${PWD}/${SERVICE}-data/app/config:/config depends_on: tailscale: condition: service_healthy