From eb3e3feb57cc5e88631f859bc62c90a67b6e0199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com> Date: Thu, 29 Aug 2024 13:22:31 +0800 Subject: [PATCH] feat: bump docker from 27.1.1 to 27.4.0 --- scripts/const.sh | 4 ++-- scripts/utils.sh | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/const.sh b/scripts/const.sh index 793e0b02..e339a3ce 100644 --- 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 index 6380bafc..0ff6e2db 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -473,11 +473,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