diff --git a/.gitignore_public b/.gitignore_public index 2562a65..640788b 100644 --- a/.gitignore_public +++ b/.gitignore_public @@ -14,7 +14,6 @@ ownServices/AfterDownloadCarerByFinish/config ownServices/AfterFilebotMoveProcessor/config ownServices/ArrModificationCapturer ownServices/SonarrQueueFixer/config -ownServices/SonarrQueueFixer/.env overseerr/config plex/config prowlarr/config @@ -25,3 +24,14 @@ radarr/config sonarr/config tautulli/config +ownServices/SonarrQueueFixer/.env +plex/.env +radarr/.env +filebot/desktop/.env +homarr/.env +overseerr/.env +ownServices/AfterFilebotMoveProcessor/.env +prowlarr/.env +qbit/.env +qbit/manager/.env +tautulli/.env \ No newline at end of file diff --git a/filebot/desktop/docker-compose.yml b/filebot/desktop/docker-compose.yml index 08e7ff0..a32e213 100644 --- a/filebot/desktop/docker-compose.yml +++ b/filebot/desktop/docker-compose.yml @@ -6,12 +6,12 @@ services: image: rednoah/filebot:xpra restart: unless-stopped volumes: - - /volume1/data:/data + - ${HOST_DATA_FOLDER}:/data - ./config/filebot:/data/filebot - ../presets:/presets - ../xattr:/xattr environment: - - PUID=1026 - - PGID=100 + - PUID=${USER} + - PGID=${GROUP} ports: - - 5454:5454 + - ${HOST_PORT}:5454 \ No newline at end of file diff --git a/homarr/docker-compose.yml b/homarr/docker-compose.yml index cf4d33c..881cc12 100644 --- a/homarr/docker-compose.yml +++ b/homarr/docker-compose.yml @@ -7,14 +7,14 @@ services: environment: - DEFAULT_COLOR_SCHEME=dark volumes: - - /var/run/docker.sock:/var/run/docker.sock # Optional, only if you want docker integration + - ${HOST_DOCKER_SOCK}:/var/run/docker.sock # Optional, only if you want docker integration - ./configs:/app/data/configs - ./icons:/app/public/icons - ./data:/data - ./imgs:/imgs ports: - - '7575:7575' + - ${HOST_PORT}:7575 extra_hosts: - "host.docker.internal:host-gateway" dns: - - 192.168.1.22 \ No newline at end of file + - ${DNS_IP} \ No newline at end of file diff --git a/overseerr/docker-compose.yml b/overseerr/docker-compose.yml index 7f6832b..fff7a24 100644 --- a/overseerr/docker-compose.yml +++ b/overseerr/docker-compose.yml @@ -6,13 +6,13 @@ services: image: lscr.io/linuxserver/overseerr:latest container_name: mangrana_overseerr environment: - - PUID=1026 - - PGID=100 + - PUID=${USER} + - PGID=${GROUP} - TZ=Europe/Madrid volumes: - ./config:/config ports: - - 5055:5055 + - ${HOST_PORT}:5055 restart: unless-stopped extra_hosts: - host.docker.internal:host-gateway diff --git a/ownServices/AfterFilebotMoveProcessor/docker-compose.yml b/ownServices/AfterFilebotMoveProcessor/docker-compose.yml index 617d247..6b3c35a 100644 --- a/ownServices/AfterFilebotMoveProcessor/docker-compose.yml +++ b/ownServices/AfterFilebotMoveProcessor/docker-compose.yml @@ -5,8 +5,8 @@ services: container_name: mangrana_java_after_filebot image: xeviff/after_filebot_fix:latest dns: - - 192.168.1.22 + - ${DNS_IP} volumes: - - /volume1/jobs/logs/filebot:/filebot_logs - - /volume1/jobs:/jobs + - ${JOBS_HOST_FOLDER}/logs/filebot:/filebot_logs + - ${JOBS_HOST_FOLDER}:/jobs - ./config:/config \ No newline at end of file diff --git a/ownServices/SonarrQueueFixer/docker-compose.yml b/ownServices/SonarrQueueFixer/docker-compose.yml index 80c7fa5..7ab1601 100644 --- a/ownServices/SonarrQueueFixer/docker-compose.yml +++ b/ownServices/SonarrQueueFixer/docker-compose.yml @@ -10,4 +10,4 @@ services: - TZ=Europe/Madrid volumes: - ./config:/config - - /volume1/data:/data \ No newline at end of file + - ${HOST_DATA_FOLDER}:/data \ No newline at end of file diff --git a/plex/docker-compose.yml b/plex/docker-compose.yml index dcad1fb..64aac9b 100644 --- a/plex/docker-compose.yml +++ b/plex/docker-compose.yml @@ -11,21 +11,21 @@ services: security_opt: - no-new-privileges:true healthcheck: - test: wget --no-verbose --tries=1 --spider http://localhost:32400/web + test: wget --no-verbose --tries=1 --spider ${HEALTHCHECK_URL} volumes: - ./config:/config - - ${DOCKERSTORAGEDIR}/media:/data/media:rw - - ${SDSTORAGEDIR}/transcode/plex:/transcode + - ${HOST_DATA_FOLDER}/media:/data/media:rw + - ${SD_STORAGE}/transcode/plex:/transcode devices: - /dev/dri/renderD128:/dev/dri/renderD128 - /dev/dri/card0:/dev/dri/card0 -# tmpfs: +# tmpfs: #this is to use the RAM as location for the transcoding buffer. I've disabled it because of possible OutOfMemory errors. If in the future I have more RAM then will be a nice configuration # - /transcode environment: - - PUID=1026 - - PGID=100 + - PUID=${USER} + - PGID=${GROUP} - VERSION=public - TZ=Europe/Madrid restart: on-failure:5 labels: - - "com.centurylinklabs.watchtower.enable=false" \ No newline at end of file + - "com.centurylinklabs.watchtower.enable=false" #this is to not let the "dockers-version-auto-upgrader" restart plex at any time (specially when users are streaming) \ No newline at end of file diff --git a/prowlarr/docker-compose.yml b/prowlarr/docker-compose.yml index d285937..5e1a826 100644 --- a/prowlarr/docker-compose.yml +++ b/prowlarr/docker-compose.yml @@ -5,13 +5,13 @@ services: image: lscr.io/linuxserver/prowlarr:latest container_name: mangrana_prowlarr environment: - - PUID=1026 - - PGID=100 + - PUID=${USER} + - PGID=${GROUP} - TZ=Europe/Madrid volumes: - ./config:/config ports: - - 9696:9696 + - ${HOST_PORT}:9696 restart: unless-stopped networks: - qbit_default diff --git a/qbit/docker-compose.yml b/qbit/docker-compose.yml index d8eeddd..b38a49e 100644 --- a/qbit/docker-compose.yml +++ b/qbit/docker-compose.yml @@ -5,18 +5,18 @@ services: image: lscr.io/linuxserver/qbittorrent:4.5.4 container_name: mangrana_qbittorrent environment: - - PUID=1026 - - PGID=100 + - PUID=${USER} + - PGID=${GROUP} - TZ=Europe/Madrid - WEBUI_PORT=8080 volumes: - ./config:/config - ./scripts:/scripts - - /volume1/data:/data - - /volumeUSB1/usbshare/incomplete:/incomplete + - ${HOST_DATA_FOLDER}:/data + - ${SD_STORAGE}/incomplete:/incomplete ports: - - 8081:8080 - - 51413:51413 + - ${HOST_WEBUI_PORT}:8080 + - ${HOST_TRANSFERS_PORT}:51413 restart: unless-stopped labels: - "com.centurylinklabs.watchtower.enable=false" \ No newline at end of file diff --git a/qbit/manager/docker-compose.yml b/qbit/manager/docker-compose.yml index 1a4673e..9cfbd3d 100644 --- a/qbit/manager/docker-compose.yml +++ b/qbit/manager/docker-compose.yml @@ -5,7 +5,7 @@ services: image: bobokun/qbit_manage volumes: - ./config:/config:rw - - /volume1/data:/data:rw + - ${HOST_DATA_FOLDER}:/data:rw environment: - TZ=Europe/Madrid - QBT_SCHEDULE=1440 diff --git a/radarr/docker-compose.yml b/radarr/docker-compose.yml index 3822947..0c8f7cd 100644 --- a/radarr/docker-compose.yml +++ b/radarr/docker-compose.yml @@ -5,15 +5,15 @@ services: image: lscr.io/linuxserver/radarr container_name: mangrana_radarr environment: - - PUID=1026 - - PGID=100 + - PUID=${USER} + - PGID=${GROUP} - TZ=Europe/Madrid volumes: - ./config:/config - ${JOBS_RADARR}:/jobs - - /volume1/data:/data + - ${HOST_DATA_FOLDER}:/data ports: - - 7878:7878 + - ${HOST_WEBUI_PORT}:7878 restart: unless-stopped networks: - qbit_default diff --git a/sonarr/docker-compose.yml b/sonarr/docker-compose.yml index 8ce8f18..4a3f771 100644 --- a/sonarr/docker-compose.yml +++ b/sonarr/docker-compose.yml @@ -5,15 +5,15 @@ services: image: lscr.io/linuxserver/sonarr container_name: mangrana_sonarr environment: - - PUID=1026 - - PGID=100 + - PUID=${USER} + - PGID=${GROUP} - TZ=Europe/Madrid volumes: - ./config:/config - ${JOBS_SONARR}:/jobs - - /volume1/data:/data + - ${HOST_DATA_FOLDER}:/data ports: - - 8989:8989 + - ${HOST_WEBUI_PORT}:8989 restart: unless-stopped networks: - qbit_default diff --git a/tautulli/docker-compose.yml b/tautulli/docker-compose.yml index ee63a91..fee9cf0 100644 --- a/tautulli/docker-compose.yml +++ b/tautulli/docker-compose.yml @@ -5,11 +5,11 @@ services: container_name: mangrana_tautulli image: ghcr.io/linuxserver/tautulli environment: - - PUID=1026 - - PGID=100 + - PUID=${USER} + - PGID=${GROUP} - TZ=Europe/Madrid volumes: - ./config:/config ports: - - 8182:8181 + - ${HOST_WEBUI_PORT}:8181 restart: unless-stopped