Merge remote-tracking branch 'github_public/main'

This commit is contained in:
wizardchen
2025-11-13 14:28:41 +08:00
69 changed files with 5384 additions and 2466 deletions
+2 -2
View File
@@ -342,7 +342,7 @@ start_docker() {
else
# 拉取最新镜像
log_info "拉取最新镜像..."
PLATFORM=$PLATFORM "$DOCKER_COMPOSE_BIN" $DOCKER_COMPOSE_SUBCMD up --build --pull always -d
PLATFORM=$PLATFORM "$DOCKER_COMPOSE_BIN" $DOCKER_COMPOSE_SUBCMD up --pull always -d
fi
if [ $? -ne 0 ]; then
log_error "Docker容器启动失败"
@@ -538,7 +538,7 @@ check_environment() {
# 检查内存
log_info "检查内存使用情况..."
if [ "$OS" = "Darwin" ]; then
vm_stat | perl -ne '/page size of (\d+)/ and $size=$1; /Pages free: (\d+)/ and print "Free Memory: ", $1 * $size / 1048576, " MB\n"'
vm_stat | perl -ne '/page size of (\d+)/ and $size=$1; /Pages free:\s*(\d+)/ and print "Free Memory: ", $1 * $size / 1048576, " MB\n"'
else
free -h | grep -E "(total|Mem:)"
fi