diff --git a/.env b/.env index 314e142..24b887d 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ #GLOBAL SETTINGS COMPOSE_HTTP_TIMEOUT=120 COMPOSE_IGNORE_ORPHANS=1 -DOCKERCONFDIR=./appdata +DOCKERCONFIGS=./appdata DOCKERGID=999 DOCKERHOSTNAME=DockerServer DOCKERLOGGING_MAXFILE=10 @@ -12,6 +12,8 @@ UMASK=000 TZ=America/Chicago ADMIN_USERNAME=akanealw ADMIN_PASSWORD=8ung1e1! +DATA_DIR=/mnt/data +MEDIA_DIR=/mnt/data/media #KUTT PORT=3000 diff --git a/docker-compose.yml b/docker-compose.yml index 11969f8..abd832b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,8 +12,8 @@ services: - 6767:6767 restart: unless-stopped volumes: - - ./appdata/bazarr:/config - - /mnt/data:/data + - ${DOCKERCONFIGS}/bazarr:/config + - ${DATA_DIR}:/data collabora: container_name: collabora @@ -28,7 +28,7 @@ services: - 9980:9980 restart: unless-stopped volumes: - - ./appdata/collabora/code:/etc/loolwsd + - ${DOCKERCONFIGS}/collabora/code:/etc/loolwsd freshrss: container_name: freshrss @@ -44,8 +44,8 @@ services: - 8088:80/tcp restart: unless-stopped volumes: - - ./appdata/freshrss/data:/var/www/FreshRSS/data - - ./appdata/freshrss/extensions:/var/www/FreshRSS/extensions + - ${DOCKERCONFIGS}/freshrss/data:/var/www/FreshRSS/data + - ${DOCKERCONFIGS}/freshrss/extensions:/var/www/FreshRSS/extensions - /etc/localtime:/etc/localtime:ro freshrss-db: @@ -59,7 +59,7 @@ services: - POSTGRES_DB=freshrss restart: unless-stopped volumes: - - ./appdata/freshrss/db/data:/var/lib/postgresql/data + - ${DOCKERCONFIGS}/freshrss/db/data:/var/lib/postgresql/data - /etc/localtime:/etc/localtime:ro gluetun: @@ -91,7 +91,7 @@ services: - 55361:6881/udp # qBittorrent restart: unless-stopped volumes: - - ./appdata/gluetun:/gluetun + - ${DOCKERCONFIGS}/gluetun:/gluetun jackett: container_name: jackett @@ -106,8 +106,8 @@ services: - 9117:9117/tcp restart: unless-stopped volumes: - - ./appdata/jackett/config:/config - - /mnt/data/downloads:/downloads + - ${DOCKERCONFIGS}/jackett/config:/config + - ${DATA_DIR}/media/downloads/torrents:/torrents jdownloader: container_name: jdownloader @@ -126,8 +126,8 @@ services: network_mode: "service:gluetun" restart: unless-stopped volumes: - - ./appdata/jdownloader:/config - - /mnt/data/downloads/jdownloader:/downloads + - ${DOCKERCONFIGS}/jdownloader:/config + - ${DATA_DIR}/media/downloads/jdownloader:/jdownloader - /etc/localtime:/etc/localtime:ro kavita: @@ -137,8 +137,8 @@ services: - "5002:5000" restart: unless-stopped volumes: - - /mnt/storage/ComicsAndManga:/comicsandmanga - - ./appdata/kavita/config:/kavita/config + - ${DATA_DIR}/storage/ComicsAndManga:/comicsandmanga + - ${DOCKERCONFIGS}/kavita/config:/kavita/config lidarr: container_name: lidarr @@ -151,20 +151,9 @@ services: - 8686:8686 restart: unless-stopped volumes: - - ./appdata/lidarr/config:/config - - /mnt/storage/music/Albums:/music - - /mnt/data/downloads/music:/downloads - - linkding: - container_name: linkding - image: sissbruecker/linkding:latest - env_file: - - .env - ports: - - 9090:9090 - restart: unless-stopped - volumes: - - ./appdata/linkding:/etc/linkding/data + - ${DOCKERCONFIGS}/lidarr/config:/config + - ${DATA_DIR}/storage/Music/Albums:/music + - ${DATA_DIR}/media/downloads/music:/downloads meshcentral: container_name: meshcentral @@ -180,8 +169,8 @@ services: - 9080:80/tcp restart: unless-stopped volumes: - - ./appdata/meshcentral/data:/opt/meshcentral/meshcentral-data - - ./appdata/meshcentral/user_files:/opt/meshcentral/meshcentral-files + - ${DOCKERCONFIGS}/meshcentral/data:/opt/meshcentral/meshcentral-data + - ${DOCKERCONFIGS}/meshcentral/user_files:/opt/meshcentral/meshcentral-files metube: container_name: metube @@ -194,8 +183,8 @@ services: - 8082:8081 restart: unless-stopped volumes: - - /mnt/data/media/videos/youtubedl:/downloads - - ./appdata/metube:/config + - ${DATA_DIR}/media/downloads/youtubedl:/youtubedl + - ${DOCKERCONFIGS}/metube:/config monitorr: container_name: monitorr @@ -208,9 +197,9 @@ services: - 8084:80/tcp restart: unless-stopped volumes: - - /mnt/data:/HD:ro - - ./appdata/monitorr/app:/app - - ./appdata/monitorr/config:/config + - ${DATA_DIR}:/HD:ro + - ${DOCKERCONFIGS}/monitorr/app:/app + - ${DOCKERCONFIGS}/monitorr/config:/config - /etc/localtime:/etc/localtime:ro mstream: @@ -224,8 +213,8 @@ services: - 3001:3000 restart: unless-stopped volumes: - - ./appdata/mstream:/config - - /mnt/storage/music:/music + - ${DOCKERCONFIGS}/mstream:/config + - ${DATA_DIR}/storage/Music:/music nzbhydra: container_name: nzbhydra @@ -238,8 +227,9 @@ services: - 5076:5076 restart: unless-stopped volumes: - - ./appdata/nzbhydra/config:/config - - /mnt/data/downloads:/downloads + - ${DOCKERCONFIGS}/nzbhydra/config:/config + - ${DATA_DIR}/media/downloads/nzbs:/nzbs + - ${DATA_DIR}/media/downloads/torrents:/torrents olivetin: container_name: olivetin @@ -249,7 +239,7 @@ services: - 1337:1337 restart: unless-stopped volumes: - - ./appdata/olivetin/config:/config + - ${DOCKERCONFIGS}/olivetin/config:/config - /var/run/docker.sock:/var/run/docker.sock organizr: @@ -263,7 +253,7 @@ services: - 8085:80/tcp restart: unless-stopped volumes: - - ./appdata/organizr/config:/config + - ${DOCKERCONFIGS}/organizr/config:/config - /etc/localtime:/etc/localtime:ro overseerr: @@ -276,7 +266,7 @@ services: - 5055:5055 restart: unless-stopped volumes: - - ./appdata/overseerr/config:/app/config + - ${DOCKERCONFIGS}/overseerr/config:/app/config - /etc/localtime:/etc/localtime:ro prowlarr: @@ -290,7 +280,7 @@ services: - 9696:9696 restart: unless-stopped volumes: - - ./appdata/prowlarr/config:/config + - ${DOCKERCONFIGS}/prowlarr/config:/config qbittorrent: container_name: qbittorrent @@ -303,9 +293,9 @@ services: network_mode: "service:gluetun" restart: unless-stopped volumes: - - ./appdata/qbittorrent/config:/config - - /mnt/data:/data - - /mnt/data/downloads/torrents:/torrents + - ${DOCKERCONFIGS}/qbittorrent/config:/config + - ${DATA_DIR}:/data + - ${DATA_DIR}/media/downloads/torrents:/torrents radarr: container_name: radarr @@ -318,8 +308,8 @@ services: - 7878:7878 restart: unless-stopped volumes: - - ./appdata/radarr:/config - - /mnt/data:/data + - ${DOCKERCONFIGS}/radarr:/config + - ${DATA_DIR}:/data sabnzbd: container_name: sabnzbd @@ -331,9 +321,9 @@ services: network_mode: "service:gluetun" restart: unless-stopped volumes: - - ./appdata/sabnzbd:/config - - /mnt/data:/data - - /mnt/data/downloads/nzbs:/nzbs + - ${DOCKERCONFIGS}/sabnzbd:/config + - ${DATA_DIR}:/data + - ${DATA_DIR}/media/downloads/nzbs:/nzbs sonarr: container_name: sonarr @@ -346,8 +336,8 @@ services: - 8989:8989 restart: unless-stopped volumes: - - ./appdata/sonarr:/config - - /mnt/data:/data + - ${DOCKERCONFIGS}/sonarr:/config + - ${DATA_DIR}:/data s-pdf: container_name: spdf @@ -365,7 +355,7 @@ services: - 8055:8080 restart: unless-stopped volumes: - - ./appdata/trilium/data:/home/node/trilium-data + - ${DOCKERCONFIGS}/trilium/data:/home/node/trilium-data webnut: container_name: webnut @@ -381,24 +371,5 @@ services: - 6543:6543 restart: unless-stopped - webtop: - container_name: webtop - image: lscr.io/linuxserver/webtop:debian-xfce - security_opt: - - seccomp:unconfined - environment: - - PUID=${PUID} - - PGID=${PGID} - - TZ=${TZ} - - SUBFOLDER=/ - - KEYBOARD=en-us-qwerty - - TITLE=Debian - shm_size: "1gb" - ports: - - 3023:3000 - restart: unless-stopped - volumes: - - ./appdata/webtop:/config - networks: default: