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

Some more adaptation on DB_HOST and DB_PORT usage

Browse Source 
When the DB is exposed, you actually have to go through the exposed
port, as the internal network port is not available anymore.
This commit is contained in:
Lionel Sambuc
2018-03-20 16:54:20 +01:00
parent 00362dd9b3
commit 3e79e99f03
3 changed files with 21 additions and 19 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: db-ui:
image: ${DB_UI_IMAGE}${DB_UI_VERSION} image: ${DB_UI_IMAGE}${DB_UI_VERSION}
environment: environment:
POSTGRES_HOST: db POSTGRES_HOST: ${DB_HOST}
POSTGRES_PORT: 5432 POSTGRES_PORT: ${DB_PORT}
POSTGRES_USER: ${DB_USER_ADMIN} POSTGRES_USER: ${DB_USER_ADMIN}
POSTGRES_PASSWORD: ${DB_PASSWORD_ADMIN} POSTGRES_PASSWORD: ${DB_PASSWORD_ADMIN}
POSTGRES_DB: ${DB_NAME2} POSTGRES_DB: ${DB_NAME2}
@@ -203,18 +203,18 @@ services:
backend: backend:
image: ${PORTAL_BACKEND_IMAGE}${PORTAL_BACKEND_VERSION} image: ${PORTAL_BACKEND_IMAGE}${PORTAL_BACKEND_VERSION}
environment: environment:
PORTAL_DB_URL: jdbc:postgresql://db:5432/${DB_NAME4} PORTAL_DB_URL: jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME4}
PORTAL_DB_SERVER: db:5432 PORTAL_DB_SERVER: ${DB_HOST}:${DB_PORT}
PORTAL_DB_USER: ${DB_USER4} PORTAL_DB_USER: ${DB_USER4}
PORTAL_DB_PASSWORD: ${DB_PASSWORD4} PORTAL_DB_PASSWORD: ${DB_PASSWORD4}
PORTAL_DB_SCHEMA: public # Stable Config PORTAL_DB_SCHEMA: public # Stable Config
META_DB_URL: jdbc:postgresql://db:5432/${DB_NAME1} META_DB_URL: jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME1}
META_DB_SERVER: db:5432 META_DB_SERVER: ${DB_HOST}:${DB_PORT}
META_DB_USER: ${DB_USER1} META_DB_USER: ${DB_USER1}
META_DB_PASSWORD: ${DB_PASSWORD1} META_DB_PASSWORD: ${DB_PASSWORD1}
META_DB_SCHEMA: public # Stable Config META_DB_SCHEMA: public # Stable Config
FEATURES_DB_URL: jdbc:postgresql://db:5432/${DB_NAME2} FEATURES_DB_URL: jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME2}
FEATURES_DB_SERVER: db:5432 FEATURES_DB_SERVER: ${DB_HOST}:${DB_PORT}
FEATURES_DB_USER: ${DB_USER2} FEATURES_DB_USER: ${DB_USER2}
FEATURES_DB_PASSWORD: ${DB_PASSWORD2} FEATURES_DB_PASSWORD: ${DB_PASSWORD2}
FEATURES_DB_SCHEMA: public # Stable Config FEATURES_DB_SCHEMA: public # Stable Config

6
settings.default.sh
View File

@@ -15,8 +15,10 @@
# Service Parameters # Service Parameters
: ${DB_IMAGE:="hbpmip/postgresraw"} : ${DB_IMAGE:="hbpmip/postgresraw"}
: ${DB_VERSION:=":v1.3"} : ${DB_VERSION:=":v1.3"}
: ${DB_HOST:="db-published"} # External hostname, if exposed # If you want to expose the DB, you have to adapt the values below, as well
: ${DB_PORT:="31432"} # External port, if exposed # as uncomment the port section in the docker-compose.yml file.
: ${DB_HOST:="db"} # Internal hostname, if NOT exposed, defined in docker-compose.yml
: ${DB_PORT:="5432"} # Internal port, if NOT exposed, default PostgreSQL port
: ${DB_DATA:="${PWD}/postgres"} : ${DB_DATA:="${PWD}/postgres"}
: ${DB_DATASETS:="${PWD}/datasets"} : ${DB_DATASETS:="${PWD}/datasets"}
: ${DB_USER_ADMIN:="postgres"} : ${DB_USER_ADMIN:="postgres"}

18
woken/application.conf.in
View File

@@ -104,12 +104,12 @@ db {
woken { woken {
jdbc_driver = "org.postgresql.Driver" jdbc_driver = "org.postgresql.Driver"
jdbc_jar_path = "/usr/lib/R/libraries/postgresql-9.4-1201.jdbc41.jar" jdbc_jar_path = "/usr/lib/R/libraries/postgresql-9.4-1201.jdbc41.jar"
jdbc_url = "jdbc:postgresql://db:5432/DB_NAME3" jdbc_url = "jdbc:postgresql://DB_HOST:DB_PORT/DB_NAME3"
jdbc_user = "DB_USER3" jdbc_user = "DB_USER3"
jdbc_password = "DB_PASSWORD3" jdbc_password = "DB_PASSWORD3"
host = "db" host = "DB_HOST"
port = 5432 port = DB_PORT
user = "DB_USER3" user = "DB_USER3"
password = "DB_PASSWORD3" password = "DB_PASSWORD3"
} }
@@ -117,12 +117,12 @@ db {
features { features {
jdbc_driver = "org.postgresql.Driver" jdbc_driver = "org.postgresql.Driver"
jdbc_jar_path = "/usr/lib/R/libraries/postgresql-9.4-1201.jdbc41.jar" jdbc_jar_path = "/usr/lib/R/libraries/postgresql-9.4-1201.jdbc41.jar"
jdbc_url = "jdbc:postgresql://db:5432/DB_NAME2" jdbc_url = "jdbc:postgresql://DB_HOST:DB_PORT/DB_NAME2"
jdbc_user = "DB_USER2" jdbc_user = "DB_USER2"
jdbc_password = "DB_PASSWORD2" jdbc_password = "DB_PASSWORD2"
host = "db" host = "DB_HOST"
port = 5432 port = DB_PORT
user = "DB_USER2" user = "DB_USER2"
password = "DB_PASSWORD2" password = "DB_PASSWORD2"
} }
@@ -130,12 +130,12 @@ db {
metadata { metadata {
jdbc_driver = "org.postgresql.Driver" jdbc_driver = "org.postgresql.Driver"
jdbc_jar_path = "postgresql-9.4-1201.jdbc41.jar" jdbc_jar_path = "postgresql-9.4-1201.jdbc41.jar"
jdbc_url = "jdbc:postgresql://db:5432/DB_NAME1" jdbc_url = "jdbc:postgresql://DB_HOST:DB_PORT/DB_NAME1"
jdbc_user = "DB_USER1" jdbc_user = "DB_USER1"
jdbc_password = "DB_PASSWORD1" jdbc_password = "DB_PASSWORD1"
host = "db" host = "DB_HOST"
port = 5432 port = DB_PORT
user = "DB_USER1" user = "DB_USER1"
password = "DB_PASSWORD1" password = "DB_PASSWORD1"
} }