Commit 342f56ce authored by emil-lengman's avatar emil-lengman
Browse files

use same password and username env vars for all types

parent 05ecc907

Dockerfile

+2 −4
Original line number Diff line number Diff line
@@ -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 \

docker-entrypoint.js

+3 −3
Original line number Diff line number Diff line
@@ -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,

  },