From d546922e1ef5c712e639634dad3bafebb7cf4a95 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 8 Apr 2023 13:58:07 +0300 Subject: [PATCH] Fix bind mount paths --- authentik/docker-compose.toml | 27 +++++++++------------------ caddy/docker-compose.toml | 6 +++--- ddns/docker-compose.toml | 2 +- forgejo/docker-compose.toml | 2 +- freshrss/docker-compose.toml | 2 +- homeautomation/docker-compose.toml | 8 ++++---- jellyfin/docker-compose.toml | 4 ++-- misskey/docker-compose.toml | 8 ++++---- nextcloud/docker-compose.toml | 2 +- ofelia/docker-compose.toml | 2 +- pihole/docker-compose.toml | 4 ++-- postgres/docker-compose.toml | 2 +- searx/docker-compose.toml | 4 ++-- stats/docker-compose.toml | 2 +- tvheadend/docker-compose.toml | 2 +- woodpecker/docker-compose.toml | 4 ++-- 16 files changed, 36 insertions(+), 45 deletions(-) diff --git a/authentik/docker-compose.toml b/authentik/docker-compose.toml index 24904d9..514b725 100644 --- a/authentik/docker-compose.toml +++ b/authentik/docker-compose.toml @@ -3,7 +3,7 @@ image = "redis:alpine" container_name = "authentik-redis" networks = ["authentik"] restart = "unless-stopped" -volumes = ["/docker/authentik/redis:/data"] +volumes = ["~/data/authentik/redis:/data"] [services.redis.healthcheck] test = ["CMD-SHELL", "redis-cli ping | grep PONG"] @@ -18,9 +18,9 @@ container_name = "authentik" restart = "unless-stopped" command = "server" volumes = [ - "/docker/authentik/media:/media", - "/docker/authentik/custom-templates:/templates", - "/docker/authentik/geoip:/geoip", + "~/data/authentik/media:/media", + "~/data/authentik/custom-templates:/templates", + "~/data/authentik/geoip:/geoip", ] env_file = [".env"] networks = ["authentik", "postgres", "proxy"] @@ -32,11 +32,10 @@ restart = "unless-stopped" command = "worker" user = "root" volumes = [ - "/docker/authentik/backups:/backups", - "/docker/authentik/custom-templates:/templates", - "/docker/authentik/geoip:/geoip", - "/docker/authentik/media:/media", - "/var/run/docker.sock:/var/run/docker.sock", + "~/data/authentik/backups:/backups", + "~/data/authentik/custom-templates:/templates", + "~/data/authentik/geoip:/geoip", + "~/data/authentik/media:/media", ] env_file = [".env"] networks = ["authentik", "postgres"] @@ -46,21 +45,13 @@ image = "maxmindinc/geoipupdate" container_name = "authentik-geoipupdate" restart = "unless-stopped" networks = ["authentik"] -volumes = ["/docker/authentik/geoip:/usr/share/GeoIP"] +volumes = ["~/data/authentik/geoip:/usr/share/GeoIP"] env_file = [".env"] [services.geoipupdate.environment] GEOIPUPDATE_EDITION_IDS = "GeoLite2-City" GEOIPUPDATE_FREQUENCY = "8" -[services.whoami-test] -image = "traefik/whoami" -container_name = "whoami-test" -restart = "unless-stopped" -security_opt = ["no-new-privileges:true"] -networks = ["proxy"] -environment = ["TZ"] - [networks.authentik] external = true diff --git a/caddy/docker-compose.toml b/caddy/docker-compose.toml index 7a51f6f..bfbb935 100644 --- a/caddy/docker-compose.toml +++ b/caddy/docker-compose.toml @@ -6,9 +6,9 @@ user = "82:82" ports = ["80:80", "443:443/tcp", "443:443/udp"] networks = ["proxy"] volumes = [ - "/docker/caddy/data:/data", - "/docker/caddy/config:/config", - "/docker/nextcloud:/var/www/nextcloud", + "~/data/caddy/data:/data", + "~/data/caddy/config:/config", + "~/data/nextcloud:/var/www/nextcloud", "/var/www/korhonen.cc:/var/www/korhonen.cc", "/var/www/wkd:/var/www/wkd", "/var/www/index.korhonen.cc:/var/www/index.korhonen.cc", diff --git a/ddns/docker-compose.toml b/ddns/docker-compose.toml index 7bf009e..3e701b6 100644 --- a/ddns/docker-compose.toml +++ b/ddns/docker-compose.toml @@ -4,5 +4,5 @@ container_name = "cloudflare-ddns" security_opt = ["no-new-privileges:true"] network_mode = "host" environment = ["PUID=1000", "PGID=1000"] -volumes = ["/docker/ddns/config.json:/config.json"] +volumes = ["~/data/ddns/config.json:/config.json"] restart = "unless-stopped" diff --git a/forgejo/docker-compose.toml b/forgejo/docker-compose.toml index a6dc63d..11a26d2 100644 --- a/forgejo/docker-compose.toml +++ b/forgejo/docker-compose.toml @@ -5,7 +5,7 @@ environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] restart = "unless-stopped" networks = ["postgres", "proxy"] ports = ["22:22"] -volumes = ["/docker/forgejo:/data", "/etc/localtime:/etc/localtime:ro"] +volumes = ["~/data/forgejo:/data", "/etc/localtime:/etc/localtime:ro"] [networks.postgres] external = true diff --git a/freshrss/docker-compose.toml b/freshrss/docker-compose.toml index cfd76b9..10dd8b8 100644 --- a/freshrss/docker-compose.toml +++ b/freshrss/docker-compose.toml @@ -5,7 +5,7 @@ restart = "unless-stopped" networks = ["freshrss", "postgres", "proxy"] environment = ["PUID=1000", "PGID=985", "TZ=Europe/Helsinki"] volumes = [ - "/docker/freshrss/freshrss:/config", + "~/data/freshrss/freshrss:/config", "/etc/localtime:/etc/localtime:ro", ] diff --git a/homeautomation/docker-compose.toml b/homeautomation/docker-compose.toml index 6f1eac5..e0c852d 100644 --- a/homeautomation/docker-compose.toml +++ b/homeautomation/docker-compose.toml @@ -4,7 +4,7 @@ image = "homeassistant/home-assistant" environment = ["TZ=Europe/Helsinki"] devices = ["/dev/ttyACM0"] volumes = [ - "/docker/homeautomation/home-assistant:/config", + "~/data/homeautomation/home-assistant:/config", "/etc/localtime:/etc/localtime:ro", ] restart = "unless-stopped" @@ -16,7 +16,7 @@ depends_on = ["mosquitto"] [services.esphome] container_name = "esphome" image = "esphome/esphome" -volumes = ["/docker/homeautomation/esphome:/config"] +volumes = ["~/data/homeautomation/esphome:/config"] restart = "unless-stopped" network_mode = "host" @@ -27,7 +27,7 @@ environment = ["TZ=Europe/Helsinki"] ports = ["1883:1883"] networks = ["homeautomation"] volumes = [ - "/docker/homeautomation/mosquitto:/mosquitto", + "~/data/homeautomation/mosquitto:/mosquitto", "/etc/localtime:/etc/localtime:ro", ] restart = "unless-stopped" @@ -36,7 +36,7 @@ restart = "unless-stopped" container_name = "rhasspy" image = "rhasspy/rhasspy" command = "--profile en --user-profiles /profiles" -volumes = ["/docker/homeautomation/rhasspy:/profiles"] +volumes = ["~/data/homeautomation/rhasspy:/profiles"] environment = ["TZ=Europe/Helsinki"] ports = ["12101:12101"] networks = ["homeautomation"] diff --git a/jellyfin/docker-compose.toml b/jellyfin/docker-compose.toml index f69335b..7a2ba1c 100644 --- a/jellyfin/docker-compose.toml +++ b/jellyfin/docker-compose.toml @@ -5,8 +5,8 @@ environment = ["TZ=Europe/Helsinki"] networks = ["proxy", "authentik"] restart = "unless-stopped" volumes = [ - "/docker/jellyfin/config:/config", - "/docker/jellyfin/cache:/cache", + "~/data/jellyfin/config:/config", + "~/data/jellyfin/cache:/cache", "/mnt/Storage/Media:/media", "/mnt/Storage/Nextcloud/FunctionalHacker/files/Media/Music:/media/Music", "/etc/localtime:/etc/localtime:ro", diff --git a/misskey/docker-compose.toml b/misskey/docker-compose.toml index 01ca5b2..c2c6797 100644 --- a/misskey/docker-compose.toml +++ b/misskey/docker-compose.toml @@ -6,15 +6,15 @@ depends_on = ["redis"] ports = ["3082:3000"] networks = ["misskey", "proxy", "postgres"] volumes = [ - "/docker/misskey/files:/misskey/files", - "/docker/misskey/config:/misskey/.config:ro", + "~/data/misskey/files:/misskey/files", + "~/data/misskey/config:/misskey/.config:ro", ] [services.elasticsearch] image = "docker.elastic.co/elasticsearch/elasticsearch:7.17.8" container_name = "misskey-elasticsearch" restart = "unless-stopped" -volumes = ["/docker/misskey/elasticsearch/:/usr/share/elasticsearch/data"] +volumes = ["~/data/misskey/elasticsearch/:/usr/share/elasticsearch/data"] networks = ["misskey"] environment = [ "cluster.name=misskey-es-cluster", @@ -32,7 +32,7 @@ image = "redis" container_name = "redis-misskey" restart = "unless-stopped" networks = ["misskey"] -volumes = ["/docker/misskey/redis:/data"] +volumes = ["~/data/misskey/redis:/data"] [networks.misskey] internal = true diff --git a/nextcloud/docker-compose.toml b/nextcloud/docker-compose.toml index 1bf978c..8211247 100644 --- a/nextcloud/docker-compose.toml +++ b/nextcloud/docker-compose.toml @@ -5,7 +5,7 @@ restart = "unless-stopped" user = "82:82" networks = ["nextcloud", "postgres", "proxy"] volumes = [ - "/docker/nextcloud:/var/www/html:z", + "~/data/nextcloud:/var/www/html:z", "/mnt/Storage/Nextcloud:/var/www/html/data", "/etc/localtime:/etc/localtime:ro", ] diff --git a/ofelia/docker-compose.toml b/ofelia/docker-compose.toml index e9e5ea0..347448a 100644 --- a/ofelia/docker-compose.toml +++ b/ofelia/docker-compose.toml @@ -4,6 +4,6 @@ container_name = "ofelia" restart = "unless-stopped" volumes = [ "/etc/localtime:/etc/localtime:ro", - "/var/run/docker.sock:/var/run/docker.sock:ro", + "/var/run~/data.sock:/var/run/docker.sock:ro", ] command = "daemon --docker" diff --git a/pihole/docker-compose.toml b/pihole/docker-compose.toml index 9f32819..288e8a7 100644 --- a/pihole/docker-compose.toml +++ b/pihole/docker-compose.toml @@ -6,8 +6,8 @@ image = "pihole/pihole" ports = ["53:53/tcp", "53:53/udp", "67:67/udp", "8069:80/tcp"] networks = ["proxy"] volumes = [ - "/docker/pihole/pihole:/etc/pihole/", - "/docker/pihole/dnsmasq:/etc/dnsmasq.d/", + "~/data/pihole/pihole:/etc/pihole/", + "~/data/pihole/dnsmasq:/etc/dnsmasq.d/", ] dns = ["127.0.0.1", "1.1.1.1"] cap_add = ["NET_ADMIN"] diff --git a/postgres/docker-compose.toml b/postgres/docker-compose.toml index e8a9ec8..2c556f7 100644 --- a/postgres/docker-compose.toml +++ b/postgres/docker-compose.toml @@ -7,7 +7,7 @@ environment = ["TZ=Europe/Helsinki", "POSTGRES_PASSWORD=12345"] ports = ["5432:5432"] networks = ["postgres"] volumes = [ - "/docker/postgres:/var/lib/postgresql/data", + "~/data/postgres:/var/lib/postgresql/data", "/etc/localtime:/etc/localtime:ro", ] restart = "unless-stopped" diff --git a/searx/docker-compose.toml b/searx/docker-compose.toml index f2c1dd7..477c37a 100644 --- a/searx/docker-compose.toml +++ b/searx/docker-compose.toml @@ -4,8 +4,8 @@ image = "searxng/searxng" restart = "unless-stopped" networks = ["searx", "proxy"] volumes = [ - "/docker/searx:/etc/searxng", - #"/docker/searx/logo.png:/usr/local/searxng/searx/static/themes/simple/img/searxng.png:ro" + "~/data/searx:/etc/searxng", + #"~/data/searx/logo.png:/usr/local/searxng/searx/static/themes/simple/img/searxng.png:ro" ] environment = ["SEARXNG_BASE_URL=https://search.korhonen.cc/"] cap_drop = ["ALL"] diff --git a/stats/docker-compose.toml b/stats/docker-compose.toml index ff0e084..e8200dc 100644 --- a/stats/docker-compose.toml +++ b/stats/docker-compose.toml @@ -1,7 +1,7 @@ [services.grafana] image = "grafana/grafana" container_name = "grafana" -volumes = ["/docker/stats/grafana:/var/lib/grafana"] +volumes = ["~/data/stats/grafana:/var/lib/grafana"] networks = ["stats", "proxy"] user = "1000:984" env_file = [".env"] diff --git a/tvheadend/docker-compose.toml b/tvheadend/docker-compose.toml index cdbff58..9dc8cee 100644 --- a/tvheadend/docker-compose.toml +++ b/tvheadend/docker-compose.toml @@ -3,7 +3,7 @@ image = "linuxserver/tvheadend" container_name = "tvheadend" environment = ["TZ=Europe/Helsinki", "PUID=1000", "PGID=985"] volumes = [ - "/docker/tvheadend:/config", + "~/data/tvheadend:/config", "/mnt/Storage/Media/PVR:/recordings", "/mnt/Storage/picons:/picons", "/etc/localtime:/etc/localtime:ro", diff --git a/woodpecker/docker-compose.toml b/woodpecker/docker-compose.toml index 7a4c823..ff6eb85 100644 --- a/woodpecker/docker-compose.toml +++ b/woodpecker/docker-compose.toml @@ -2,7 +2,7 @@ image = "woodpeckerci/woodpecker-server" container_name = "woodpecker" restart = "unless-stopped" -volumes = ["/docker/woodpecker/:/var/lib/woodpecker/"] +volumes = ["~/data/woodpecker/:/var/lib/woodpecker/"] env_file = [".env"] environment = [ "WOODPECKER_OPEN=true", @@ -22,7 +22,7 @@ container_name = "woodpecker-agent" command = "agent" restart = "unless-stopped" depends_on = ["woodpecker"] -volumes = ["/var/run/docker.sock:/var/run/docker.sock"] +volumes = ["/var/run~/data.sock:/var/run/docker.sock"] env_file = [".env"] environment = [ "WOODPECKER_SERVER=woodpecker:9000",