Merge pull request #327 from jumpserver/pr@dev@feat_kael

feat: 添加 kael 组件
jumpserver · Jul 10, 2023 · 53d5979 · 53d5979
2 parents 8c2020b + 547993d
commit 53d5979
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/compose/docker-compose-app.yml b/compose/docker-compose-app.yml
@@ -124,6 +124,29 @@ services:
     networks:
       - net
 
+  kael:
+    image: jumpserver/kael:${VERSION}
+    container_name: jms_kael
+    ulimits:
+      core: 0
+    restart: always
+    tty: true
+    env_file:
+      - ${CONFIG_FILE}
+    volumes:
+      - ${VOLUME_DIR}/kael/data:/opt/kael/data
+    depends_on:
+      core:
+        condition: service_healthy
+    healthcheck:
+      test: "curl -fsL http://localhost:8083/kael/health/ > /dev/null"
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 90s
+    networks:
+      - net
+
   web:
     image: jumpserver/web:${VERSION}
     container_name: jms_web

diff --git a/compose/docker-compose-xpack.yml b/compose/docker-compose-xpack.yml
@@ -21,6 +21,9 @@ services:
   chen:
     image: registry.fit2cloud.com/jumpserver/chen:${VERSION}
 
+  kael:
+    image: registry.fit2cloud.com/jumpserver/kael:${VERSION}
+
   web:
     image: registry.fit2cloud.com/jumpserver/web:${VERSION}
 

diff --git a/scripts/utils.sh b/scripts/utils.sh
@@ -139,6 +139,7 @@ function get_images() {
     echo "registry.fit2cloud.com/jumpserver/lion:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/magnus:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/chen:${VERSION}"
+    echo "registry.fit2cloud.com/jumpserver/kael:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/razor:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/web:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/video-worker:${VERSION}"
@@ -149,6 +150,7 @@ function get_images() {
     echo "jumpserver/lion:${VERSION}"
     echo "jumpserver/magnus:${VERSION}"
     echo "jumpserver/chen:${VERSION}"
+    echo "jumpserver/kael:${VERSION}"
     echo "jumpserver/web:${VERSION}"
   fi
 }
@@ -241,7 +243,7 @@ function log_error() {
 
 function get_docker_compose_services() {
   ignore_db="$1"
-  services="core koko lion magnus web"
+  services="core koko lion magnus chen kael web"
   use_task=$(get_config USE_TASK)
   if [[ "${use_task}" != "0" ]]; then
     services+=" celery"
@@ -269,7 +271,7 @@ function get_docker_compose_services() {
   fi
   use_xpack=$(get_config_or_env USE_XPACK)
   if [[ "${use_xpack}" == "1" ]]; then
-    services+=" chen razor xrdp"
+    services+=" razor xrdp"
   fi
   use_video=$(get_config USE_VIDEO)
   if [[ "${use_xpack}" == "1" && "${use_video}" == "1" ]]; then