Merge pull request #394 from jumpserver/dev

v3.10.4

Author: BaiJiangJie

compose/docker-compose-magnus.yml

@@ -19,7 +19,7 @@ services:
       - ${CONFIG_DIR}/certs:/opt/magnus/data/certs
       - ${VOLUME_DIR}/magnus/data:/opt/magnus/data
     healthcheck:
-      test: "nc -z 127.0.0.1 33061 || exit 1"
+      test: "curl localhost:8088/health || exit 1"
       interval: 10s
       timeout: 5s
       retries: 3

config-example.txt

@@ -51,6 +51,7 @@ DOCKER_SUBNET_IPV6=fc00:1010:1111:200::/64
 
 ################################# MySQL 配置 ##################################
 # 外置 MySQL 需要输入正确的 MySQL 信息, 内置 MySQL 系统会自动处理
+# (*) 密码部分不得包含单引号和双引号
 #
 DB_HOST=mysql
 DB_PORT=3306
@@ -64,6 +65,7 @@ DB_NAME=jumpserver
 
 ################################# Redis 配置 ##################################
 # 外置 Redis 需要请输入正确的 Redis 信息, 内置 Redis 系统会自动处理
+# (*) 密码部分不得包含单引号和双引号
 #
 REDIS_HOST=redis
 REDIS_PORT=6379

scripts/5_db_backup.sh

@@ -8,10 +8,6 @@ VOLUME_DIR=$(get_config VOLUME_DIR)
 BACKUP_DIR="${VOLUME_DIR}/db_backup"
 CURRENT_VERSION=$(get_config CURRENT_VERSION)
 
-HOST=$(get_config DB_HOST)
-PORT=$(get_config DB_PORT)
-USER=$(get_config DB_USER)
-PASSWORD=$(get_config DB_PASSWORD)
 DATABASE=$(get_config DB_NAME)
 DB_FILE=${BACKUP_DIR}/${DATABASE}-${CURRENT_VERSION}-$(date +%F_%T).sql
 
