From 74e465bf58b6ad64892ee3c6e5fb0518ad29f787 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Wed, 29 Jun 2022 15:17:53 +0300
Subject: [PATCH] docker-compose: JAVA_OPTS env added for each Java service

---
 docker/.env               |  5 ++++-
 docker/docker-compose.yml | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/docker/.env b/docker/.env
index 7bc1a7a6a4..f33ed50da5 100644
--- a/docker/.env
+++ b/docker/.env
@@ -25,4 +25,7 @@ DATABASE=postgres
 LOAD_BALANCER_NAME=haproxy-certbot
 
 # If enabled Prometheus and Grafana containers are deployed along with other containers
-MONITORING_ENABLED=false
\ No newline at end of file
+MONITORING_ENABLED=false
+
+# Limit memory usage for each Java application
+# JAVA_OPTS=-Xmx2048M -Xms2048M -Xss384k -XX:+AlwaysPreTouch
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 3e0f21391d..6ec410fcde 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -48,6 +48,7 @@ services:
       TB_SERVICE_ID: tb-core1
       TB_SERVICE_TYPE: tb-core
       EDGES_ENABLED: "true"
+      JAVA_OPTS: "${JAVA_OPTS}"
     env_file:
       - tb-node.env
     volumes:
@@ -73,6 +74,7 @@ services:
       TB_SERVICE_ID: tb-core2
       TB_SERVICE_TYPE: tb-core
       EDGES_ENABLED: "true"
+      JAVA_OPTS: "${JAVA_OPTS}"
     env_file:
       - tb-node.env
     volumes:
@@ -96,6 +98,7 @@ services:
     environment:
       TB_SERVICE_ID: tb-rule-engine1
       TB_SERVICE_TYPE: tb-rule-engine
+      JAVA_OPTS: "${JAVA_OPTS}"
     env_file:
       - tb-node.env
     volumes:
@@ -117,6 +120,7 @@ services:
     environment:
       TB_SERVICE_ID: tb-rule-engine2
       TB_SERVICE_TYPE: tb-rule-engine
+      JAVA_OPTS: "${JAVA_OPTS}"
     env_file:
       - tb-node.env
     volumes:
@@ -132,6 +136,7 @@ services:
       - "1883"
     environment:
       TB_SERVICE_ID: tb-mqtt-transport1
+      JAVA_OPTS: "${JAVA_OPTS}"
     env_file:
       - tb-mqtt-transport.env
     volumes:
@@ -148,6 +153,7 @@ services:
       - "1883"
     environment:
       TB_SERVICE_ID: tb-mqtt-transport2
+      JAVA_OPTS: "${JAVA_OPTS}"
     env_file:
       - tb-mqtt-transport.env
     volumes:
@@ -164,6 +170,7 @@ services:
       - "8081"
     environment:
       TB_SERVICE_ID: tb-http-transport1
+      JAVA_OPTS: "${JAVA_OPTS}"
     env_file:
       - tb-http-transport.env
     volumes:
@@ -180,6 +187,7 @@ services:
       - "8081"
     environment:
       TB_SERVICE_ID: tb-http-transport2
+      JAVA_OPTS: "${JAVA_OPTS}"
     env_file:
       - tb-http-transport.env
     volumes:
@@ -196,6 +204,7 @@ services:
       - "5683:5683/udp"
     environment:
       TB_SERVICE_ID: tb-coap-transport
+      JAVA_OPTS: "${JAVA_OPTS}"
     env_file:
       - tb-coap-transport.env
     volumes:
@@ -212,6 +221,7 @@ services:
       - "5685:5685/udp"
     environment:
       TB_SERVICE_ID: tb-lwm2m-transport
+      JAVA_OPTS: "${JAVA_OPTS}"
     env_file:
       - tb-lwm2m-transport.env
     volumes:
@@ -226,6 +236,7 @@ services:
     image: "${DOCKER_REPO}/${SNMP_TRANSPORT_DOCKER_NAME}:${TB_VERSION}"
     environment:
       TB_SERVICE_ID: tb-snmp-transport
+      JAVA_OPTS: "${JAVA_OPTS}"
     env_file:
       - tb-snmp-transport.env
     volumes:
@@ -256,6 +267,7 @@ services:
       - "8081"
     environment:
       TB_SERVICE_ID: tb-vc-executor1
+      JAVA_OPTS: "${JAVA_OPTS}"
     env_file:
       - tb-vc-executor.env
     volumes:
@@ -272,6 +284,7 @@ services:
       - "8081"
     environment:
       TB_SERVICE_ID: tb-vc-executor2
+      JAVA_OPTS: "${JAVA_OPTS}"
     env_file:
       - tb-vc-executor.env
     volumes: