From f3ec20c26c68a5856b29aa9185963593a394dea4 Mon Sep 17 00:00:00 2001
From: lingniu <lingniu@lingnius-Mac-mini.local>
Date: Tue, 30 Jun 2026 08:57:03 +0800
Subject: [PATCH] fix: bound JVM memory in portainer deploy

---
 deploy/portainer/docker-compose.yml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/deploy/portainer/docker-compose.yml b/deploy/portainer/docker-compose.yml
index f5c98879..8ebfc1d1 100644
--- a/deploy/portainer/docker-compose.yml
+++ b/deploy/portainer/docker-compose.yml
@@ -4,7 +4,7 @@ version: "3.8"
 # main-0.1.0-SNAPSHOT-22468e7
 x-common-env: &common-env
   TZ: Asia/Shanghai
-  JAVA_OPTS: ${JAVA_OPTS:--XX:+UseZGC -XX:MaxRAMPercentage=75}
+  JAVA_OPTS: ${JAVA_OPTS:--Xms128m -Xmx768m -Duser.timezone=Asia/Shanghai}
   NACOS_CONFIG_ENABLED: ${NACOS_CONFIG_ENABLED:-true}
   NACOS_SERVER_ADDR: ${NACOS_SERVER_ADDR:-127.0.0.1:8848}
   NACOS_NAMESPACE: ${NACOS_NAMESPACE:-}
@@ -34,8 +34,11 @@ services:
     image: crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com/oneos/gb32960-ingest-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION}
     container_name: gb32960-ingest-app
     restart: unless-stopped
+    mem_limit: 1536m
+    memswap_limit: 1536m
     environment:
       <<: *common-env
+      JAVA_OPTS: ${JAVA_OPTS_GB32960:--Xms256m -Xmx768m -Duser.timezone=Asia/Shanghai}
       HTTP_PORT: 20100
       GB32960_PORT: 32960
       KAFKA_CONSUMER_ENABLED: "false"
@@ -60,8 +63,11 @@ services:
     image: crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com/oneos/jt808-ingest-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION}
     container_name: jt808-ingest-app
     restart: unless-stopped
+    mem_limit: 1536m
+    memswap_limit: 1536m
     environment:
       <<: *common-env
+      JAVA_OPTS: ${JAVA_OPTS_JT808:--Xms256m -Xmx768m -Duser.timezone=Asia/Shanghai}
       HTTP_PORT: 20482
       JT808_PORT: 808
       KAFKA_CONSUMER_ENABLED: "false"
@@ -87,8 +93,11 @@ services:
     image: crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com/oneos/yutong-mqtt-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION}
     container_name: yutong-mqtt-app
     restart: unless-stopped
+    mem_limit: 1536m
+    memswap_limit: 1536m
     environment:
       <<: *common-env
+      JAVA_OPTS: ${JAVA_OPTS_YUTONG_MQTT:--Xms256m -Xmx768m -Duser.timezone=Asia/Shanghai}
       HTTP_PORT: 20500
       KAFKA_CONSUMER_ENABLED: "false"
       KAFKA_NODE_ID: ${KAFKA_NODE_ID_YUTONG_MQTT:-yutong-mqtt-portainer}
@@ -126,8 +135,11 @@ services:
     image: crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com/oneos/xinda-push-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION}
     container_name: xinda-push-app
     restart: unless-stopped
+    mem_limit: 1536m
+    memswap_limit: 1536m
     environment:
       <<: *common-env
+      JAVA_OPTS: ${JAVA_OPTS_XINDA_PUSH:--Xms256m -Xmx768m -Duser.timezone=Asia/Shanghai}
       HTTP_PORT: 20600
       KAFKA_CONSUMER_ENABLED: "false"
       KAFKA_NODE_ID: ${KAFKA_NODE_ID_XINDA_PUSH:-xinda-push-portainer}
@@ -161,6 +173,8 @@ services:
     image: crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com/oneos/vehicle-history-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION}
     container_name: vehicle-history-app
     restart: unless-stopped
+    mem_limit: 2560m
+    memswap_limit: 2560m
     depends_on:
       - gb32960-ingest-app
       - jt808-ingest-app
@@ -168,6 +182,7 @@ services:
       - xinda-push-app
     environment:
       <<: *common-env
+      JAVA_OPTS: ${JAVA_OPTS_HISTORY:--Xms512m -Xmx1536m -Duser.timezone=Asia/Shanghai}
       HTTP_PORT: 20200
       KAFKA_CONSUMER_CLIENT_ID_PREFIX: ${KAFKA_CONSUMER_CLIENT_ID_PREFIX_HISTORY:-vehicle-history}
       KAFKA_GROUP_HISTORY: ${KAFKA_GROUP_HISTORY:-vehicle-history}
@@ -202,6 +217,8 @@ services:
     image: crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com/oneos/vehicle-analytics-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION}
     container_name: vehicle-analytics-app
     restart: unless-stopped
+    mem_limit: 1536m
+    memswap_limit: 1536m
     depends_on:
       - gb32960-ingest-app
       - jt808-ingest-app
@@ -209,6 +226,7 @@ services:
       - xinda-push-app
     environment:
       <<: *common-env
+      JAVA_OPTS: ${JAVA_OPTS_ANALYTICS:--Xms256m -Xmx768m -Duser.timezone=Asia/Shanghai}
       HTTP_PORT: 20300
       KAFKA_CONSUMER_CLIENT_ID_PREFIX: ${KAFKA_CONSUMER_CLIENT_ID_PREFIX_ANALYTICS:-vehicle-analytics}
       KAFKA_GROUP_STATE: ${KAFKA_GROUP_STATE:-vehicle-state}