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
Added basic Balena deployment files (#1367)
Panos Kalogeropoulosead11aca6b8f
diff --git a/.gitignore b/.gitignoreindex af2a9d99e..1a7864818 100644--- a/.gitignore+++ b/.gitignore@@ -58,3 +58,4 @@ local.properties*.tsbuildinfo*~*.tar.gz+/balena/manager-build/diff --git a/balena/docker-compose.yml b/balena/docker-compose.ymlnew file mode 100755index 000000000..1a0ed96f0--- /dev/null+++ b/balena/docker-compose.yml@@ -0,0 +1,57 @@+version: '2.4'++volumes:+ proxy-data:+ postgresql-data:+ manager-data:++services:+ proxy:+ image: openremote/proxy:latest+ restart: always+ depends_on:+ manager:+ condition: service_started+ ports:+ - "80:80"+ - "443:443"+ - "8883:8883"+ volumes:+ - proxy-data:/deployment+ env_file:+ - env++ postgresql:+ image: openremote/postgresql:latest+ restart: always+ volumes:+ - postgresql-data:/var/lib/postgresql/data+ - manager-data:/storage+ env_file:+ - env++ keycloak:+ image: openremote/keycloak:latest+ restart: always+ depends_on:+ postgresql:+ condition: service_started+ env_file:+ - env++ manager:+ image: openremote-manager+ build:+ context: manager-build+ restart: always+ depends_on:+ keycloak:+ condition: service_started+ postgresql:+ condition: service_started+ ports:+ - "1883:1883"+ volumes:+ - manager-data:/storage+ env_file:+ - envdiff --git a/balena/env b/balena/envnew file mode 100644index 000000000..f099ba753--- /dev/null+++ b/balena/env@@ -0,0 +1,11 @@+KC_HOSTNAME=localhost+KC_HOSTNAME_STRICT=false+KEYCLOAK_ISSUER_BASE_URI=https://localhost/auth+OR_ADDITIONAL_HOSTNAMES=localhost+OR_HOSTNAME=localhost+OR_MAIN_THREAD_WAIT_MS=10+OR_SETUP_RUN_ON_RESTART=false+BALENA=1+OR_WEBSERVER_ALLOWED_ORIGINS=*+PROXY_LOGLEVEL=debug+WEBSERVER_LISTEN_HOST=0.0.0.0diff --git a/balena/manager.Dockerfile b/balena/manager.Dockerfilenew file mode 100644index 000000000..79125f9e1--- /dev/null+++ b/balena/manager.Dockerfile@@ -0,0 +1,82 @@+FROM registry.access.redhat.com/ubi8/openjdk-17-runtime++# Add git commit label must be specified at build time using --build-arg GIT_COMMIT=dadadadadad+ARG GIT_COMMIT=unknown++LABEL git-commit=$GIT_COMMIT++USER root+ENV JAVA_TOOL_OPTIONS ${JAVA_TOOL_OPTIONS}++ENV TZ ${TZ:-Europe/Amsterdam}+ENV OR_ADMIN_PASSWORD ${OR_ADMIN_PASSWORD:-secret}+ENV OR_SETUP_TYPE ${OR_SETUP_TYPE}+ENV OR_SSL_PORT ${OR_SSL_PORT:--1}+ENV OR_HOSTNAME ${OR_HOSTNAME:-localhost}+ENV OR_EMAIL_HOST ${OR_EMAIL_HOST}+ENV OR_EMAIL_USER ${OR_EMAIL_USER}+ENV OR_EMAIL_PASSWORD ${OR_EMAIL_PASSWORD}+ENV OR_EMAIL_PORT ${OR_EMAIL_PORT:-587}+ENV OR_EMAIL_TLS ${OR_EMAIL_TLS:-true}+ENV OR_EMAIL_PROTOCOL ${OR_EMAIL_PROTOCOL:-smtp}+ENV OR_EMAIL_FROM ${OR_EMAIL_FROM}+ENV OR_EMAIL_ADMIN ${OR_EMAIL_ADMIN}+ENV OR_EMAIL_X_HEADERS ${OR_EMAIL_X_HEADERS}+ENV OR_FIREBASE_CONFIG_FILE ${OR_FIREBASE_CONFIG_FILE:-/deployment/manager/fcm.json}+ENV OR_DEV_MODE ${OR_DEV_MODE:-false}+ENV OR_SETUP_RUN_ON_RESTART ${OR_SETUP_RUN_ON_RESTART:-false}+ENV OR_WEBSERVER_LISTEN_HOST ${OR_WEBSERVER_LISTEN_HOST:-0.0.0.0}+ENV OR_DB_VENDOR ${OR_DB_VENDOR:-postgres}+ENV OR_DB_HOST ${OR_DB_HOST:-postgresql}+ENV OR_DB_PORT ${OR_DB_PORT:-5432}+ENV OR_DB_NAME ${OR_DB_NAME:-openremote}+ENV OR_DB_SCHEMA ${OR_DB_SCHEMA:-openremote}+ENV OR_DB_USER ${OR_DB_USER:-postgres}+ENV OR_DB_PASSWORD ${OR_DB_PASSWORD:-postgres}+ENV OR_DB_MIN_POOL_SIZE ${OR_DB_MIN_POOL_SIZE:-5}+ENV OR_DB_MAX_POOL_SIZE ${OR_DB_MAX_POOL_SIZE:-20}+ENV OR_DB_CONNECTION_TIMEOUT_SECONDS ${OR_DB_CONNECTION_TIMEOUT_SECONDS:-300}+ENV OR_DB_FLYWAY_OUT_OF_ORDER ${OR_DB_FLYWAY_OUT_OF_ORDER}+ENV OR_KEYCLOAK_HOST ${OR_KEYCLOAK_HOST:-keycloak}+ENV OR_KEYCLOAK_PORT ${OR_KEYCLOAK_PORT:-8080}+ENV OR_KEYCLOAK_GRANT_FILE ${OR_KEYCLOAK_GRANT_FILE:-/deployment/manager/keycloak.json}+ENV OR_APP_DOCROOT ${OR_APP_DOCROOT:-/opt/web}+ENV OR_CUSTOM_APP_DOCROOT ${OR_CUSTOM_APP_DOCROOT:-/deployment/manager/app}+ENV OR_PROVISIONING_DOCROOT ${OR_PROVISIONING_DOCROOT:-/deployment/manager/provisioning}+ENV OR_ROOT_REDIRECT_PATH ${OR_ROOT_REDIRECT_PATH:-/manager}+ENV OR_LOGGING_CONFIG_FILE ${OR_LOGGING_CONFIG_FILE}+ENV OR_MAP_TILES_PATH ${OR_MAP_TILES_PATH:-/deployment.local/mapdata/mapdata.mbtiles}+ENV OR_MAP_SETTINGS_PATH ${OR_MAP_SETTINGS_PATH:-/deployment/map/mapsettings.json}+ENV OR_MAP_TILESERVER_HOST ${OR_MAP_TILESERVER_HOST}+ENV OR_MAP_TILESERVER_PORT ${OR_MAP_TILESERVER_PORT:-8082}+ENV OR_MAP_TILESERVER_REQUEST_TIMEOUT ${OR_MAP_TILESERVER_REQUEST_TIMEOUT:-10000}+ENV OR_SCHEDULED_TASKS_THREADS_MAX ${OR_SCHEDULED_TASKS_THREADS_MAX:-4}+ENV OR_RULE_EVENT_EXPIRES ${OR_RULE_EVENT_EXPIRES:-PT1H}+ENV OR_IDENTITY_PROVIDER ${OR_IDENTITY_PROVIDER:-keycloak}+ENV OR_IDENTITY_SESSION_MAX_MINUTES ${OR_IDENTITY_SESSION_MAX_MINUTES:-1440}+ENV OR_IDENTITY_SESSION_OFFLINE_TIMEOUT_MINUTES ${OR_IDENTITY_SESSION_OFFLINE_TIMEOUT_MINUTES:-2628000}+ENV OR_ATTRIBUTE_EVENT_THREADS ${OR_ATTRIBUTE_EVENT_THREADS}+ENV OR_STORAGE_DIR ${OR_STORAGE_DIR:-/storage}+ENV OR_GATEWAY_TUNNEL_LOCALHOST_REWRITE ${OR_GATEWAY_TUNNEL_LOCALHOST_REWRITE:-172.17.0.1}+ENV OR_JAVA_OPTS ${OR_JAVA_OPTS:--Xms500m -Xmx2g \+ -XX:NativeMemoryTracking=summary \+ -Xlog:all=warning:stdout:uptime,level,tags \+ -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/dump.hprof}++# OpenMetrics _created series breaks cloudwatch prometheus scraper+ENV PROMETHEUS_DISABLE_CREATED_SERIES ${PROMETHEUS_DISABLE_CREATED_SERIES:-true}++RUN mkdir -p /deployment/manager/extensions++WORKDIR /opt/app+ADD ./balena-deployment/image /deployment++ADD ./manager-build/lib /opt/app/lib+ADD ./manager-build/web /opt/web+ADD ./manager-build/map /opt/map++EXPOSE 8080+EXPOSE 1883++HEALTHCHECK --interval=3s --timeout=60s --start-period=30s --retries=120 CMD curl --fail --silent http://localhost:8080 || exit 1+ENTRYPOINT java $OR_JAVA_OPTS -cp /opt/app/lib/*:/deployment/manager/extensions/* org.openremote.manager.Maindiff --git a/balena/run_balena_build.sh b/balena/run_balena_build.shnew file mode 100755index 000000000..267eed0e3--- /dev/null+++ b/balena/run_balena_build.sh@@ -0,0 +1,55 @@+#!/bin/bash++# Initialize variables+DRY_RUN=false+SKIP_BUILD=false+BALENA_FLEET_SLUG=""++# Parse arguments+for arg in "$@"+do+ case $arg in+ --dry-run)+ DRY_RUN=true+ ;;+ --skip-build)+ SKIP_BUILD=true+ ;;+ *)+ BALENA_FLEET_SLUG="$arg"+ ;;+ esac+done++# Ensure BALENA_FLEET_SLUG is set+if [ -z "$BALENA_FLEET_SLUG" ]; then+ echo "Usage: $0 [--dry-run] [--skip-build] <balena_fleet_slug>"+ exit 1+fi++# Login to balena+balena login++# Remove existing manager-build directory if skip-build is not enabled+if [ "$SKIP_BUILD" = false ]; then+ rm -rf ./manager-build++ # Go to the parent directory, run clean installDist+ cd ..+ ./gradlew clean installDist++ # Return to the balena directory+ cd balena+fi++# Copy new builds if manager-build directory does not exist+if [ ! -d "./manager-build" ]; then+ cp -r ../manager/build/install/manager ./manager-build+fi++# Push to balena with no cache or run docker-compose up if dry-run+if [ "$DRY_RUN" = true ]; then+ docker compose build --no-cache && docker-compose -f ./docker-compose.yml -p openremote up --force-recreate -d+else+ balena push "$BALENA_FLEET_SLUG" --nocache+fidiff --git a/manager/src/main/java/org/openremote/manager/setup/KeycloakInitService.java b/manager/src/main/java/org/openremote/manager/setup/KeycloakInitService.javaindex 84d637ca1..128696955 100644--- a/manager/src/main/java/org/openremote/manager/setup/KeycloakInitService.java+++ b/manager/src/main/java/org/openremote/manager/setup/KeycloakInitService.java@@ -25,6 +25,7 @@ import jakarta.ws.rs.core.UriBuilder;import org.jboss.resteasy.client.jaxrs.ResteasyClient;import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl;+import org.openremote.container.persistence.PersistenceService;import org.openremote.container.security.keycloak.KeycloakResource;import org.openremote.container.web.WebClient;import org.openremote.container.web.WebTargetBuilder;@@ -52,6 +53,8 @@ public class KeycloakInitService implements ContainerService {private static final Logger LOG = Logger.getLogger(KeycloakInitService.class.getName());+ private static final int PRIORITY = PersistenceService.PRIORITY - 10;+@Overridepublic void init(Container container) throws Exception {String identityProviderType = getString(container.getConfig(), OR_IDENTITY_PROVIDER, OR_IDENTITY_PROVIDER_DEFAULT);@@ -75,7 +78,7 @@ public class KeycloakInitService implements ContainerService {@Overridepublic int getPriority() {- return HIGH_PRIORITY - 100;+ return PRIORITY;}public static void waitForKeycloak(Container container) {@@ -115,6 +118,7 @@ public class KeycloakInitService implements ContainerService {try {pingKeycloak(keycloakResource);keycloakAvailable = true;+ LOG.info("Successfully connected to Keycloak server: " + keycloakServiceUri.build());} catch (Exception ex) {LOG.info("Keycloak server not available, waiting...");try {