From d12f0642f235520f8ce97e61487d0b845479fa33 Mon Sep 17 00:00:00 2001 From: Scott Peshak Date: Sun, 2 Dec 2018 15:20:29 -0600 Subject: [PATCH 1/3] Add DBHOST & DBPORT parameters Resolves #445 --- src/paperless/settings.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/paperless/settings.py b/src/paperless/settings.py index 97226ef44..54e984eb6 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -152,6 +152,10 @@ def __get_boolean(key, default="NO"): } if os.getenv("PAPERLESS_DBPASS"): DATABASES["default"]["PASSWORD"] = os.getenv("PAPERLESS_DBPASS") + if os.getenv("PAPERLESS_DBHOST"): + DATABASES["default"]["HOST"] = os.getenv("PAPERLESS_DBHOST") + if os.getenv("PAPERLESS_DBPORT"): + DATABASES["default"]["PORT"] = os.getenv("PAPERLESS_DBPORT") # Password validation From d6896daece92668b14d24a7ac256fcd013d05121 Mon Sep 17 00:00:00 2001 From: Scott Peshak Date: Sun, 2 Dec 2018 16:09:35 -0600 Subject: [PATCH 2/3] Add psycopg2 to requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 92f4b0ff8..d30cbf078 100755 --- a/requirements.txt +++ b/requirements.txt @@ -43,6 +43,7 @@ pexpect==4.6.0 pickleshare==0.7.5 pillow==5.3.0 pluggy==0.8.0 +psycopg2==2.7.6.1 prompt-toolkit==2.0.7 ptyprocess==0.6.0 py==1.7.0 From 96dafe8c439d60103e5b8ab488f6467cfa211dc0 Mon Sep 17 00:00:00 2001 From: Scott Peshak Date: Sun, 2 Dec 2018 16:10:05 -0600 Subject: [PATCH 3/3] Add psycopg2 dependencies to Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 55d54cc01..fadea9a07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,10 +13,10 @@ ENV PAPERLESS_EXPORT_DIR=/export \ PAPERLESS_CONSUMPTION_DIR=/consume -RUN apk update --no-cache && apk add python3 gnupg libmagic bash shadow curl \ +RUN apk update --no-cache && apk add python3 gnupg libmagic libpq bash shadow curl \ sudo poppler tesseract-ocr imagemagick ghostscript unpaper optipng && \ apk add --virtual .build-dependencies \ - python3-dev poppler-dev gcc g++ musl-dev zlib-dev jpeg-dev && \ + python3-dev poppler-dev postgresql-dev gcc g++ musl-dev zlib-dev jpeg-dev && \ # Install python dependencies python3 -m ensurepip && \ rm -r /usr/lib/python*/ensurepip && \