From 342f56ce1a9513716249ec54d4b62e09401cb97c Mon Sep 17 00:00:00 2001
From: emil-lengman <emil.lengman@schibsted.com>
Date: Sat, 22 Aug 2020 21:56:58 +0200
Subject: [PATCH] use same password and username env vars for all types

---
 Dockerfile           | 6 ++----
 docker-entrypoint.js | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3b1f0e2..34a06e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,10 +23,8 @@ ENV STORAGE_TYPE=memcached \
     STORAGE_DB=2 \
     STORAGE_AWS_BUCKET= \
     STORAGE_AWS_REGION= \
-    STORAGE_PG_PASSWORD= \
-    STORAGE_PG_USERNAME= \
-    STORAGE_RETHINK_USER= \
-    STORAGE_RETHINK_PASSWORD= \
+    STORAGE_USENAMER= \
+    STORAGE_PASSWORD= \
     STORAGE_FILEPATH= 
 
 ENV LOGGING_LEVEL=verbose \
diff --git a/docker-entrypoint.js b/docker-entrypoint.js
index 60be55d..f8912de 100644
--- a/docker-entrypoint.js
+++ b/docker-entrypoint.js
@@ -92,10 +92,10 @@ const config = {
     expire: STORAGE_EXPIRE_SECONDS,
     bucket: STORAGE_AWS_BUCKET,
     region: STORAGE_AWS_REGION,
-    connectionUrl: `postgres://${STORAGE_PG_USERNAME}:${STORAGE_PG_PASSWORD}@${STORAGE_HOST}:${STORAGE_PORT}/${STORAGE_DB}`,
+    connectionUrl: `postgres://${STORAGE_USERNAME}:${STORAGE_PASSWORD}@${STORAGE_HOST}:${STORAGE_PORT}/${STORAGE_DB}`,
     db: STORAGE_DB,
-    user: STORAGE_RETHINK_USER,
-    password: STORAGE_RETHINK_USER,
+    user: STORAGE_USERNAME,
+    password: STORAGE_PASSWORD,
     path: STORAGE_FILEPATH,
   },