diff --git a/Docker_README.md b/Docker_README.md index 0bb5beb..d382919 100644 --- a/Docker_README.md +++ b/Docker_README.md @@ -4,7 +4,7 @@ Running with Docker Sample Run command ----- ```bash -docker run -d --name ytsm -p 80:8000 --volume ./downloads:/usr/src/app/data/downloads chibicitiberiu/ytsm:latest +docker run -d --name ytsm -p 80:8000 --volume /media/ytsm/data:/usr/src/ytsm/data --volume /media/ytsm/config:/usr/src/ytsm/config chibicitiberiu/ytsm:latest ``` ### Quick Rundown: - `--expose 80:8000` maps the Host OS port 80 to the container port 80 diff --git a/Dockerfile b/Dockerfile index d929469..e4630bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,6 @@ VOLUME /usr/src/ytsm/data COPY ./app/ ./ COPY ./docker/init.sh ./ -COPY ./config/ /usr/src/ytsm/config/ EXPOSE 8000 diff --git a/app/YtManager/settings.py b/app/YtManager/settings.py index 637a233..b1a78fb 100644 --- a/app/YtManager/settings.py +++ b/app/YtManager/settings.py @@ -126,11 +126,13 @@ CONFIG_DIR = os.path.join(PROJECT_ROOT, "config") DATA_DIR = os.path.join(PROJECT_ROOT, "data") STATIC_ROOT = os.path.join(PROJECT_ROOT, "static") + +_DEFAULT_CONFIG_DIR = os.path.join(BASE_DIR, "default") _DEFAULT_CONFIG_FILE = os.path.join(CONFIG_DIR, 'config.ini') _DEFAULT_LOG_FILE = os.path.join(DATA_DIR, 'log.log') _DEFAULT_MEDIA_ROOT = os.path.join(DATA_DIR, 'media') -DEFAULTS_FILE = os.path.join(CONFIG_DIR, 'defaults.ini') +DEFAULTS_FILE = os.path.join(_DEFAULT_CONFIG_DIR, 'defaults.ini') CONFIG_FILE = os.getenv('YTSM_CONFIG_FILE', _DEFAULT_CONFIG_FILE) # diff --git a/config/defaults.ini b/app/default/defaults.ini similarity index 100% rename from config/defaults.ini rename to app/default/defaults.ini