diff --git a/Dockerfile b/Dockerfile index 8875fc0..e32ca97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,12 @@ RUN pip install --no-cache-dir -r requirements.txt # copy app COPY . . -# create data directories -RUN mkdir -p /app/data /app/db/cache +# create data directories (db files stored in /data, not /app/db) +RUN mkdir -p /data/db /data/cache + +# set DB path via env +ENV DB_PATH=/data/db/connectd.db +ENV CACHE_DIR=/data/cache # default command runs daemon CMD ["python", "daemon.py"] diff --git a/db/__init__.py b/db/__init__.py index fb363e3..3c42af4 100644 --- a/db/__init__.py +++ b/db/__init__.py @@ -3,12 +3,14 @@ connectd database layer sqlite storage for humans, fingerprints, matches, intros """ +import os import sqlite3 import json from datetime import datetime from pathlib import Path -DB_PATH = Path(__file__).parent / 'connectd.db' +# use env var for DB path (docker) or default to local +DB_PATH = Path(os.environ.get('DB_PATH', Path(__file__).parent / 'connectd.db')) class Database: diff --git a/docker-compose.yml b/docker-compose.yml index cf32967..ba56947 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: connectd: - image: sudoxnym/connectd:latest + image: sudoxreboot/connectd:latest container_name: connectd restart: unless-stopped env_file: diff --git a/requirements.txt b/requirements.txt index a8608b2..b649c0d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ requests>=2.28.0 +beautifulsoup4>=4.12.0