Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Removed OR_SSL_PORT from KEYCLOAK_FRONTEND_URL in docker compose files (doesn't work when using default port 443)

Rich Turner3d3215f5bb32
diff --git a/docker-compose.yml b/docker-compose.yml
index 29208c152..0c2d19233 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,7 +57,9 @@ services:
- ./deployment:/deployment
environment:
KEYCLOAK_PASSWORD: ${OR_ADMIN_PASSWORD:-secret}
- KEYCLOAK_FRONTEND_URL: https://${OR_HOST:-localhost}:${OR_SSL_PORT:-443}/auth
+ KEYCLOAK_FRONTEND_URL: https://${OR_HOST:-localhost}/auth
+ # Use the following if OR_SSL_PORT is not the default 443
+ #KEYCLOAK_FRONTEND_URL: https://${OR_HOST:-localhost}:${OR_SSL_PORT:-443}/auth
manager:
# privileged: true
diff --git a/profile/deploy.yml b/profile/deploy.yml
index ebae328be..c7486c983 100644
--- a/profile/deploy.yml
+++ b/profile/deploy.yml
@@ -307,7 +307,9 @@ services:
KEYCLOAK_USER: ${KEYCLOAK_USER:-admin}
KEYCLOAK_PASSWORD: ${OR_ADMIN_PASSWORD:-secret}
PROXY_ADDRESS_FORWARDING: ${PROXY_ADDRESS_FORWARDING:-true}
- KEYCLOAK_FRONTEND_URL: https://${OR_HOST:-localhost}:${OR_SSL_PORT:-443}/auth
+ KEYCLOAK_FRONTEND_URL: https://${OR_HOST:-localhost}/auth
+ # Use the following if OR_SSL_PORT is not the default 443
+ #KEYCLOAK_FRONTEND_URL: https://${OR_HOST:-localhost}:${OR_SSL_PORT:-443}/auth
# Custom JVM options (increase heap size if required)
JAVA_OPTS: ${KEYCLOAK_JAVA_OPTS:--XX:CompressedClassSpaceSize=50m -XX:MaxMetaspaceSize=250m
diff --git a/profile/dev-proxy.yml b/profile/dev-proxy.yml
index 1591258cc..c1de04e75 100644
--- a/profile/dev-proxy.yml
+++ b/profile/dev-proxy.yml
@@ -42,7 +42,9 @@ services:
condition: service_healthy
environment:
# Use manager dev mode reverse proxy to access keycloak so manager and keycloak hosts match
- KEYCLOAK_FRONTEND_URL: https://${OR_HOST:-localhost}:${OR_SSL_PORT:-443}/auth
+ KEYCLOAK_FRONTEND_URL: https://${OR_HOST:-localhost}/auth
+ # Use the following if OR_SSL_PORT is not the default 443
+ #KEYCLOAK_FRONTEND_URL: https://${OR_HOST:-localhost}:${OR_SSL_PORT:-443}/auth
postgresql:
extends: