Merge pull request #228 from jumpserver/dev

perf: 默认关闭 Receptor 组件
jumpserver · Apr 23, 2024 · e20040e · e20040e
2 parents 0f5c730 + 83eaad8
commit e20040e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 57 deletions.
diff --git a/allinone/supervisord.conf b/allinone/supervisord.conf
@@ -12,17 +12,6 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 autorestart=true
 
-[program:receptor]
-priority=10
-environment=PATH="/opt/py3/bin:%(ENV_PATH)s",LANG=C.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=en_US.UTF-8

diff --git a/core/Dockerfile b/core/Dockerfile
@@ -150,6 +150,8 @@ WORKDIR /opt/jumpserver
 ARG VERSION=v3.10.9
 ENV VERSION=${VERSION}
 
+ENV RECEPTOR_ENABLED=0
+
 VOLUME /opt/jumpserver/data
 
 EXPOSE 8080

diff --git a/docker-compose-build.yml b/docker-compose-build.yml
@@ -76,29 +76,6 @@ 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:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -68,29 +68,6 @@ 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