Merge pull request #500 from jumpserver/dev

v4.4.0

compose/es.yml

@@ -1,6 +1,6 @@
 services:
   es:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.16
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.25
     container_name: jms_es
     hostname: jms_es
     restart: always

compose/facelive.yml

@@ -0,0 +1,18 @@
+services:
+  facelive:
+    image: ${REGISTRY:-registry.fit2cloud.com}/jumpserver/facelive:${VERSION}
+    container_name: jms_facelive
+    hostname: jms_facelive
+    restart: always
+    env_file:
+      - ${CONFIG_FILE}
+    volumes:
+      - ${VOLUME_DIR}/facelive/data:/opt/facelive/data
+    healthcheck:
+      test: "curl -fsL http://localhost:9999/facelive/health/ > /dev/null"
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
+    networks:
+      - net

compose/minio.yml

@@ -1,6 +1,6 @@
 services:
   minio:
-    image: jumpserver/minio:latest
+    image: minio/minio:latest
     container_name: jms_minio
     hostname: jms_minio
     restart: always
@@ -9,6 +9,7 @@ services:
       TZ: ${TZ:-Asia/Shanghai}
       MINIO_ROOT_USER: minio
       MINIO_ROOT_PASSWORD: $BOOTSTRAP_TOKEN
+      MINIO_REGION_NAME: us-west-rack2
     ports:
       - 9000:9000
       - 9001:9001

compose/nec.yml

@@ -0,0 +1,23 @@
+services:
+  nec:
+    image: ${REGISTRY:-registry.fit2cloud.com}/jumpserver/nec:${VERSION}
+    container_name: jms_nec
+    hostname: jms_nec
+    ulimits:
+      core: 0
+    restart: always
+    env_file:
+      - ${CONFIG_FILE}
+    ports:
+      - ${NEC_VNC_PORT:-15900}:15900
+    volumes:
+      - ${CONFIG_DIR}/certs:/opt/nec/data/certs
+      - ${VOLUME_DIR}/nec/data:/opt/nec/data
+    healthcheck:
+      test: "curl -fsL http://localhost:8085/nec/health/ > /dev/null"
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
+    networks:
+      - net

scripts/5_db_backup.sh

@@ -20,7 +20,7 @@ function main() {
 
   db_images=$(get_db_images)
 
-  if ! docker ps | grep jms_&>/dev/null; then
+  if ! docker ps | grep -w "jms_core" &>/dev/null; then
     create_db_ops_env
     flag=1
   fi

scripts/6_db_restore.sh

@@ -23,7 +23,7 @@ function main() {
 
   echo "$(gettext 'Start restoring database'): $DB_FILE"
 
-  if ! docker ps | grep jms_&>/dev/null; then
+  if ! docker ps | grep -w "jms_core" &>/dev/null; then
     create_db_ops_env
     flag=1
   fi

scripts/config.sh

@@ -55,6 +55,8 @@ function set_port() {
     xrdp_enable=$(get_config XRDP_ENABLE)
     razor_enable=$(get_config RAZOR_ENABLE)
     web_enable=$(get_config WEB_ENABLE)
+    nec_enable=$(get_config NEC_ENABLE)
+    facelive_enable=$(get_config FACELIVE_ENABLE)
 
     if [[ "${web_enable}" != "0" ]]; then
         http_port=$(get_config HTTP_PORT)
@@ -105,6 +107,11 @@ function set_port() {
             read_from_input magnus_oracle_ports "$(gettext 'Please enter MAGNUS ORACLE PORTS')" "" "${magnus_oracle_ports}"
             set_config MAGNUS_ORACLE_PORTS "${magnus_oracle_ports}"
         fi
+        if [[ "${nec_enable}" != "0" ]]; then
+            nec_vnc_port=$(get_config NEC_VNC_PORT)
+            read_from_input nec_port "$(gettext 'Please enter NEC VNC PORT')" "" "${nec_vnc_port}"
+            set_config NEC_VNC_PORT "${nec_vnc_port}"
+        fi
     fi
     flag=1
 }
@@ -234,4 +241,4 @@ fi
 
 if [[ "${flag}" == "1" ]]; then
     restart_service
-fi
+fi

scripts/utils.sh

@@ -137,7 +137,7 @@ function get_db_info() {
   if [[ "${check_volume_dir}" == "0" ]]; then
     db_engine=$(get_config DB_ENGINE "postgresql")
   fi
-  
+
   mysql_data_exists="0"
   mariadb_data_exists="0"
   postgres_data_exists="0"
@@ -207,6 +207,8 @@ function get_images() {
     echo "registry.fit2cloud.com/jumpserver/video-worker:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/xrdp:${VERSION}"
     echo "registry.fit2cloud.com/jumpserver/panda:${VERSION}"
+    echo "registry.fit2cloud.com/jumpserver/nec:${VERSION}"
+    echo "registry.fit2cloud.com/jumpserver/facelive:${VERSION}"
   else
     echo "jumpserver/core:${VERSION}"
     echo "jumpserver/koko:${VERSION}"
@@ -342,8 +344,8 @@ function get_docker_compose_services() {
   [[ "${use_loki}" == "1" ]] && services+=" loki"
 
   if [[ "${use_xpack}" == "1" ]]; then
-    services+=" magnus razor xrdp video panda"
-    for service in magnus razor xrdp video panda; do
+    services+=" magnus razor xrdp video panda nec facelive"
+    for service in magnus razor xrdp video panda nec facelive; do
       enabled=$(get_config "${service^^}_ENABLED")
       [[ "${enabled}" == "0" ]] && services="${services//${service}/}"
     done
@@ -395,7 +397,7 @@ function get_docker_compose_cmd_line() {
   fi
 
   if [[ "${use_xpack}" == '1' ]]; then
-    for service in magnus razor xrdp video panda; do
+    for service in magnus razor xrdp video panda nec facelive; do
       if [[ "${services}" =~ ${service} ]]; then
         cmd+=" -f compose/${service}.yml"
       fi