sambuc/hbp-sp8-mip-local
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix usage of variables for fixed values

Browse Source 
Some values which are fixed by the docker compose file should not be set
as variables, and hardcoded everywhere as required.

This also untangles the use of the variables DB_HOST and DB_PORT to be
only about the exposed hostname and port, whenever the DB engine is
exposed on the server interface.
This commit is contained in:
Lionel Sambuc
2018-02-22 16:57:22 +01:00
parent 3d77367002
commit b290512265
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
docker-compose.yml
View File

@@ -143,8 +143,8 @@ services:
db-ui:
image: ${DB_UI_IMAGE}${DB_UI_VERSION}
environment:
POSTGRES_HOST: ${DB_HOST}
POSTGRES_PORT: ${DB_PORT}
POSTGRES_HOST: db
POSTGRES_PORT: 5432
POSTGRES_USER: ${DB_USER_ADMIN}
POSTGRES_PASSWORD: ${DB_PASSWORD_ADMIN}
POSTGRES_DB: ${DB_NAME2}
@@ -201,18 +201,18 @@ services:
backend:
image: ${PORTAL_BACKEND_IMAGE}${PORTAL_BACKEND_VERSION}
environment:
PORTAL_DB_URL: jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME4}
PORTAL_DB_SERVER: ${DB_HOST}:${DB_PORT}
PORTAL_DB_URL: jdbc:postgresql://db:5432/${DB_NAME4}
PORTAL_DB_SERVER: db:5432
PORTAL_DB_USER: ${DB_USER4}
PORTAL_DB_PASSWORD: ${DB_PASSWORD4}
PORTAL_DB_SCHEMA: public # Stable Config
META_DB_URL: jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME1}
META_DB_SERVER: ${DB_HOST}:${DB_PORT}
META_DB_URL: jdbc:postgresql://db:5432/${DB_NAME1}
META_DB_SERVER: db:5432
META_DB_USER: ${DB_USER1}
META_DB_PASSWORD: ${DB_PASSWORD1}
META_DB_SCHEMA: public # Stable Config
FEATURES_DB_URL: jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME2}
FEATURES_DB_SERVER: ${DB_HOST}:${DB_PORT}
FEATURES_DB_URL: jdbc:postgresql://db:5432/${DB_NAME2}
FEATURES_DB_SERVER: db:5432
FEATURES_DB_USER: ${DB_USER2}
FEATURES_DB_PASSWORD: ${DB_PASSWORD2}
FEATURES_DB_SCHEMA: public # Stable Config