mirror of
https://github.com/tubearchivist/jellyfin.git
synced 2024-11-16 17:00:14 +00:00
Use environment variables for Docker instead of a configuration file
Signed-off-by: Jonas Rosland <jonas.rosland@gmail.com>
This commit is contained in:
parent
79bb5bd579
commit
364d7c324c
@ -1,6 +1,4 @@
|
||||
FROM python:3.10.9-slim-bullseye
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
git
|
||||
RUN git clone https://github.com/tubearchivist/jellyfin
|
||||
COPY . /jellyfin
|
||||
WORKDIR jellyfin
|
||||
RUN pip install -r requirements.txt
|
||||
|
@ -1,7 +1,13 @@
|
||||
services:
|
||||
ta-jf:
|
||||
build: ./
|
||||
volumes:
|
||||
- ./config.json:/jellyfin/config.json:ro
|
||||
- /tubearchivist/media:/tubearchivist/media
|
||||
command: python main.py
|
||||
environment:
|
||||
- TA_VIDEO_PATH="/youtube"
|
||||
- TA_URL="http://tubearchivist.local"
|
||||
- TA_TOKEN="xxxxxxxxxxxxxxxx"
|
||||
- JF_URL="http://jellyfin.local:8096"
|
||||
- JF_TOKEN="yyyyyyyyyyyyyyyy"
|
||||
# volumes:
|
||||
# - ./config.json:/jellyfin/config.json:ro
|
||||
# - /youtube:/youtube
|
||||
command: python main.py
|
||||
|
@ -1,13 +1,28 @@
|
||||
"""handle config file"""
|
||||
|
||||
import json
|
||||
import os
|
||||
|
||||
from src.static_types import ConfigType
|
||||
|
||||
|
||||
def get_config() -> ConfigType:
|
||||
"""get connection config"""
|
||||
with open("config.json", "r", encoding="utf-8") as f:
|
||||
config_content: ConfigType = json.loads(f.read())
|
||||
|
||||
return config_content
|
||||
|
||||
if os.path.exists("config.json"):
|
||||
print("config.json file found, skipping environment variables")
|
||||
with open("config.json", "r", encoding="utf-8") as f:
|
||||
config_content: ConfigType = json.loads(f.read())
|
||||
return config_content
|
||||
elif "TA_URL" in os.environ:
|
||||
print("Environment variables found, continuing")
|
||||
data = {}
|
||||
data['ta_video_path'] = os.getenv('TA_VIDEO_PATH', '/youtube')
|
||||
data['ta_url'] = os.getenv('TA_URL')
|
||||
data['ta_token'] = os.getenv('TA_TOKEN')
|
||||
data['jf_url'] = os.getenv('JF_URL')
|
||||
data['jf_token'] = os.getenv('JF_TOKEN')
|
||||
config_content: ConfigType = json.loads(json.dumps(data))
|
||||
return config_content
|
||||
else:
|
||||
raise ValueError("No config.json or environment variable found, exiting")
|
@ -100,11 +100,30 @@ class TubeArchivist:
|
||||
|
||||
def env_check() -> None:
|
||||
"""check if ta_video_path is accessible"""
|
||||
if not os.path.exists("config.json"):
|
||||
raise FileNotFoundError("config.json file not found")
|
||||
# if not os.path.exists("config.json"):
|
||||
# raise FileNotFoundError("config.json file not found")
|
||||
if not CONFIG["ta_url"]:
|
||||
raise ValueError("TA_URL not set")
|
||||
else:
|
||||
print("TA_URL =", CONFIG["ta_url"])
|
||||
|
||||
if not CONFIG["ta_token"]:
|
||||
raise ValueError("TA_TOKEN not set")
|
||||
else:
|
||||
print("TA_TOKEN =", CONFIG["ta_token"])
|
||||
|
||||
if not CONFIG["jf_url"]:
|
||||
raise ValueError("JF_URL not set")
|
||||
else:
|
||||
print("JF_URL =", CONFIG["jf_url"])
|
||||
|
||||
if not CONFIG["jf_token"]:
|
||||
raise ValueError("JF_TOKEN not set")
|
||||
else:
|
||||
print("JF_TOKEN =", CONFIG["jf_token"])
|
||||
|
||||
if not os.path.exists(CONFIG["ta_video_path"]):
|
||||
raise FileNotFoundError("failed to access ta_video_path")
|
||||
raise FileNotFoundError("failed to access ta_video_path", CONFIG["ta_video_path"])
|
||||
|
||||
|
||||
def clean_overview(overview_raw: str) -> str:
|
||||
|
Loading…
Reference in New Issue
Block a user