From 7c4857244aaec09e1399e934d7cf304bc0a91f29 Mon Sep 17 00:00:00 2001 From: DasPoschi Date: Wed, 31 Dec 2025 09:12:47 +0100 Subject: [PATCH] Refactor docker-compose to use environment variables Updated environment variables and paths to use variables from .env file. --- docker-compose.yml | 59 ++++++++-------------------------------------- 1 file changed, 10 insertions(+), 49 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 20e3eaf..fc7c3ad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,69 +2,30 @@ version: "3.8" services: jdownloader: - image: jlesage/jdownloader-2:latest - container_name: jdownloader-2 + image: ${JD_IMAGE} + container_name: ${JD_CONTAINER_NAME} restart: unless-stopped ports: - - "5800:5800" + - "${JD_WEB_PORT}:5800" environment: - TZ: "Europe/Berlin" + TZ: ${TZ} volumes: - ./data/jd-config:/config - ./data/jd-output:/output jd-webgui: build: ./jd-webgui - container_name: jd-webgui + container_name: ${WEBGUI_CONTAINER_NAME} restart: unless-stopped depends_on: - jdownloader ports: - - "8080:8080" + - "${WEBGUI_PORT}:8080" + env_file: + - .env environment: - # MyJDownloader - MYJD_EMAIL: "DEINE_EMAIL" - MYJD_PASSWORD: "DEIN_MYJD_PASSWORT" - MYJD_DEVICE: "DEIN_DEVICE_NAME" - - # Jellyfin VM SSH target - JELLYFIN_HOST: "192.168.1.1" - JELLYFIN_PORT: "22" - JELLYFIN_USER: "jellyfinuser" - JELLYFIN_SSH_KEY: "/ssh/id_ed25519" - - # Ziele (empfohlen getrennt; falls leer -> fallback auf DEST_DIR) - JELLYFIN_MOVIES_DIR: "/srv/media/movies/inbox" - JELLYFIN_SERIES_DIR: "/srv/media/series/inbox" - # Fallback: - JELLYFIN_DEST_DIR: "/srv/media/movies/inbox" - - POLL_SECONDS: "5" - - # Optional Basic Auth (leer = aus) - BASIC_AUTH_USER: "admin" - BASIC_AUTH_PASS: "CHANGE_ME" - - # Jellyfin API (für Rescan) - JELLYFIN_API_BASE: "http://192.168.1.1:8096" - JELLYFIN_API_KEY: "DEIN_JELLYFIN_API_KEY" - JELLYFIN_LIBRARY_REFRESH: "true" # true/false - - # TMDB (für Umbenennung) - TMDB_API_KEY: "DEIN_TMDB_API_KEY" - TMDB_LANGUAGE: "de-DE" # optional, z.B. de-DE oder en-US - - # Zielstruktur - CREATE_MOVIE_FOLDER: "true" # pro Film Unterordner - CREATE_SERIES_FOLDERS: "true" # /Serien/Show/Season xx/ - - # MD5 Sidecars nicht in /output schreiben - MD5_DIR: "/md5" - + TZ: ${TZ} volumes: - # Muss identisch zum JD Mount sein, damit /output stimmt - ./data/jd-output:/output:ro - ./data/md5:/md5:rw - - # SSH Key für Upload zur Jellyfin-VM - - ~/.ssh/id_ed25519:/ssh/id_ed25519:ro + - ${SSH_KEY_PATH}:/ssh/id_ed25519:ro