diff --git a/docker-compose-manager.yml b/docker-compose-manager.yml index 81c2ae5..826732e 100644 --- a/docker-compose-manager.yml +++ b/docker-compose-manager.yml @@ -54,6 +54,7 @@ services: - RAWPASSWORD=${LDSM_PASSWORD} - RAWHOST=${LDSM_HOST} - RAWPORT=${LDSM_PORT} + - RAWDB=${LDSM_DB} - RAWENDPOINT=${EXAREME_LDSM_ENDPOINT} - RAWRESULTS=${EXAREME_LDSM_RESULTS} - RAWDATAKEY=${EXAREME_LDSM_DATAKEY} diff --git a/docker-compose-worker.yml b/docker-compose-worker.yml index 6efde22..49823b5 100644 --- a/docker-compose-worker.yml +++ b/docker-compose-worker.yml @@ -33,6 +33,7 @@ services: - RAWPASSWORD=${LDSM_PASSWORD} - RAWHOST=${LDSM_HOST} - RAWPORT=${LDSM_PORT} + - RAWDB=${LDSM_DB} - RAWENDPOINT=${EXAREME_LDSM_ENDPOINT} - RAWRESULTS=${EXAREME_LDSM_RESULTS} - RAWDATAKEY=${EXAREME_LDSM_DATAKEY} diff --git a/settings.default.sh b/settings.default.sh index 30684cd..f133633 100644 --- a/settings.default.sh +++ b/settings.default.sh @@ -10,7 +10,7 @@ : ${CONSUL_IMAGE:="progrium/consul"} : ${CONSUL_VERSION:="latest"} : ${EXAREME_IMAGE:="hbpmip/exareme_dataset"} -: ${EXAREME_VERSION:="demo2"} +: ${EXAREME_VERSION:="postgresraw"} : ${EXAREME_ROLE:=""} # The default value is set to the federation node role (worker or manager) : ${EXAREME_KEYSTORE_PORT:="8500"} : ${EXAREME_KEYSTORE:="exareme-keystore:${EXAREME_KEYSTORE_PORT}"} @@ -24,6 +24,7 @@ : ${LDSM_USERNAME:="federation"} : ${LDSM_PASSWORD:="federation"} : ${LDSM_HOST:=""} # The default value is set to the federation node -: ${LDSM_PORT:="31555"} +: ${LDSM_PORT:="31432"} +: ${LDSM_DB:="ldsm"} : ${FEDERATION_NODE:=""} # Invalid default value, this a required argument of start.sh diff --git a/start.sh b/start.sh index bf0b434..e68920c 100755 --- a/start.sh +++ b/start.sh @@ -61,7 +61,7 @@ start_node() { # Export the settings to the docker-compose files export FEDERATION_NODE - export LDSM_USERNAME LDSM_PASSWORD LDSM_HOST LDSM_PORT + export LDSM_USERNAME LDSM_PASSWORD LDSM_HOST LDSM_PORT LDSM_DB export CONSUL_IMAGE CONSUL_VERSION export EXAREME_IMAGE EXAREME_VERSION