Webionite
/
haste-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use same password and username env vars for all types

This commit is contained in:
emil-lengman 2020-08-22 21:56:58 +02:00
parent 05ecc90764
commit 342f56ce1a
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -23,10 +23,8 @@ ENV STORAGE_TYPE=memcached \
STORAGE_DB=2 \ STORAGE_DB=2 \
STORAGE_AWS_BUCKET= \ STORAGE_AWS_BUCKET= \
STORAGE_AWS_REGION= \ STORAGE_AWS_REGION= \
STORAGE_PG_PASSWORD= \ STORAGE_USENAMER= \
STORAGE_PG_USERNAME= \ STORAGE_PASSWORD= \
STORAGE_RETHINK_USER= \
STORAGE_RETHINK_PASSWORD= \
STORAGE_FILEPATH= STORAGE_FILEPATH=
ENV LOGGING_LEVEL=verbose \ ENV LOGGING_LEVEL=verbose \

6
docker-entrypoint.js
View File

@ -92,10 +92,10 @@ const config = {
expire: STORAGE_EXPIRE_SECONDS, expire: STORAGE_EXPIRE_SECONDS,
bucket: STORAGE_AWS_BUCKET, bucket: STORAGE_AWS_BUCKET,
region: STORAGE_AWS_REGION, 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, db: STORAGE_DB,
user: STORAGE_RETHINK_USER, user: STORAGE_USERNAME,
password: STORAGE_RETHINK_USER, password: STORAGE_PASSWORD,
path: STORAGE_FILEPATH, path: STORAGE_FILEPATH,
}, },