From 539a2af0c19e75ef616cbdb5e34d9bef6c803ef2 Mon Sep 17 00:00:00 2001 From: Volker Date: Fri, 26 Dec 2025 13:55:00 +0100 Subject: [PATCH 1/2] version bump 1.0.4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e4c0d46..a6a3a43 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.3 \ No newline at end of file +1.0.4 \ No newline at end of file From c47f15c61ac279db4506a71b9c2114d7e35b66b7 Mon Sep 17 00:00:00 2001 From: Volker Date: Fri, 26 Dec 2025 13:55:52 +0100 Subject: [PATCH 2/2] cleanup file paths to support single volume mapping --- Dockerfile | 12 +++++++----- README.md | 6 ++---- mzb_rss_service/config.py | 2 +- mzb_rss_service/main.py | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1a36955..083dd85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,16 +11,18 @@ COPY requirements.txt . RUN pip install --no-cache-dir -r requirements.txt # Default config and data paths +# persistence directory/volume is mounted to /var/mbz-rss-feeder ENV FEEDS_FILE_PATH=/var/mbz-rss-feeder/feeds.yml -ENV CONFIG_FILE_PATH=/etc/mbz-rss-feeder.yml +ENV CONFIG_FILE_PATH=/var/mbz-rss-feeder/etc/mbz-rss-feeder.yml ENV CACHE_DIR=/var/mbz-rss-feeder/cache -ENV LOG_FILE=/var/log/mbz-rss-feeder.log +ENV LOG_FILE=/var/mbz-rss-feeder/log/mbz-rss-feeder.log ENV LOG_LEVEL=INFO +ENV MBZ_LOG_LEVEL=WARNING -RUN mkdir -p /var/mbz-rss-feeder/cache \ - && touch /var/log/mbz-rss-feeder.log \ +RUN mkdir -p /var/mbz-rss-feeder/cache /var/mbz-rss-feeder/log /var/mbz-rss-feeder/etc \ + && touch /var/mbz-rss-feeder/log/mbz-rss-feeder.log \ && touch /var/mbz-rss-feeder/feeds.yml \ - && touch /etc/mbz-rss-feeder.yml + && touch /var/mbz-rss-feeder/etc/mbz-rss-feeder.yml # Test stage FROM builder AS test diff --git a/README.md b/README.md index 41cd9e2..609bdaa 100644 --- a/README.md +++ b/README.md @@ -39,12 +39,10 @@ Updates to the configuration will also create a timestamped backup of the previo ### deployment #### docker +This is a local container running with data stored in ./local/testdata `docker run \ -p 8080:8080 -e LOG_LEVEL=debug --rm --name mbz-rss\ - -v ./local/testdata/feeds.yml:/var/mbz-rss-feeder/feeds.yml \ - -v ./local/testdata/mbz-rss-feeder.yml:/etc/mbz-rss-feeder.yml \ - -v ./local/testdata/cache:/var/mbz-rss-feeder/cache \ - -v ./local/testdata/mbz-rss-feeder.log:/var/mbz-rss-feeder.log \ + -v ./local/testdata/:/var/mbz-rss-feeder \ --env-file ./local/testdata/.env \ docker.io/library/mzb-rss-feeder:1.0.0` diff --git a/mzb_rss_service/config.py b/mzb_rss_service/config.py index 30f2006..bcd6ab6 100644 --- a/mzb_rss_service/config.py +++ b/mzb_rss_service/config.py @@ -9,7 +9,7 @@ import uuid logger = logging.getLogger(__name__) FEEDS_FILE_PATH = os.path.expandvars(os.environ.get('FEEDS_FILE_PATH', '/var/mbz-rss-feeder/feeds.yml')) -CONFIG_FILE_PATH = os.path.expandvars(os.environ.get('CONFIG_FILE_PATH', '/etc/mbz-rss-feeder.yml')) +CONFIG_FILE_PATH = os.path.expandvars(os.environ.get('CONFIG_FILE_PATH', '/var/mbz-rss-feeder/etc/mbz-rss-feeder.yml')) CACHE_DIR = os.path.expandvars(os.environ.get('CACHE_DIR', '/var/mbz-rss-feeder/cache')) MB_APP_NAME = os.path.expandvars(os.environ.get('MB_APP_NAME', 'mzb-rss-service')) MB_VERSION = os.path.expandvars(os.environ.get('MB_VERSION', '0.1.0')) diff --git a/mzb_rss_service/main.py b/mzb_rss_service/main.py index d9895f3..04e7cdb 100644 --- a/mzb_rss_service/main.py +++ b/mzb_rss_service/main.py @@ -11,10 +11,10 @@ from . import musicbrainz log_level_str = os.environ.get('LOG_LEVEL', 'INFO').upper() log_level = getattr(logging, log_level_str, logging.INFO) -log_file = os.path.expandvars(os.environ.get('LOG_FILE', '/var/log/mbz-rss-feeder.log')) +log_file = os.path.expandvars(os.environ.get('LOG_FILE', '/var/mbz-rss-feeder/log/mbz-rss-feeder.log')) log_format='%(asctime)s - %(name)s - %(levelname)s - %(message)s' -mbz_log_level_str = os.environ.get('LOG_LEVEL', 'WARNING').upper() -mbz_log_level = os.environ.get('MBZ_LOG_LEVEL', logging.WARNING) +mbz_log_level_str = os.environ.get('MBZ_LOG_LEVEL', 'WARNING').upper() +mbz_log_level = getattr(logging, mbz_log_level_str, logging.WARNING) # Configure root logger root_logger = logging.getLogger()