100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Minor config updates
Rich Turner68b4a94ac90d
diff --git a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.javaindex 6789d3feb..5fb6b7917 100644--- a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java+++ b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java@@ -312,7 +312,7 @@ public abstract class KeycloakIdentityProvider implements IdentityProvider {}}- public KeycloakDeployment getKeycloakDeployment(String realm, String clientId) {+ public synchronized KeycloakDeployment getKeycloakDeployment(String realm, String clientId) {try {return keycloakDeploymentCache.get(new KeycloakRealmClient(realm, clientId));} catch (Exception ex) {diff --git a/docker-compose.yml b/docker-compose.ymlindex 84d5e82f9..f51141651 100644--- a/docker-compose.yml+++ b/docker-compose.yml@@ -16,6 +16,7 @@ volumes:services:proxy:+ image: openremote/proxy:${DATE_TAG:-latest}extends:file: profile/deploy.ymlservice: proxy@@ -24,6 +25,7 @@ services:condition: service_healthymanager:+ image: openremote/manager:${DATE_TAG:-latest}extends:file: profile/deploy.ymlservice: manager@@ -32,6 +34,7 @@ services:condition: service_healthykeycloak:+ image: openremote/keycloak:${DATE_TAG:-latest}extends:file: profile/deploy.ymlservice: keycloakdiff --git a/postgresql/Dockerfile b/postgresql/Dockerfileindex 4cf924414..e4d38e196 100644--- a/postgresql/Dockerfile+++ b/postgresql/Dockerfile@@ -2,11 +2,11 @@FROM postgres:9.6.21ENV POSTGIS_MAJOR 2.3-ENV POSTGRES_DB ${POSTGRES_DB}-ENV POSTGRES_USER ${POSTGRES_USER}-ENV POSTGRES_PASSWORD ${POSTGRES_PASSWORD}-ENV TZ ${TZ}-ENV PGTZ ${PGTZ}+ENV TZ: ${TZ:-Europe/Amsterdam}+ENV PGTZ: ${PGTZ:-Europe/Amsterdam}+ENV POSTGRES_DB: ${POSTGRES_DB:-openremote}+ENV POSTGRES_USER: ${POSTGRES_USER:-postgres}+ENV POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}RUN apt-get update \&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \diff --git a/profile/deploy.yml b/profile/deploy.ymlindex 53f7082aa..1eeff7c0b 100644--- a/profile/deploy.yml+++ b/profile/deploy.yml@@ -295,7 +295,7 @@ services:# It is important that all services have the same timezone and are time synchronized.# Bearer tokens are only valid for minutes, and authentication fails if Keycloak drifts.TZ: ${TZ:-Europe/Amsterdam}- PGTZ: ${TZ:-Europe/Amsterdam}+ PGTZ: ${PGTZ:-Europe/Amsterdam}# Database settingsPOSTGRES_DB: ${DB_NAME:-openremote}