diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..b02c44d --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +config/config.ini \ No newline at end of file diff --git a/Docker_README.md b/Docker_README.md index ce98824..41837c7 100644 --- a/Docker_README.md +++ b/Docker_README.md @@ -4,15 +4,14 @@ 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 -- `--volume ./downloads:/usr/src/app/data/downloads` maps the downloads folder of the current directory to the container folder `downloads` (where you could set the program to download to) +- `--volume /media/ytsm/data:/usr/src/app/data` maps the data folder on the host to the container folder `data` +- `--volume /media/ytsm/coinfig:/usr/src/app/config` maps the config folder on the host to the container folder `config` - `chibicitiberiu/ytsm:latest` tells Docker which image to run the container with (in this case, the latest version) -**Note:** Replace `./downloads` in the command to where you want the downloads folder to be mapped to on the Host OS. Ex: `/path/to/host/download/folder:/path/to/container/download/folder` - Environment variables ----- @@ -23,8 +22,8 @@ Environment variables Volumes ----- -- /usr/src/app/data/media -- /usr/src/app/data/db +- /usr/src/app/data +- /usr/src/app/config Notes 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