feat: 添加 xrdp 组件

jumpserver · Jun 29, 2023 · 5f2e0bb · 5f2e0bb
1 parent 369af2f
commit 5f2e0bb
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/compose/docker-compose-xpack.yml b/compose/docker-compose-xpack.yml
@@ -49,3 +49,29 @@ services:
       start_period: 10s
     networks:
       - net
+
+  xrdp:
+    image: registry.fit2cloud.com/jumpserver/xrdp:${VERSION}
+    container_name: jms_xrdp
+    ulimits:
+      core: 0
+    restart: always
+    tty: true
+    env_file:
+      - ${CONFIG_FILE}
+    ports:
+      - ${XRDP_PORT}:3390
+    volumes:
+      - ${VOLUME_DIR}/xrdp/data:/opt/xrdp/data
+      - ${CONFIG_DIR}/nginx/cert:/opt/xrdp/cert
+    depends_on:
+      core:
+        condition: service_healthy
+    healthcheck:
+      test: "nc -z 127.0.0.1 3390 || exit 1"
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
+    networks:
+      - net
diff --git a/scripts/3_load_images.sh b/scripts/3_load_images.sh
@@ -16,9 +16,7 @@ function load_image_files() {
       filename=${filename_windows}
     fi
     if [[ ! -f ${IMAGE_DIR}/${filename} ]]; then
-      if [[ ! ${filename} =~ xpack* && ! ${filename} =~ chen* && ! ${filename} =~ razor* ]]; then
-        echo_red "$(gettext 'Docker image not found'): ${IMAGE_DIR}/${filename}"
-      fi
+      echo_red "$(gettext 'Docker image not found'): ${IMAGE_DIR}/${filename}"
       continue
     fi
 

diff --git a/scripts/utils.sh b/scripts/utils.sh
@@ -142,6 +142,7 @@ function get_images() {
     echo "registry.fit2cloud.com/jumpserver/razor:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/web:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/video-worker:${VERSION}"
+    echo "registry.fit2cloud.com/jumpserver/xrdp:${VERSION}"
   else
     echo "jumpserver/core:${VERSION}"
     echo "jumpserver/koko:${VERSION}"
@@ -268,7 +269,7 @@ function get_docker_compose_services() {
   fi
   use_xpack=$(get_config_or_env USE_XPACK)
   if [[ "${use_xpack}" == "1" ]]; then
-    services+=" chen razor"
+    services+=" chen razor xrdp"
   fi
   use_video=$(get_config USE_VIDEO)
   if [[ "${use_xpack}" == "1" && "${use_video}" == "1" ]]; then