Merge pull request #222 from jumpserver/dev

feat: 添加 receptor 组件
jumpserver · Apr 19, 2024 · 55c96a5 · 55c96a5
2 parents 95e70ac + 66a1617
commit 55c96a5
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 6 deletions.
diff --git a/allinone/supervisord.conf b/allinone/supervisord.conf
@@ -3,7 +3,7 @@ nodaemon=true
 
 [program:core]
 priority=1
-environment=PATH="/opt/py3/bin:%(ENV_PATH)s", LANG=zh_CN.UTF-8
+environment=PATH="/opt/py3/bin:%(ENV_PATH)s",LANG=en_US.UTF-8
 directory=/opt/jumpserver/
 command=/opt/jumpserver/jms start
 stdout_logfile=/dev/stdout
@@ -12,9 +12,20 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 autorestart=true
 
+[program:receptor]
+priority=10
+environment=PATH="/opt/py3/bin:%(ENV_PATH)s",LANG=en_US.UTF-8
+directory=/opt/jumpserver/
+command=python receptor start
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+
 [program:koko]
 priority=100
-environment=LANG=zh_CN.UTF-8
+environment=LANG=en_US.UTF-8
 directory=/opt/koko/
 command=/opt/koko/koko
 stdout_logfile=/dev/stdout
@@ -25,7 +36,7 @@ autorestart=true
 
 [program:guacd]
 priority=10
-environment=LANG=zh_CN.UTF-8
+environment=LANG=en_US.UTF-8
 command=/opt/guacamole/sbin/guacd -b 0.0.0.0 -f -L error -p /var/run/guacd.pid
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
@@ -35,7 +46,7 @@ autorestart=true
 
 [program:lion]
 priority=100
-environment=LANG=zh_CN.UTF-8
+environment=LANG=en_US.UTF-8
 directory=/opt/lion/
 command=/opt/lion/lion
 stdout_logfile=/dev/stdout
@@ -46,7 +57,7 @@ autorestart=true
 
 [program:kael]
 priority=100
-environment=WORK_DIR="/opt/kael", COMPONENT_NAME="kael", WISP_TRACE_PROCESS=1, EXECUTE_PROGRAM="/opt/kael/kael", BIND_PORT=9091, WISP_PORT=9091, LANG=zh_CN.UTF-8
+environment=WORK_DIR="/opt/kael",COMPONENT_NAME="kael",WISP_TRACE_PROCESS=1,EXECUTE_PROGRAM="/opt/kael/kael",BIND_PORT=9091,WISP_PORT=9091,LANG=en_US.UTF-8
 directory=/opt/kael/
 command=/usr/local/bin/wisp
 stdout_logfile=/dev/stdout
@@ -57,7 +68,7 @@ autorestart=true
 
 [program:chen]
 priority=100
-environment=GIN_MODE="release", WORK_DIR="/opt/chen", COMPONENT_NAME="chen", WISP_TRACE_PROCESS=1, EXECUTE_PROGRAM="java -Dfile.encoding=utf-8 -XX:+ExitOnOutOfMemoryError -jar /opt/chen/chen.jar --mock.enable=false", BIND_PORT=9092, LANG=zh_CN.UTF-8
+environment=GIN_MODE="release",WORK_DIR="/opt/chen",COMPONENT_NAME="chen",WISP_TRACE_PROCESS=1,EXECUTE_PROGRAM="java -Dfile.encoding=utf-8 -XX:+ExitOnOutOfMemoryError -jar /opt/chen/chen.jar --mock.enable=false",BIND_PORT=9092,LANG=en_US.UTF-8
 directory=/opt/chen/
 command=/usr/local/bin/wisp
 stdout_logfile=/dev/stdout

diff --git a/docker-compose-build.yml b/docker-compose-build.yml
@@ -8,6 +8,8 @@ services:
         TARGETARCH: ${TARGETARCH}
     image: jumpserver/jms_core:${VERSION}
     container_name: jms_core
+    ulimits:
+      core: 0
     restart: always
     command: start web
     environment:
@@ -41,6 +43,8 @@ services:
   celery:
     image: jumpserver/jms_core:${VERSION}
     container_name: jms_celery
+    ulimits:
+      core: 0
     restart: always
     command: start task
     environment:
@@ -72,6 +76,29 @@ services:
       - ${VOLUME_DIR}/core/data:/opt/jumpserver/data
     networks:
       - net
+
+  receptor:
+    image: jumpserver/jms_core:${VERSION}
+    container_name: jms_receptor
+    ulimits:
+      core: 0
+    restart: always
+    command: start receptor
+    environment:
+      TZ: ${TZ:-Asia/Shanghai}
+    depends_on:
+      core:
+        condition: service_healthy
+    healthcheck:
+      test: "test -S /opt/jumpserver/data/share/control.sock || exit 1"
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 30s
+    volumes:
+      - ${VOLUME_DIR}/core/data:/opt/jumpserver/data
+    networks:
+      - net
 
   koko:
     build:
@@ -82,6 +109,8 @@ services:
         TARGETARCH: ${TARGETARCH}
     image: jumpserver/jms_koko:${VERSION}
     container_name: jms_koko
+    ulimits:
+      core: 0
     restart: always
     privileged: true
     environment:
@@ -115,6 +144,8 @@ services:
         TARGETARCH: ${TARGETARCH}
     image: jumpserver/jms_lion:${VERSION}
     container_name: jms_lion
+    ulimits:
+      core: 0
     restart: always
     environment:
       TZ: ${TZ:-Asia/Shanghai}
@@ -144,6 +175,8 @@ services:
         TARGETARCH: ${TARGETARCH}
     image: jumpserver/jms_magnus:${VERSION}
     container_name: jms_magnus
+    ulimits:
+      core: 0
     restart: always
     environment:
       TZ: ${TZ:-Asia/Shanghai}
@@ -242,6 +275,8 @@ services:
         TARGETARCH: ${TARGETARCH}
     image: jumpserver/jms_web:${VERSION}
     container_name: jms_web
+    ulimits:
+      core: 0
     restart: always
     environment:
       TZ: ${TZ:-Asia/Shanghai}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -68,6 +68,29 @@ services:
     networks:
       - net
 
+  receptor:
+    image: jumpserver/jms_core:${VERSION}
+    container_name: jms_receptor
+    ulimits:
+      core: 0
+    restart: always
+    command: start receptor
+    environment:
+      TZ: ${TZ:-Asia/Shanghai}
+    depends_on:
+      core:
+        condition: service_healthy
+    healthcheck:
+      test: "test -S /opt/jumpserver/data/share/control.sock || exit 1"
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 30s
+    volumes:
+      - ${VOLUME_DIR}/core/data:/opt/jumpserver/data
+    networks:
+      - net
+
   koko:
     image: jumpserver/jms_koko:${VERSION}
     container_name: jms_koko