cleanup file paths to support single volume mapping

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

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`
 

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'))

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()