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

Fix the semantics of PORTAL_FRONTEND_URL

Browse Source 
As previously defined, it causes problems as to locally override, one
had also to override the PORTAL_FRONTEND_PORT1 value.

So change the semantic to be only about the base URL, and compose the
whole URL when it is used in the docker-compose file.
This commit is contained in:
Lionel Sambuc
2018-02-22 17:00:26 +01:00
parent b290512265
commit 8c096b2bf7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose.yml
View File

@@ -224,9 +224,9 @@ services:
TOKEN_URI: https://services.humanbrainproject.eu/oidc/token
AUTH_URI: https://services.humanbrainproject.eu/oidc/authorize
USER_INFO_URI: https://services.humanbrainproject.eu/oidc/userinfo
FRONTEND_LOGIN_URL: ${PORTAL_FRONTEND_URL}/services/login/hbp
FRONTEND_AFTER_LOGIN_URL: ${PORTAL_FRONTEND_URL}/home
FRONTEND_AFTER_LOGOUT_URL: ${PORTAL_FRONTEND_URL}/services/login/hbp
FRONTEND_LOGIN_URL: ${PORTAL_FRONTEND_URL}:${PORTAL_FRONTEND_PORT1}/services/login/hbp
FRONTEND_AFTER_LOGIN_URL: ${PORTAL_FRONTEND_URL}:${PORTAL_FRONTEND_PORT1}/home
FRONTEND_AFTER_LOGOUT_URL: ${PORTAL_FRONTEND_URL}:${PORTAL_FRONTEND_PORT1}/services/login/hbp
WOKEN_HOST: ${WOKEN_HOST}
WOKEN_PORT: ${WOKEN_PORT2}
WOKEN_AKKA_PATH: /user/entrypoint

2
settings.default.sh
View File

@@ -145,4 +145,4 @@
: ${PORTAL_FRONTEND_VERSION:=":2.3.3"} # Stable Config
: ${PORTAL_FRONTEND_PORT1:="80"}
: ${PORTAL_FRONTEND_PORT2:="443"}
: ${PORTAL_FRONTEND_URL:="http://172.16.22.176:${PORTAL_FRONTEND_PORT1}"}
: ${PORTAL_FRONTEND_URL:="http://localhost"}