Merge pull request #483 from jumpserver/pr@dev@update_docker_version

feat: bump docker from 27.1.1 to 27.3.1
jumpserver · Dec 11, 2024 · 95c483b · 95c483b
2 parents d0ef49c + eb3e3fe
commit 95c483b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/scripts/const.sh b/scripts/const.sh
@@ -26,10 +26,10 @@ STATIC_ENV=${PROJECT_DIR}/static.env
 . "${STATIC_ENV}"
 
 export OS=$(uname -s)
-export DOCKER_VERSION=27.1.1
+export DOCKER_VERSION=27.4.0
 export DOCKER_MIRROR="https://download.jumpserver.org/docker/docker-ce/linux/static/stable"
 
-export DOCKER_COMPOSE_VERSION=v2.29.1
+export DOCKER_COMPOSE_VERSION=v2.31.0
 export DOCKER_COMPOSE_MIRROR="https://download.jumpserver.org/docker/compose/releases/download"
 
 ARCH=$(uname -m)

diff --git a/scripts/utils.sh b/scripts/utils.sh
@@ -475,11 +475,6 @@ function prepare_config() {
   if [[ ! -f "./compose/.env" ]]; then
     ln -s "${CONFIG_FILE}" ./compose/.env
   fi
-  if [[ "$(uname -m)" == "loongarch64" ]]; then
-    if ! grep -q "^SECURITY_LOGIN_CAPTCHA_ENABLED" "${CONFIG_FILE}"; then
-      echo "SECURITY_LOGIN_CAPTCHA_ENABLED=False" >> "${CONFIG_FILE}"
-    fi
-  fi
 
   # shellcheck disable=SC2045
   for d in $(ls "${PROJECT_DIR}/config_init"); do