Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v3.10.8 master to v3.10 #416

Merged
merged 13 commits into from
Apr 18, 2024
Merged

v3.10.8 master to v3.10 #416

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
179fcbd
perf: SESSION_EXPIRE_AT_BROWSER_CLOSE 默认为 false
feng626 Mar 12, 2024
6ef96cc
feat: 更新 docker 版本
wojiushixiaobai Mar 12, 2024
253998a
perf: 调整 razor 的健康检查
LeeEirc Mar 14, 2024
ceaeef4
perf: 优化 razor 的监控
wojiushixiaobai Mar 14, 2024
ba66aea
feat: 更新 docker 26.0.0
wojiushixiaobai Mar 22, 2024
7e0079c
Merge pull request #401 from jumpserver/pr@dev@upgrade_docker_version
wojiushixiaobai Apr 7, 2024
5c424e2
feat: 支持 ansible 沙盒运行
wojiushixiaobai Apr 8, 2024
60ed17b
feat: 按项目需求添加配置工具
wojiushixiaobai Mar 20, 2024
0596ef7
支持中文繁体
hzhwyh0116 Apr 9, 2024
fb285a2
perf: add zh hant translate
feng626 Apr 9, 2024
9b874f5
perf: 优化 razor 判断
wojiushixiaobai Apr 15, 2024
9fcdd11
feat: 更新 docker 26.0.1
wojiushixiaobai Apr 12, 2024
c463c0b
Merge pull request #413 from jumpserver/dev
BaiJiangJie Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: 更新 docker 版本
  • Loading branch information
@wojiushixiaobai @BaiJiangJie
wojiushixiaobai authored and BaiJiangJie committed Mar 12, 2024
commit 6ef96cc2b18cca86e3278dbd6c271a06066db8cd
20 changes: 10 additions & 10 deletions scripts/const.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,36 +26,36 @@ STATIC_ENV=${PROJECT_DIR}/static.env
. "${STATIC_ENV}"

export OS=$(uname -s)
export DOCKER_VERSION=25.0.3
export DOCKER_VERSION=25.0.4
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=0ba827cc2a1bd3c4e61c424d81148be7
DOCKER_MD5=417e91fcf5774d0f04c58d5500b1946f
fi
if [[ "$(uname -m)" == "aarch64" ]]; then
DOCKER_MD5=b103d07e8dffeb601128186f6aa0e714
DOCKER_MD5=9095035fc0700aacfc7262cf353e91e8
fi
if [[ "$(uname -m)" == "loongarch64" ]]; then
DOCKER_MD5=8eea6349b4fbda3fd9a0499ec7f03259
DOCKER_MD5=ec3634e6fec48aedbc903a9f47f7f6b0
fi
if [[ "$(uname -m)" == "s390x" ]]; then
DOCKER_MD5=10d9d1a0c771ebcfbf078a3141d72154
DOCKER_MD5=794804888e312a8d912eac1b9a4ac3e4
fi
export DOCKER_MD5

export DOCKER_COMPOSE_VERSION=v2.24.5
export DOCKER_COMPOSE_VERSION=v2.24.7
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=aea273a344c430d1c89d23b21fa18f63
DOCKER_COMPOSE_MD5=a24c26e39af438437c8d664f109f8456
fi
if [[ "$(uname -m)" == "aarch64" ]]; then
DOCKER_COMPOSE_MD5=3202cc80ff6147d6eb823151c8889622
DOCKER_COMPOSE_MD5=d094e1551cb3c4de858aaff562bcd4d8
fi
if [[ "$(uname -m)" == "loongarch64" ]]; then
DOCKER_COMPOSE_MD5=a7a3372132ba4b241635b06eb74b2a45
DOCKER_COMPOSE_MD5=987b6b6964431b86979e9fe6a00f98b5
fi
if [[ "$(uname -m)" == "s390x" ]]; then
DOCKER_COMPOSE_MD5=53b35fe65a92175ce5dff8ee4e715df5
DOCKER_COMPOSE_MD5=4b182bfbfb2ba190000b9ec2593898f1
fi
export DOCKER_COMPOSE_MD5