Skip to content

armgit / core

Public Imported from GitHub
0

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

Updates for memory usage of containers.

Michael Rademaker76cf58d4b501
diff --git a/gradle.properties b/gradle.properties
index 769cf998e..1891e6026 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@ undertowVersion = 1.4.12.Final
resteasyVersion = 3.0.24.Final
resteasyVersionAsyncHttpServlet = 3.0.19.Final
jbossLoggingAnnotationsVersion = 2.0.2.Final
-keycloakVersion = 6.0.1
+keycloakVersion = 7.0.1
gwtVersion = 2.8.2
ginVersion = 2.1.2
elementoCoreVersion = 0.7.0
@@ -50,4 +50,4 @@ geotoolsVersion = 19.1
firebaseAdminVersion = 6.1.0
simpleJavaMailVersion = 5.0.4
jaywayJsonPathVersion = 2.4.0
-typescriptGeneratorVersion = 2.13.489
\ No newline at end of file
+typescriptGeneratorVersion = 2.13.489
diff --git a/manager/Dockerfile b/manager/Dockerfile
index 0c589303b..b37b355e5 100644
--- a/manager/Dockerfile
+++ b/manager/Dockerfile
@@ -11,7 +11,7 @@ ENV JAVA_HOME /etc/alternatives/java
ARG GIT_COMMIT=unknown
LABEL git-commit=$GIT_COMMIT
-ENV JAVA_OPTS -Xmx1g
+ENV JAVA_OPTS=${JAVA_OPTS:-Xmx1g}
ENV APP_DOCROOT /deployment/manager/app
ENV SHARED_DOCROOT /deployment/manager/shared
@@ -31,4 +31,4 @@ RUN mkdir -p /deployment/manager/extensions
ADD lib /opt/app/lib
-ENTRYPOINT java $JAVA_OPTS -cp /opt/app/lib/*:/deployment/manager/extensions/* org.openremote.manager.Main
\ No newline at end of file
+ENTRYPOINT java $JAVA_OPTS -cp /opt/app/lib/*:/deployment/manager/extensions/* org.openremote.manager.Main
diff --git a/profile/deploy.yml b/profile/deploy.yml
index 477105668..9c9462c0b 100644
--- a/profile/deploy.yml
+++ b/profile/deploy.yml
@@ -236,16 +236,12 @@ services:
# DATA_POINTS_MAX_AGE_DAYS = 30
# Custom JVM options (increase heap size if required)
- JAVA_OPTS: '-Xms400m -Xmx400m
- -XX:CompressedClassSpaceSize=25m -XX:MaxMetaspaceSize=150m
- -XX:InitialCodeCacheSize=50m -XX:ReservedCodeCacheSize=50m
- -XX:MaxDirectMemorySize=25m
- -XX:NativeMemoryTracking=summary
+ JAVA_OPTS: '-XX:NativeMemoryTracking=summary
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/javadump.core.hprof'
# Resource limits
- mem_limit: 800m
- memswap_limit: 800m
+ mem_limit: 512m
+ memswap_limit: 512m
# Configure logging of the container, see deployment/logging.properties
logging:
@@ -289,17 +285,13 @@ services:
KEYCLOAK_PASSWORD: ${SETUP_ADMIN_PASSWORD:-secret}
# Custom JVM options (increase heap size if required)
- JAVA_OPTS: '-Xms300m -Xmx300m
- -XX:CompressedClassSpaceSize=25m -XX:MaxMetaspaceSize=200m
- -XX:InitialCodeCacheSize=50m -XX:ReservedCodeCacheSize=50m
- -XX:MaxDirectMemorySize=25m
- -XX:NativeMemoryTracking=summary
+ JAVA_OPTS: '-XX:NativeMemoryTracking=summary
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/javadump.core.hprof
-Djava.net.preferIPv4Stack=true -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.awt.headless=true'
# Resource limits
- mem_limit: 700m
- memswap_limit: 700m
+ mem_limit: 512m
+ memswap_limit: 512m
# Configure logging of the container
logging:
@@ -354,4 +346,3 @@ services:
context: '../manager/build/install/manager'
dockerfile: swarm.Dockerfile
image: openremote/manager-swarm:${DATE_TAG:-latest}
-
\ No newline at end of file