@@ -33,8 +29,9 @@ function main() {
     done
   fi
 
-  backup_cmd="mysqldump --skip-add-locks --skip-lock-tables --single-transaction --host=${HOST} --port=${PORT} --user=${USER} --password=${PASSWORD} ${DATABASE}"
-  if ! docker run --rm -i --network=jms_net "${mysql_images}" ${backup_cmd} > "${DB_FILE}"; then
+  backup_cmd='mysqldump --skip-add-locks --skip-lock-tables --single-transaction -h$DB_HOST -P$DB_PORT -u$DB_USER -p"$DB_PASSWORD" $DB_NAME > '${DB_FILE}
+  if ! docker run --rm --env-file=${CONFIG_FILE} -i --network=jms_net -v "${BACKUP_DIR}:${BACKUP_DIR}" "${mysql_images}" bash -c "${backup_cmd}"; then
+    log_error "$(gettext 'Backup failed')!"
     log_error "$(gettext 'Backup failed')!"
     rm -f "${DB_FILE}"
     exit 1

scripts/6_db_restore.sh

@@ -4,17 +4,11 @@ BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 
 . "${BASE_DIR}/utils.sh"
 
-HOST=$(get_config DB_HOST)
-PORT=$(get_config DB_PORT)
-USER=$(get_config DB_USER)
-PASSWORD=$(get_config DB_PASSWORD)
-DATABASE=$(get_config DB_NAME)
-
 DB_FILE="$1"
+BACKUP_DIR=$(dirname "${DB_FILE}")
 
 function main() {
   echo_warn "$(gettext 'Make sure you have a backup of data, this operation is not reversible')! \n"
-  restore_cmd="mysql --host=${HOST} --port=${PORT} --user=${USER} --password=${PASSWORD} ${DATABASE}"
 
   if [[ ! -f "${DB_FILE}" ]]; then
     echo "$(gettext 'file does not exist'): ${DB_FILE}"
@@ -35,7 +29,8 @@ function main() {
     done
   fi
 
-  if ! docker run --rm -i --network=jms_net "${mysql_images}" $restore_cmd <"${DB_FILE}"; then
+  restore_cmd='mysql -h$DB_HOST -P$DB_PORT -u$DB_USER -p"$DB_PASSWORD" $DB_NAME < '${DB_FILE}
+  if ! docker run --rm --env-file=${CONFIG_FILE} -i --network=jms_net -v "${BACKUP_DIR}:${BACKUP_DIR}" "${mysql_images}" bash -c "${restore_cmd}"; then
     log_error "$(gettext 'Database recovery failed. Please check whether the database file is complete or try to recover manually')!"
     exit 1
   else

scripts/const.sh

@@ -26,36 +26,36 @@ STATIC_ENV=${PROJECT_DIR}/static.env
 . "${STATIC_ENV}"
 
 export OS=$(uname -s)
-export DOCKER_VERSION=24.0.7
+export DOCKER_VERSION=25.0.3
 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=ad4add9b55f71c295e6f8f9e093eb53d
+  DOCKER_MD5=0ba827cc2a1bd3c4e61c424d81148be7
 fi
 if [[ "$(uname -m)" == "aarch64" ]]; then
-  DOCKER_MD5=89be712e6a933321362ced9a4d22baef
+  DOCKER_MD5=b103d07e8dffeb601128186f6aa0e714
 fi
 if [[ "$(uname -m)" == "loongarch64" ]]; then
-  DOCKER_MD5=124492bc9a838fb8e4917cac5833ceae
+  DOCKER_MD5=8eea6349b4fbda3fd9a0499ec7f03259
 fi
 if [[ "$(uname -m)" == "s390x" ]]; then
-  DOCKER_MD5=ca5586e1ba49cd5cab6fdcd03ac443c6
+  DOCKER_MD5=10d9d1a0c771ebcfbf078a3141d72154
 fi
 export DOCKER_MD5
 
-export DOCKER_COMPOSE_VERSION=v2.24.0
+export DOCKER_COMPOSE_VERSION=v2.24.5
 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=fa754fec4f02baa1b7e7f8b1d2ad4a61
+  DOCKER_COMPOSE_MD5=aea273a344c430d1c89d23b21fa18f63
 fi
 if [[ "$(uname -m)" == "aarch64" ]]; then
-  DOCKER_COMPOSE_MD5=0c64adb54fac8e5ccd1fa1cecaca114f
+  DOCKER_COMPOSE_MD5=3202cc80ff6147d6eb823151c8889622
 fi
 if [[ "$(uname -m)" == "loongarch64" ]]; then
-  DOCKER_COMPOSE_MD5=0db3ab0a0e5d63165ab804356d1fe132
+  DOCKER_COMPOSE_MD5=a7a3372132ba4b241635b06eb74b2a45
 fi
 if [[ "$(uname -m)" == "s390x" ]]; then
-  DOCKER_COMPOSE_MD5=a4784eb9505581dce9df97c0b080e8ef
+  DOCKER_COMPOSE_MD5=53b35fe65a92175ce5dff8ee4e715df5
 fi
 export DOCKER_COMPOSE_MD5

scripts/utils.sh

@@ -17,16 +17,18 @@ function is_confirm() {
 function random_str() {
   len=$1
   if [[ -z ${len} ]]; then
-    len=16
+    len=24
   fi
-  uuid=None
+  uuid=""
   if command -v dmidecode &>/dev/null; then
-    uuid=$(dmidecode -t 1 | grep UUID | awk '{print $2}' | base64 | head -c ${len})
+    if [[ ${len} -gt 24 ]]; then
+      uuid=$(dmidecode -t 1 | grep UUID | awk '{print $2}' | sha256sum | awk '{print $1}' | head -c ${len})
+    fi
   fi
   if [[ "${#uuid}" == "${len}" ]]; then
     echo "${uuid}"
   else
-    head -c100 < /dev/urandom | base64 | tr -dc A-Za-z0-9 | head -c ${len}; echo
+    head -c200 < /dev/urandom | base64 | tr -dc A-Za-z0-9 | head -c ${len}; echo
   fi
 }