Skip to content

armgit / core

Public Imported from GitHub
0

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

Updated manager docker image base image and updated service versions in docker compose profiles

Rich Turneref7e18223639
diff --git a/docker-compose.yml b/docker-compose.yml
index ee96f2c11..d0d0bd048 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ volumes:
services:
proxy:
- image: openremote/proxy:${PROXY_VERSION:-2.1.2.4}
+ image: openremote/proxy:${PROXY_VERSION:-2.5.0.1}
restart: always
depends_on:
manager:
@@ -30,14 +30,14 @@ services:
postgresql:
restart: always
- image: openremote/postgresql:${POSTGRESQL_VERSION:-9.6.21.0}
+ image: openremote/postgresql:${POSTGRESQL_VERSION:-14.1.0.0}
volumes:
- postgresql-data:/var/lib/postgresql/data
- temp-data:/tmp
keycloak:
restart: always
- image: openremote/keycloak:${KEYCLOAK_VERSION:-13.0.1.3}
+ image: openremote/keycloak:${KEYCLOAK_VERSION:-16.0.0.0}
depends_on:
postgresql:
condition: service_healthy
diff --git a/manager/Dockerfile b/manager/Dockerfile
index 6e4e86330..68abb3dee 100644
--- a/manager/Dockerfile
+++ b/manager/Dockerfile
@@ -1,24 +1,4 @@
-FROM adoptopenjdk/openjdk8:ubi-minimal-jre-nightly
-
-### S6 installation
-ENV S6_OVERLAY_VERSION=v2.2.0.3
-
-RUN apkArch="$(uname -m)"; \
- case "${apkArch}" in \
- x86_64) s6Arch='amd64'; ;; \
- armv7) s6Arch='arm'; ;; \
- armv7l) s6Arch='arm'; ;; \
- armhf) s6Arch='armhf'; ;; \
- aarch64) s6Arch='aarch64'; ;; \
- ppc64le) s6Arch='ppc64le'; ;; \
- *) echo >&2 "Error: unsupported architecture ${apkArch}"; exit 1 ;; \
- esac; \
- curl -LfsSo /tmp/s6-overlay.tar.gz https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${s6Arch}.tar.gz;
-
-RUN tar xzf /tmp/s6-overlay.tar.gz -C / --exclude="./bin" && \
- tar xzf /tmp/s6-overlay.tar.gz -C /usr ./bin
-### End S6 installation
-
+FROM registry.access.redhat.com/ubi8/openjdk-11-runtime
# Add git commit label must be specified at build time using --build-arg GIT_COMMIT=dadadadadad
ARG GIT_COMMIT=unknown
@@ -78,19 +58,13 @@ ENV MANAGER_JAVA_OPTS ${MANAGER_JAVA_OPTS:--Xms400m -Xmx400m \
-XX:MaxDirectMemorySize=25m -XX:NativeMemoryTracking=summary \
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/javadump.core.hprof}
-EXPOSE 8080
-
-HEALTHCHECK --interval=3s --timeout=3s --start-period=30s --retries=120 CMD curl --fail --silent http://localhost:8080 || exit 1
-
-RUN mkdir -p /opt/app
-RUN mkdir -p /deployment/manager/extensions
-RUN mkdir -p /zwave
-
WORKDIR /opt/app
ADD lib /opt/app/lib
ADD web /opt/web
ADD map /opt/map
-ENTRYPOINT ["/init"]
-CMD java $MANAGER_JAVA_OPTS -cp /opt/app/lib/*:/deployment/manager/extensions/* org.openremote.manager.Main
+EXPOSE 8080
+
+HEALTHCHECK --interval=3s --timeout=3s --start-period=30s --retries=120 CMD curl --fail --silent http://localhost:8080 || exit 1
+ENTRYPOINT java $MANAGER_JAVA_OPTS -cp /opt/app/lib/*:/deployment/manager/extensions/* org.openremote.manager.Main
diff --git a/mvp/mvp-docker-compose-awslogs.yml b/mvp/mvp-docker-compose-awslogs.yml
index a8f27031e..53dec8ff4 100644
--- a/mvp/mvp-docker-compose-awslogs.yml
+++ b/mvp/mvp-docker-compose-awslogs.yml
@@ -37,7 +37,7 @@ x-app: &awslogs
services:
proxy:
- image: openremote/proxy:${PROXY_VERSION:-2.1.2.4}
+ image: openremote/proxy:${PROXY_VERSION:-2.5.0.1}
networks:
- public
- private
@@ -104,7 +104,7 @@ services:
<<: *awslogs
keycloak:
- image: openremote/keycloak:${KEYCLOAK_VERSION:-13.0.1.3}
+ image: openremote/keycloak:${KEYCLOAK_VERSION:-16.0.0.0}
networks:
- public
- private
@@ -130,7 +130,7 @@ services:
<<: *awslogs
postgresql:
- image: openremote/postgresql:${POSTGRESQL_VERSION:-9.6.21.0}
+ image: openremote/postgresql:${POSTGRESQL_VERSION:-14.1.0.0}
networks:
- private
healthcheck:
diff --git a/mvp/mvp-docker-compose.yml b/mvp/mvp-docker-compose.yml
index e22a330df..5b9eac56d 100644
--- a/mvp/mvp-docker-compose.yml
+++ b/mvp/mvp-docker-compose.yml
@@ -29,7 +29,7 @@ volumes:
services:
proxy:
- image: openremote/proxy:${PROXY_VERSION:-2.1.2.4}
+ image: openremote/proxy:${PROXY_VERSION:-2.5.0.1}
networks:
- public
- private
@@ -94,7 +94,7 @@ services:
SETUP_EMAIL_FROM_DEFAULT: admin@${DOMAINNAME}
keycloak:
- image: openremote/keycloak:${KEYCLOAK_VERSION:-13.0.1.3}
+ image: openremote/keycloak:${KEYCLOAK_VERSION:-16.0.0.0}
networks:
- public
- private
@@ -119,7 +119,7 @@ services:
KEYCLOAK_FRONTEND_URL: ${EXTERNAL_URL:-https://localhost}/auth
postgresql:
- image: openremote/postgresql:${POSTGRESQL_VERSION:-9.6.21.0}
+ image: openremote/postgresql:${POSTGRESQL_VERSION:-14.1.0.0}
networks:
- private
healthcheck:
diff --git a/package.json b/package.json
index 2fb33a98b..62833b410 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,5 @@
],
"devDependencies": {
"lerna": "^4.0.0"
- },
- "dependencies": {
- "parse-link-header": "2.0.0"
}
}
diff --git a/profile/deploy.yml b/profile/deploy.yml
index bfdf5d4df..73d5931f1 100644
--- a/profile/deploy.yml
+++ b/profile/deploy.yml
@@ -34,7 +34,7 @@ services:
# map a Docker volume or host directory to access/store proxy configuration files
# and SSL certificates.
proxy:
- image: openremote/proxy:${PROXY_VERSION:-2.1.2.4}
+ image: openremote/proxy:${PROXY_VERSION:-2.5.0.1}
restart: always
# Override the haproxy.cfg with custom file
#volumes:
@@ -265,7 +265,7 @@ services:
# Keycloak identity provider
keycloak:
- image: openremote/keycloak:${KEYCLOAK_VERSION:-13.0.1.3}
+ image: openremote/keycloak:${KEYCLOAK_VERSION:-16.0.0.0}
restart: always
# Map any custom themes into the /deployment/keycloak/themes dir:
#volumes:
@@ -308,7 +308,7 @@ services:
# PostgreSQL DBMS
postgresql:
- image: openremote/postgresql:${POSTGRESQL_VERSION:-9.6.21.0}
+ image: openremote/postgresql:${POSTGRESQL_VERSION:-14.1.0.0}
restart: always
# Docker volume for persistent storage of DB; can alternatively map to host
volumes: