Merge pull request #385 from jumpserver/dev

v3.10.2

compose/docker-compose-magnus.yml

@@ -15,7 +15,6 @@ services:
       - ${MAGNUS_MYSQL_PORT:-33061}:33061
       - ${MAGNUS_MARIADB_PORT:-33062}:33062
       - ${MAGNUS_REDIS_PORT:-63790}:63790
-      - ${MAGNUS_SQLSERVER_PORT:-14330}:14330
     volumes:
       - ${CONFIG_DIR}/certs:/opt/magnus/data/certs
       - ${VOLUME_DIR}/magnus/data:/opt/magnus/data

scripts/7_upgrade.sh

@@ -158,6 +158,19 @@ function migrate_config_v1_5_to_v2_0() {
 }
 
 function migrate_config_v2_0_to_v3_0() {
+  is_running=0
+  for app in jms_lb jms_nginx jms_web; do
+    if docker ps | grep -q "${app}"; then
+      is_running=1
+      break
+    fi
+  done
+
+  if [ "$is_running" -eq 0 ]; then
+    # Nothing to do
+    return
+  fi
+
   https_port=$(get_config HTTPS_PORT)
   use_https=0
 

scripts/const.sh

@@ -26,30 +26,36 @@ STATIC_ENV=${PROJECT_DIR}/static.env
 . "${STATIC_ENV}"
 
 export OS=$(uname -s)
-export DOCKER_VERSION=24.0.6
+export DOCKER_VERSION=24.0.7
 export DOCKER_MIRROR="https://download.jumpserver.org/docker/docker-ce/linux/static/stable"
 export DOCKER_BIN_URL="${DOCKER_MIRROR}/$(uname -m)/docker-${DOCKER_VERSION}.tgz"
 if [[ "$(uname -m)" == "x86_64" ]]; then
-  DOCKER_MD5=abe35f3e3b728b677ec9ed24be1f6ffb
+  DOCKER_MD5=ad4add9b55f71c295e6f8f9e093eb53d
 fi
 if [[ "$(uname -m)" == "aarch64" ]]; then
-  DOCKER_MD5=f7a744ba0f6173ebb82c529503343e9a
+  DOCKER_MD5=89be712e6a933321362ced9a4d22baef
 fi
 if [[ "$(uname -m)" == "loongarch64" ]]; then
-  DOCKER_MD5=8beac2e56ccccb2fceaad428356fcbe5
+  DOCKER_MD5=124492bc9a838fb8e4917cac5833ceae
+fi
+if [[ "$(uname -m)" == "s390x" ]]; then
+  DOCKER_MD5=ca5586e1ba49cd5cab6fdcd03ac443c6
 fi
 export DOCKER_MD5
 
-export DOCKER_COMPOSE_VERSION=v2.23.0
+export DOCKER_COMPOSE_VERSION=v2.24.0
 export DOCKER_COMPOSE_MIRROR="https://download.jumpserver.org/docker/compose/releases/download"
 export DOCKER_COMPOSE_BIN_URL="${DOCKER_COMPOSE_MIRROR}/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-$(uname -m)"
 if [[ "$(uname -m)" == "x86_64" ]]; then
-  DOCKER_COMPOSE_MD5=c15370d05632dbe64ddd862148fb73e9
+  DOCKER_COMPOSE_MD5=fa754fec4f02baa1b7e7f8b1d2ad4a61
 fi
 if [[ "$(uname -m)" == "aarch64" ]]; then
-  DOCKER_COMPOSE_MD5=266935a584be3ce4011047ee00df351c
+  DOCKER_COMPOSE_MD5=0c64adb54fac8e5ccd1fa1cecaca114f
 fi
 if [[ "$(uname -m)" == "loongarch64" ]]; then
-  DOCKER_COMPOSE_MD5=240f14d62b2ddf1a9f999d61b80c862a
+  DOCKER_COMPOSE_MD5=0db3ab0a0e5d63165ab804356d1fe132
+fi
+if [[ "$(uname -m)" == "s390x" ]]; then
+  DOCKER_COMPOSE_MD5=a4784eb9505581dce9df97c0b080e8ef
 fi
 export DOCKER_COMPOSE_MD5