From 69cf505a9041a47f35d30ce4150e0c47f71473b7 Mon Sep 17 00:00:00 2001 From: emil-lengman Date: Sat, 22 Aug 2020 21:29:41 +0200 Subject: [PATCH] remove pg connect string, add rethink user and password --- Dockerfile | 5 +++-- docker-entrypoint.js | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 76b87f3..f4f2527 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,11 +21,12 @@ ENV STORAGE_TYPE=memcached \ STORAGE_PORT=11211\ STORAGE_EXPIRE_SECONDS=2592000\ STORAGE_DB=2 \ - STORAGE_CONNECTION_URL= \ STORAGE_AWS_BUCKET= \ STORAGE_AWS_REGION= \ STORAGE_PG_PASSWORD= \ - STORAGE_PG_USERNAME= + STORAGE_PG_USERNAME= \ + STORAGE_RETHINK_USER= \ + STORAGE_RETHINK_PASSWORD= ENV LOGGING_LEVEL=verbose \ LOGGING_TYPE=Console \ diff --git a/docker-entrypoint.js b/docker-entrypoint.js index e9e7ead..d661fbf 100644 --- a/docker-entrypoint.js +++ b/docker-entrypoint.js @@ -14,6 +14,8 @@ const { STORAGE_AWS_REGION, STORAGE_PG_PASSWORD, STORAGE_PG_USERNAME, + STORAGE_RETHINK_USER, + STORAGE_RETHINK_PASSWORD, LOGGING_LEVEL, LOGGING_TYPE, LOGGING_COLORIZE, @@ -91,6 +93,8 @@ const config = { region: STORAGE_AWS_REGION, connectionUrl: `postgres://${STORAGE_PG_USERNAME}:${STORAGE_PG_PASSWORD}@${STORAGE_HOST}:${STORAGE_PORT}/${STORAGE_DB}`, db: STORAGE_DB, + user: STORAGE_RETHINK_USER, + password: STORAGE_RETHINK_USER, }, documents: DOCUMENTS