feat(region,host): hostpinger add cpu usage percent report (#22006)

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
     requires:
       - check
     docker:
-      - image: yunion/alpine-build:3.22.0-go-1.24.6-1
+      - image: yunion/centos-build:go-1.21.10-0
         environment:
           ONECLOUD_CI_BUILD: "1"
 

.github/pull_request_template.md

@@ -13,7 +13,8 @@ If no, just write "NONE".
 If don't know, write "UNKNOWN", and let the reviewer decide.
 
 If yes, write the release branches name in the below format and submit the related cherry-pick PR:
-- release/3.11
+- release/3.7
+- release/3.6
 
 Take a look at "https://www.cloudpods.org/en/docs/contribute/contrib/" to learn how to submit a cherry-pick PR. 
 -->

.github/workflows/ci-pr-build-test.yml

@@ -13,13 +13,13 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v4
       with:
-        go-version: '1.26.3'
+        go-version: '1.21'
 
     - name: Install check tools
       shell: bash
       run: |
         set -o xtrace
-        git clone --branch master --depth 4 https://github.com/yunionio/tools && cd tools
+        git clone --branch yun --depth 4 https://github.com/yousong/tools && cd tools
         go build ./cmd/goimports && sudo cp goimports /usr/bin/ && cd .. && rm -rf tools
         git clone --depth 4 https://github.com/yousong/y18n && cd y18n
         go build . && sudo cp y18n /usr/bin && cd .. && rm -rf y18n

.github/workflows/docker_apigateway.yml

@@ -22,7 +22,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.26.3'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_climc.yml

@@ -20,7 +20,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.26.3'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_cloudmon.yml

@@ -21,7 +21,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.26.3'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_esxi_agent.yml

@@ -19,7 +19,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.26.3'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_glance.yml

@@ -23,7 +23,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.26.3'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_host.yml

@@ -19,7 +19,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.26.3'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_keystone.yml

@@ -23,7 +23,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.26.3'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_logger.yml

@@ -23,7 +23,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.26.3'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_notify.yml

@@ -23,7 +23,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.26.3'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_region.yml

@@ -24,7 +24,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.26.3'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_scheduler.yml

@@ -20,7 +20,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.26.3'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_webconsole.yml

@@ -23,7 +23,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.26.3'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/issue-check-inactive.yml

@@ -4,42 +4,14 @@ on:
   schedule:
     - cron: "0 0 * * *"
 
-permissions:
-  issues: write
-
 jobs:
   issue-check-inactive:
     runs-on: ubuntu-latest
     steps:
-      - name: Label inactive issues as stale
-        env:
-          GH_TOKEN: ${{ github.token }}
-          INACTIVE_DAY: "30"
-          INACTIVE_LABEL: "stale"
-          EXCLUDE_LABEL: "announcement"
-        run: |
-          set -euo pipefail
-          cutoff="$(date -u -d "${INACTIVE_DAY} days ago" +%Y-%m-%dT%H:%M:%SZ)"
-
-          gh issue list \
-            --repo "${{ github.repository }}" \
-            --state open \
-            --limit 1000 \
-            --json number,labels,updatedAt \
-          | jq -c \
-            --arg cutoff "$cutoff" \
-            --arg inactive "$INACTIVE_LABEL" \
-            --arg exclude "$EXCLUDE_LABEL" \
-            '
-              .[]
-              | select(.updatedAt < $cutoff)
-              | select([.labels[].name] | index($exclude) | not)
-              | select([.labels[].name] | index($inactive) | not)
-            ' \
-          | while IFS= read -r issue; do
-              number="$(echo "$issue" | jq -r .number)"
-              echo "Marking issue #${number} as ${INACTIVE_LABEL}"
-              gh issue edit "$number" \
-                --repo "${{ github.repository }}" \
-                --add-label "$INACTIVE_LABEL"
-            done
+      - name: check-inactive
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'check-inactive'
+          inactive-label: 'stale'
+          inactive-day: 30
+          exclude-labels: 'announcement'

.github/workflows/issue-close-require.yml

@@ -4,41 +4,17 @@ on:
   schedule:
     - cron: "0 1 * * *"
 
-permissions:
-  issues: write
-
 jobs:
   issue-close-require:
     runs-on: ubuntu-latest
     steps:
-      - name: Close inactive issues awaiting user feedback
-        env:
-          GH_TOKEN: ${{ github.token }}
-          INACTIVE_DAY: "7"
-        run: |
-          set -euo pipefail
-          cutoff="$(date -u -d "${INACTIVE_DAY} days ago" +%Y-%m-%dT%H:%M:%SZ)"
-          body="$(cat <<'EOF'
-          If you do not provide feedback for more than 37 days, we will close the issue and you can either reopen it or submit a new issue.
+      - name: need reproduce
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'close-issues'
+          labels: 'stale,state/awaiting user feedback'
+          inactive-day: 7
+          body: |
+            If you do not provide feedback for more than 37 days, we will close the issue and you can either reopen it or submit a new issue.
 
-          您超过 37 天未反馈信息，我们将关闭该 issue，如有需求您可以重新打开或者提交新的 issue。
-          EOF
-          )"
-          # Trim leading indentation from heredoc lines for a cleaner comment.
-          body="$(printf '%s\n' "$body" | sed 's/^[[:space:]]*//')"
-
-          gh issue list \
-            --repo "${{ github.repository }}" \
-            --state open \
-            --label "stale" \
-            --label "state/awaiting user feedback" \
-            --limit 1000 \
-            --json number,updatedAt \
-          | jq -c --arg cutoff "$cutoff" '.[] | select(.updatedAt < $cutoff)' \
-          | while IFS= read -r issue; do
-              number="$(echo "$issue" | jq -r .number)"
-              echo "Closing issue #${number}"
-              gh issue close "$number" \
-                --repo "${{ github.repository }}" \
-                --comment "$body"
-            done
+            您超过 37 天未反馈信息，我们将关闭该 issue，如有需求您可以重新打开或者提交新的 issue。

.github/workflows/issue-close.yml

@@ -4,19 +4,13 @@ on:
   issues:
     types: [closed]
 
-permissions:
-  issues: write
-
 jobs:
   issue-closed-remove-labels:
     runs-on: ubuntu-latest
     if: "!contains(github.event.issue.labels.*.name, 'stale')"
     steps:
-      - name: Remove state labels when issue that hasn't stale label is closed
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh issue edit "${{ github.event.issue.number }}" \
-            --repo "${{ github.repository }}" \
-            --remove-label "state/awaiting processing" \
-            --remove-label "state/awaiting user feedback" || true
+      - name: Remove statle labels when issue that hasn't stale label is closed
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'remove-labels'
+          labels: 'state/awaiting processing,state/awaiting user feedback'

.github/workflows/issue-comment.yml

@@ -4,48 +4,35 @@ on:
 
 name: Add issues workflow labels
 
-permissions:
-  issues: write
-
 jobs:
   add-label-if-is-author:
     runs-on: ubuntu-latest
     if: (github.event.issue.user.id == github.event.comment.user.id) && !github.event.issue.pull_request && (github.event.issue.state == 'open')
     steps:
       - name: Add require handle label
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh issue edit "${{ github.event.issue.number }}" \
-            --repo "${{ github.repository }}" \
-            --add-label "state/awaiting processing"
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'add-labels'
+          labels: 'state/awaiting processing'
 
       - name: Remove require reply label
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh issue edit "${{ github.event.issue.number }}" \
-            --repo "${{ github.repository }}" \
-            --remove-label "state/awaiting user feedback" \
-            --remove-label "stale" || true
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'remove-labels'
+          labels: 'state/awaiting user feedback,stale'
 
   add-label-if-not-author:
     runs-on: ubuntu-latest
     if: (github.event.issue.user.id != github.event.comment.user.id) && !github.event.issue.pull_request && (github.event.issue.state == 'open') && (!contains(github.event.comment.body, '/keep-state'))
     steps:
-      - name: Add require reply label
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh issue edit "${{ github.event.issue.number }}" \
-            --repo "${{ github.repository }}" \
-            --add-label "state/awaiting user feedback"
+      - name: Add require replay label
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'add-labels'
+          labels: 'state/awaiting user feedback'
 
       - name: Remove require handle label
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh issue edit "${{ github.event.issue.number }}" \
-            --repo "${{ github.repository }}" \
-            --remove-label "state/awaiting processing" \
-            --remove-label "stale" || true
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'remove-labels'
+          labels: 'state/awaiting processing,stale'

.github/workflows/issue-open.yml

@@ -4,30 +4,22 @@ on:
   issues:
     types: [opened, reopened]
 
-permissions:
-  issues: write
-
 jobs:
   issue-open-add-labels:
     runs-on: ubuntu-latest
-    if: ${{ !github.event.issue.pull_request }}
     steps:
       - name: Add labels
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh issue edit "${{ github.event.issue.number }}" \
-            --repo "${{ github.repository }}" \
-            --add-label "state/awaiting processing"
+        uses: actions-cool/issues-helper@v2
+        if: ${{ !github.event.comment.pull_request.pull_request }}
+        with:
+          actions: 'add-labels'
+          labels: 'state/awaiting processing'
 
       - name: Remove require reply label
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh issue edit "${{ github.event.issue.number }}" \
-            --repo "${{ github.repository }}" \
-            --remove-label "state/awaiting user feedback" \
-            --remove-label "stale" || true
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'remove-labels'
+          labels: 'state/awaiting user feedback,stale'
 
   notify-author-comment:
     runs-on: ubuntu-latest

Makefile

@@ -47,6 +47,11 @@ PKGS := go list ./...
 CGO_CFLAGS_ENV = $(shell go env CGO_CFLAGS)
 CGO_LDFLAGS_ENV = $(shell go env CGO_LDFLAGS)
 
+ifdef LIBQEMUIO_PATH
+		X_CGO_CFLAGS := ${CGO_CFLAGS_ENV} -I${LIBQEMUIO_PATH}/src -I${LIBQEMUIO_PATH}/src/include
+		X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread -lgnutls -lnettle -L ${LIBQEMUIO_PATH}/src
+endif
+
 export GOOS ?= linux
 export GO111MODULE:=on
 export CGO_CFLAGS = ${X_CGO_CFLAGS}
@@ -58,7 +63,7 @@ ifeq ($(UNAME), Linux)
 XARGS_FLAGS = --no-run-if-empty
 endif
 
-cmdTargets:=$(wildcard cmd/*)
+cmdTargets:=$(filter-out cmd/host-image,$(wildcard cmd/*))
 rpmTargets:=$(foreach b,$(patsubst cmd/%,%,$(cmdTargets)),$(if $(shell [ -f "$(CURDIR)/build/$(b)/vars" ] && echo 1),rpm/$(b)))
 debTargets:=$(foreach b,$(patsubst cmd/%,%,$(cmdTargets)),$(if $(shell [ -f "$(CURDIR)/build/$(b)/vars" ] && echo 1),deb/$(b)))
 
@@ -84,6 +89,12 @@ vet:
 # cmd/esxi-agent: prepare_dir
 # 	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
+cmd/host: prepare_dir
+	CGO_ENABLED=1 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
+
+cmd/host-image: prepare_dir
+	CGO_ENABLED=1 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
+
 cmd/%: prepare_dir
 	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
@@ -96,6 +107,21 @@ deb/%: cmd/%
 pkg/%: prepare_dir
 	$(GO_INSTALL) $(REPO_PREFIX)/$@
 
+rpm/fetcherfs: cmd/fetcherfs
+	docker run --rm \
+		--name docker-centos-build-fetcherfs \
+		-v $(CURDIR):/data \
+		registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-4 \
+		/bin/bash -c "VERSION=3.6 /data/build/build.sh fetcherfs /opt/yunion/fetchclient/bin"
+
+deb/fetcherfs: rpm/fetcherfs
+	#VERSION=3.6 $(DEB_BUILD_SCRIPT) fetcherfs /opt/yunion/fetchclient/bin
+	docker run --rm \
+		--name docker-debian-build-fetcherfs \
+		-v $(CURDIR):/data \
+		registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0 \
+		/data/build/convert_rpm2deb.sh
+
 build:
 	$(MAKE) $(cmdTargets)
 
@@ -166,8 +192,7 @@ goimports-check:
 		echo "$@: working tree modified (possibly by goimports)" >&2 ; \
 		echo "$@: " >&2 ; \
 		echo "$@: import spec should be grouped in order: std, 3rd-party, yunion.io/x, yunion.io/x/onecloud" >&2 ; \
-		echo "$@: goimports should be installed by: \
-		echo "$@: git clone --depth 4 https://github.com/yunionio/tools && cd tools && go install ./cmd/goimports ; \
+		echo "$@: see \"yun\" branch at https://github.com/yousong/tools" >&2 ; \
 		false ; \
 	fi
 .PHONY: goimports-check
@@ -185,7 +210,6 @@ y18n-lang     := en-US,zh-CN
 y18n-packages := \
 		yunion.io/x/onecloud/cmd/apigateway \
 		yunion.io/x/onecloud/cmd/keystone \
-		yunion.io/x/onecloud/cmd/llm \
 		yunion.io/x/onecloud/cmd/monitor \
 		yunion.io/x/onecloud/cmd/region \
 		yunion.io/x/onecloud/cmd/yunionconf \
@@ -237,7 +261,7 @@ hostdeployer-grpc-gen:
 
 check: fmt-check
 check: gendocgo-check
-#check: goimports-check
+check: goimports-check
 #check: vet-check
 #check: y18n-check
 .PHONY: check
@@ -261,18 +285,22 @@ dep:
 	@echo "$$depDeprecated"
 	@$(MAKE) mod
 
-RELEASE_BRANCH:=master
+RELEASE_BRANCH:=release/3.12
 GOPROXY ?= direct
 
 mod:
-	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get yunion.io/x/cloudmux@$(RELEASE_BRANCH)
-	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p' | grep -v '/cloudmux$$'))
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d yunion.io/x/cloudmux@$(RELEASE_BRANCH)
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p' | grep -v '/cloudmux$$'))
 	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go mod tidy
 	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go mod vendor -v
 
 define helpText
 Build with docker
 
+	make docker-centos-build F='-j4'
+	make docker-centos-build F='-j4 cmd/region cmd/climc'
+	make docker-centos-build-stop
+
 	make docker-alpine-build F='-j4'
 	make docker-alpine-build F='-j4 cmd/host cmd/host-deployer'
 	make docker-alpine-build-stop
@@ -324,7 +352,7 @@ image:
 .PHONY: image
 
 image-telegraf-raid-plugin:
-	VERSION=v4.0-20260115.0 GOOS=linux ARCH=all make image telegraf-raid-plugin
+	VERSION=release-1.6.5 ARCH=all make image telegraf-raid-plugin
 
 %:
 	@:

Makefile.common.mk

@@ -8,7 +8,8 @@ endif
 ModBaseName:=$(notdir $(ModName))
 
 DockerImageRegistry?=registry.cn-beijing.aliyuncs.com
-DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:3.23-go-1.26.3-0
+DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:3.19.0-go-1.21.10-0
+DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:go-1.21.10-0
 
 EnvIf=$(if $($(1)),$(1)=$($(1)))
 
@@ -28,6 +29,27 @@ endef
 
 tmpName=$(ModBaseName)-$(shell date +"%Y%m%d.%H%M%S%3N")
 
+docker-centos-build: export dockerCentOSBuildCmd:=$(call dockerCentOSBuildCmd,$(F))
+docker-centos-build:
+	docker rm --force docker-centos-build-$(tmpName) &>/dev/null || true
+	docker run \
+		--rm \
+		--name docker-centos-build-$(tmpName) \
+		-v $(CURDIR):/root/go/src/yunion.io/x/$(ModBaseName) \
+		-v $(CURDIR)/_output/centos-build:/root/go/src/yunion.io/x/$(ModBaseName)/_output \
+		-v $(CURDIR)/_output/centos-build/_cache:/root/.cache \
+		$(DockerImageCentOSBuild) \
+		/bin/bash -c "$$dockerCentOSBuildCmd"
+	ls -lh _output/centos-build/bin
+
+# NOTE we need a way to stop and remove the container started by docker-build.
+# No --tty, --stop-signal won't work
+docker-centos-build-stop:
+	docker stop --time 0 docker-centos-build-$(tmpName) || true
+
+.PHONY: docker-centos-build
+.PHONY: docker-centos-build-stop
+
 
 define dockerAlpineBuildCmd
 set -o xtrace

README-CN.md

@@ -1,17 +1,14 @@
 # Cloudpods
 
 [![CircleCI](https://circleci.com/gh/yunionio/cloudpods.svg?style=svg)](https://circleci.com/gh/yunionio/cloudpods)
+[![Build Status](https://travis-ci.com/yunionio/cloudpods.svg?branch=master)](https://travis-ci.org/yunionio/cloudpods)
 [![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/cloudpods)](https://goreportcard.com/report/github.com/yunionio/cloudpods)
 
- [简体中文](./README-CN.md) | [English](./README.md)
-
 ## Cloudpods是什么?
 
 <img src="https://v1.cloudpods.org/images/cloudpods_logo_green.png" alt="Cloudpods" height="100">
 
-Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的云平台，也就是一个”云上之云”。Cloudpods不仅可以管理本地的虚拟机和物理机资源，还可以管理多个云平台和云账号。Cloudpods隐藏了这些异构基础设施资源的数据模型和API的差异，对外暴露了一套统一的API，允许用户就像用一个云一样地访问多云。从而大大降低了访问多云的复杂度，提升了管理多云的效率。
-
-Cloudpods还提供了 **AI 云**，一个面向大语言模型（LLM）推理与 AI 容器应用的统一管理平台，帮助企业在同一平台完成 AI 工作负载的部署、调度与运维，与 Cloudpods 私有云/多云资源体系无缝集成。
+Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的云平台，也就是一个“云上之云”。Cloudpods不仅可以管理本地的虚拟机和物理机资源，还可以管理多个云平台和云账号。Cloudpods隐藏了这些异构基础设施资源的数据模型和API的差异，对外暴露了一套统一的API，允许用户就像用一个云一样地访问多云。从而大大降低了访问多云的复杂度，提升了管理多云的效率。
 
 ## 谁需要Cloudpods?
 
@@ -20,25 +17,12 @@ Cloudpods还提供了 **AI 云**，一个面向大语言模型（LLM）推理与
 * 将VMware vSphere虚拟化集群转换为一个可以自服务的私有云平台
 * 在混合云的场景，能够在一个界面访问私有云和公有云
 * 通过一个集中的入口访问分布在多个公有云平台上的多个账号
-* 当前只使用一个公有云账号但希望将来使用多云的用户
-* 需要部署和管理 LLM 推理服务及 AI 容器应用，并需要 GPU 调度支持的用户
+* 当前只使用一个云公有云账号但希望将来使用多云的用户
 
 ## 功能
 
 请访问[产品介绍](https://www.cloudpods.org/docs/introduction/)页面了解详细信息。
 
-### AI 云
-
-* **AI 推理服务**：部署和管理 LLM 推理实例（支持 Ollama、vLLM、SGLang 等），支持 GPU 调度、模型挂载与推理服务地址分配。
-* **AI 应用管理**：一站式部署 LLM 应用编排、智能体助手、图像生成等 AI 容器应用。
-* **模型库**：统一管理模型来源、版本与缓存，支持多实例复用、离线分发，避免重复下载。
-* **模板与镜像**：通过模板定义 CPU/内存/GPU 等资源规格，通过镜像管理容器运行环境，实现标准化交付。
-* **GPU 运维**：GPU 设备自动探测与注册，支持 NVIDIA/CUDA 环境的统一配置与管理。
-
-支持的 AI 工作负载：
-* AI 推理：Ollama、vLLM、SGLang
-* AI 应用：OpenClaw、Dify、ComfyUI、Hermes Agent
-
 ### 支持的云平台
 
 * 公有云:
@@ -52,42 +36,36 @@ Cloudpods还提供了 **AI 云**，一个面向大语言模型（LLM）推理与
   * 天翼云
   * 移动云
   * 京东云
-  * 火山引擎
-  * 百度云
-  * 金山云
-  * 青云
-  * Oracle Cloud
-  * 联通云
 * 私有云:
   * OpenStack
   * ZStack
-  * Alibaba Cloud Apsara (阿里飞天)
+  * Alibaba Cloud Aspara (阿里飞天)
   * Huawei HCSO (华为HCSO)
   * Nutanix
-  * BingoCloud
-  * OceanBase
 * 本地基础设施资源:
   * 基于 KVM 实现的轻量级私有云
-  * VMware vSphere vCenter/ESXi
-  * Proxmox VE
-  * 裸金属 (IPMI, Redfish API)
-  * 对象存储 (Minio, Ceph, XSky)
+  * VMWare vSphere vCenter/ESXi
+  * Baremetals (IPMI, Redfish API)
+  * Object storages (Minio, Ceph, XSky)
   * NAS (Ceph)
 
 ### 支持的云资源
 
-* 服务器：实例、磁盘、网卡、网络、VPC、存储、宿主机、二层网络、快照、快照策略、安全组、弹性 IP、SSH 密钥对、镜像
-* 负载均衡：实例、监听、后端服务器组、后端服务器、TLS 证书、访问控制
-* 对象存储：存储桶、对象
-* NAS：文件系统、权限组、挂载点
-* RDS：实例、账号、备份、数据库、参数、权限
-* 弹性缓存：实例、账号、备份、参数
-* DNS：DNS 区域、DNS 记录
-* VPC：VPC、VPC 对等连接、跨 VPC 网络、NAT 网关、DNAT/SNAT 规则、路由表、路由条目
+* Servers: instances, disks, network interfaces, networks, vpcs, storages, hosts, wires, snapshots, snapshot policies, security groups, elastic IPs, SSH keypairs, images
+* Load Balancers: instances, listeners, backend groups, backends, TSL certificates, ACLs
+* Object Storage: buckets, objects
+* NAS: file_systems, access_groups, mount_targets
+* RDS: instances, accounts, backups, databases, parameters, privileges
+* Elastic Cache: instances, accounts, backups, parameters
+* DNS: DNS zones, DNS records
+* VPC: VPCs, VPC peering, inter-VPC network, NAT gateway, DNAT/SNAT rules, route tables, route entries
 
 ## 安装部署
 
-请参考文档[安装部署](https://www.cloudpods.org/docs/getting-started/)选择合适的场景部署。
+- [All in One 安装](https://www.cloudpods.org/zh/docs/quickstart/allinone-converge/)：在 CentOS 7 或 Debian 10 等发行版里搭建全功能 Cloudpods 服务，可以快速体验**内置私有云**和**多云管理**的功能。
+- [Kubernetes Helm 安装](https://www.cloudpods.org/zh/docs/quickstart/k8s/)：在已有 Kubernetes 集群上通过 Helm 部署一套 Cloudpods CMP 服务，可以体验**多云管理**的功能。
+- [Docker Compose 安装](https://www.cloudpods.org/zh/docs/quickstart/docker-compose/)：通过 Docker Compose 部署 Cloudpods CMP 服务，可以迅速体验**多云管理**的功能。
+- [高可用安装](https://www.cloudpods.org/zh/docs/setup/ha-ce/)：在生产环境中使用高可用的方式部署 Cloudpods 服务，包括**内置私有云**和**多云管理**的功能。
 
 ## 文档
 
@@ -101,9 +79,7 @@ Cloudpods还提供了 **AI 云**，一个面向大语言模型（LLM）推理与
 
 ## 联系我们
 
-* 请查看[联系我们](https://www.cloudpods.org/docs/contact/)。
-
-* TG群: [cloudpods](https://t.me/cloudpods_org)
+请查看[联系我们](https://www.cloudpods.org/docs/contact/)。
 
 ## 版本历史
 
@@ -116,7 +92,3 @@ Cloudpods还提供了 **AI 云**，一个面向大语言模型（LLM）推理与
 ## License
 
 Apache license 2.0，详情请看 [LICENSE](./LICENSE)。
-
-## AI生成文档
-
-[DeepWiki](https://deepwiki.com/yunionio/cloudpods) 提供了对本项目代码详细和全面的AI解读，可以参考。

README.md

@@ -1,6 +1,7 @@
 # Cloudpods
 
 [![CircleCI](https://circleci.com/gh/yunionio/cloudpods.svg?style=svg)](https://circleci.com/gh/yunionio/cloudpods)
+[![Build Status](https://travis-ci.com/yunionio/cloudpods.svg?branch=master)](https://travis-ci.com/yunionio/cloudpods/branches)
 [![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/cloudpods)](https://goreportcard.com/report/github.com/yunionio/cloudpods)
 
 [English](./README.md) | [简体中文](./README-CN.md)
@@ -11,34 +12,19 @@
 
 Cloudpods is a cloud-native open source unified multi/hybrid-cloud platform developed with Golang, i.e. Cloudpods is *a cloud on clouds*. Cloudpods is able to manage not only on-premise KVM/baremetals, but also resources from many cloud accounts across many cloud providers. It hides the differences of underlying cloud providers and exposes one set of APIs that allow programatically interacting with these many clouds.
 
-Cloudpods also provides **AI Cloud**, a unified management platform for large language model (LLM) inference and AI container applications, helping enterprises deploy, schedule, and operate AI workloads on a single platform, seamlessly integrated with the Cloudpods private cloud / multi-cloud resource ecosystem.
-
 ## Who needs Cloudpods?
 
 * Those who need a simple solution to virtualize a few physical servers into a private cloud
 * Those who need a compact and fully automatic baremetal lift-cycle management solution
 * Those who want to turn a VMware vSphere virtualization cluster into a private cloud
 * Those who need a cohesive view of both public and private cloud in a hybrid cloud setup
-* Those who need a centric portal to access multiple accounts from multiple public clouds
+* Those who need a centric portal to access multiple acccounts from multiple public clouds
 * Those who is currently using a single cloud account, but will not lose the possibility to adopt multicloud strategy
-* Those who need to deploy and manage LLM inference services and AI container applications with GPU support
 
 ## Features
 
 See [Introduction](https://www.cloudpods.org/docs/introduction/) for details.
 
-### AI Cloud
-
-* **AI Inference Services**: Deploy and manage LLM inference instances (Ollama, vLLM, SGLang, and more) with GPU scheduling, model mounting, and inference service address allocation.
-* **AI Application Management**: One-stop deployment of LLM application orchestration, agent assistants, image generation, and other AI container applications.
-* **Model Library**: Unified management of model sources, versions, and caches, supporting multi-instance reuse and offline distribution.
-* **Templates and Images**: Define resource specifications (CPU/memory/GPU) through templates, manage container runtime environments through images.
-* **GPU Operations**: Automatic GPU device detection and registration, unified NVIDIA/CUDA environment configuration and management.
-
-Supported AI workloads:
-* AI Inference: Ollama, vLLM, SGLang
-* AI Applications: OpenClaw, Dify, ComfyUI, Hermes Agent
-
 ### Supported cloud providers
 
 * Public Clouds:
@@ -52,24 +38,15 @@ Supported AI workloads:
   * Ctyun (China Telecom)
   * ECloud (China Mobile)
   * JDCloud
-  * Volcengine
-  * Baidu Cloud
-  * Kingsoft Cloud
-  * QingCloud
-  * Oracle Cloud
-  * China Unicom Cloud
 * Private Clouds:
   * OpenStack
   * ZStack
-  * Alibaba Cloud Apsara
+  * Alibaba Cloud Aspara
   * Huawei HCSO
   * Nutanix
-  * BingoCloud
-  * OceanBase
 * On-premise resources:
   * Lightweight private cloud built on KVM
-  * VMware vSphere vCenter/ESXi
-  * Proxmox VE
+  * VMWare vSphere vCenter/ESXi
   * Baremetals (IPMI, Redfish API)
   * Object storages (Minio, Ceph, XSky)
   * NAS (Ceph)
@@ -77,7 +54,7 @@ Supported AI workloads:
 ### Supported resources
 
 * Servers: instances, disks, network interfaces, networks, vpcs, storages, hosts, wires, snapshots, snapshot policies, security groups, elastic IPs, SSH keypairs, images
-* Load Balancers: instances, listeners, backend groups, backends, TLS certificates, ACLs
+* Load Balancers: instances, listeners, backend groups, backends, TSL certificates, ACLs
 * Object Storage: buckets, objects
 * NAS: file_systems, access_groups, mount_targets
 * RDS: instances, accounts, backups, databases, parameters, privileges
@@ -87,7 +64,10 @@ Supported AI workloads:
 
 ## Getting started
 
-Please refer to the document [Getting Started](https://www.cloudpods.org/en/docs/getting-started/) to select the appropriate scenario for installation.
+- [All in One Installation](https://www.cloudpods.org/zh/docs/quickstart/allinone-converge/)：Building a full-featured Cloudpods service on linux distributions such as CentOS 7 or Debian 10 allows for a quick experience of the **built-in private cloud** and **multi-cloud management** features.
+- [Kubernetes Helm Installation](https://www.cloudpods.org/zh/docs/quickstart/k8s/)：Deploying the Cloudpods CMP service on an existing Kubernetes cluster using Helm and experience the **multi-cloud management** feature.
+- [Docker Compose Installation](https://www.cloudpods.org/zh/docs/quickstart/docker-compose/)：Deploying the Cloudpods CMP service using Docker Compose and quickly experience the **multi-cloud management** feature.
+- [High availability installation](https://www.cloudpods.org/zh/docs/setup/ha-ce/)：Deploying Cloudpods services in a highly available manner for production environments, including **built-in private cloud** and **multi-cloud management** features.
 
 ## Documentations
 
@@ -102,13 +82,11 @@ Please check this [issue](https://github.com/yunionio/cloudpods/issues/11427) fo
 
 ## Contact
 
-* See [Contact Us](https://www.cloudpods.org/en/docs/contact/) for details.
-
-* Telegram: [cloudpods](https://t.me/cloudpods_org)
+See [Contact Us](https://www.cloudpods.org/en/docs/contact/) for details.
 
 ## Changelog
 
-See [Release Notes](https://www.cloudpods.org/en/docs/release-notes/) and [Changelog](https://www.cloudpods.org/en/docs/development/changelog/) for details.
+See [Relase Notes](https://www.cloudpods.org/en/docs/release-notes/) and [Changelog](https://www.cloudpods.org/en/docs/development/changelog/) for details.
 
 ## Contribution
 
@@ -117,7 +95,3 @@ You are welcome to do any kind of contribution to the project. Please refer to [
 ## License
 
 Apache License 2.0. See [LICENSE](./LICENSE).
-
-## AI-generated doc
-
-[DeepWiki](https://deepwiki.com/yunionio/cloudpods) provides an amazing AI-generated doc of this project, you may refer to it for more detailed and comprehensive understanding of codes.

build/aiproxy/vars

@@ -1 +0,0 @@
-DESCRIPTION="Yunion Cloud AI Proxy Service"

build/build.sh

@@ -36,12 +36,6 @@ fi
 . $ROOT/vars
 
 BUILDROOT=$(mktemp -d 2>/dev/null || mktemp -d -t 'yunion')
-function cleanup {
-  rm -rf "$BUILDROOT"
-  echo "Deleted temp working directory $BUILDROOT"
-}
-# register the cleanup function to be called on the EXIT signal
-trap cleanup EXIT
 
 echo "Build root ${BUILDROOT}"
 
@@ -79,8 +73,6 @@ echo "# Yunion RPM spec
 %global pkgname yunion-$PKG
 %global homedir /var/run/%{owner}
 %global use_systemd $SERVICE
-%global debug_package %{nil}
-%global __strip /usr/bin/eu-strip
 
 Name: %{pkgname}
 Version: $VERSION
@@ -112,87 +104,41 @@ if [ -d $ROOT/root ]; then
   rsync -a $ROOT/root/ \$RPM_BUILD_ROOT
 fi
 
-%pre" > $SPEC_FILE
-
-if [ -f $ROOT/preinst ]; then
-    cat $ROOT/preinst >> $SPEC_FILE
-else
-    echo "
+%pre
 %if %{use_systemd}
 getent group %{owner} >/dev/null || /usr/sbin/groupadd -r %{owner}
 getent passwd %{owner} >/dev/null || /usr/sbin/useradd -r -s /sbin/nologin -d %{homedir} -M -g %{owner} %{owner}
 %endif
-" >> $SPEC_FILE
-fi
 
-echo "
-%post" >> $SPEC_FILE
-
-if [ -f $ROOT/postinst ]; then
-    cat $ROOT/postinst >> $SPEC_FILE
-else
-    echo "
+%post
 %if %{use_systemd}
+    mkdir -p /var/run/%{owner}
+    chown -R %{owner}:%{owner} /var/run/%{owner}
     /usr/bin/systemctl preset %{pkgname}.service >/dev/null 2>&1 ||:
 %endif
-" >> $SPEC_FILE
-fi
 
-echo "
-%preun" >> $SPEC_FILE
-
-if [ -f $ROOT/prerm ]; then
-    cat $ROOT/prerm >> $SPEC_FILE
-else
-    echo "
+%preun
 %if %{use_systemd}
     /usr/bin/systemctl --no-reload disable %{pkgname}.service >/dev/null 2>&1 || :
     /usr/bin/systemctl stop %{pkgname}.service >/dev/null 2>&1 ||:
 %endif
-" >> $SPEC_FILE
-fi
 
-echo "
-%postun" >> $SPEC_FILE
-
-if [ -f $ROOT/postrm ]; then
-    cat $ROOT/postrm >> $SPEC_FILE
-else
-    echo "
+%postun
 %if %{use_systemd}
     /usr/bin/systemctl daemon-reload >/dev/null 2>&1 ||:
 %endif
-" >> $SPEC_FILE
-fi
 
-echo -n "
 %files
 %doc
 $BIN_PATH/$PKG
-" >> $SPEC_FILE
-
-for b in $EXTRA_BINS; do
-    echo $BIN_PATH/$b >> $SPEC_FILE
-done
+$(for b in $EXTRA_BINS; do echo $BIN_PATH/$b; done)
+" > $SPEC_FILE
 
 if [ -d $ROOT/root/ ]; then
     find $ROOT/root/ -type f | sed -e "s:$ROOT/root::g" >> $SPEC_FILE
 fi
 
-TARGET=
-case "$GOARCH" in
-    "arm64" | "aarch64" | "arm")
-        TARGET="--target aarch64-redhat-linux"
-        ;;
-    "amd64" | "x86" | "i686" | "i386" | "x86_64")
-        TARGET="--target x86_64-redhat-linux"
-        ;;
-    "riscv64")
-        TARGET="--target riscv64-linux"
-        ;;
-esac
-
-rpmbuild --define "_topdir $BUILDROOT" -bb $SPEC_FILE $TARGET
+rpmbuild --define "_topdir $BUILDROOT" -bb $SPEC_FILE
 
 find $RPM_DIR -type f | while read f; do
 	d="$(dirname "$f")"
@@ -200,3 +146,5 @@ find $RPM_DIR -type f | while read f; do
 	mkdir -p "$d"
 	cp $f $d
 done
+
+rm -fr $BUILDROOT

build/build_deb.sh

@@ -35,48 +35,14 @@ fi
 
 . $ROOT/vars
 
-case $(uname -m) in
-    x86_64)
-        CURRENT_ARCH=amd64
-        ;;
-    aarch64)
-        CURRENT_ARCH=arm64
-        ;;
-    riscv64)
-        CURRENT_ARCH=riscv64
-        ;;
-esac
-
-if [[ -n "$GOARCH" ]]; then
-    case "$GOARCH" in
-        "arm64" | "arm" | "aarch64")
-            CURRENT_ARCH="arm64"
-            ;;
-        "x86" | "x86_64" | "i686" | "i386" | "amd64")
-            CURRENT_ARCH="amd64"
-            ;;
-        "riscv64")
-            CURRENT_ARCH="riscv64"
-            ;;
-	esac
-fi
-
 if [ -z "$VERSION" ]; then
     TAG=$(git describe --abbrev=0 --tags || echo 000000)
     VERSION=${TAG/\//-}
     VERSION=${VERSION/v/}
-    VERSION=${VERSION/master-/}
 fi
 RELEASE=`date +"%y%m%d%H"`
 FULL_VERSION=$VERSION-$RELEASE
-BUILDROOT=$OUTPUT_DIR/yunion-${PKG}-${FULL_VERSION}_${CURRENT_ARCH}
-function cleanup {
-  rm -rf "$BUILDROOT"
-  echo "Deleted temp working directory $BUILDROOT"
-}
-# register the cleanup function to be called on the EXIT signal
-trap cleanup EXIT
-
+BUILDROOT=$OUTPUT_DIR/yunion-$1-$FULL_VERSION
 rm -rf $BUILDROOT
 mkdir -p $BUILDROOT/DEBIAN
 mkdir -p $BUILDROOT/$BIN_PATH
@@ -86,90 +52,27 @@ if [ -d $ROOT/root ]; then
     cp -rf $ROOT/root/* $BUILDROOT/
 fi
 
+
 echo "Build root ${BUILDROOT}"
 
-echo "Package: yunion-$PKG
+case $(uname -m) in
+    x86_64)
+        CURRENT_ARCH=amd64
+        ;;
+    aarch64)
+        CURRENT_ARCH=arm64
+        ;;
+esac
+
+echo "Package: yunion-$1
 Version: $FULL_VERSION
 Section: base
 Priority: optional
 Architecture: $CURRENT_ARCH
 Maintainer: wanyaoqi@yunionyun.com
-Description: $DESCRIPTION" > $BUILDROOT/DEBIAN/control
-if [ ${#REQUIRES[@]} -gt 0 ]; then
-    DEPS=$(IFS=, ; echo "${REQUIRES[*]}")
-    echo "Depends: $DEPS" >> $BUILDROOT/DEBIAN/control
-fi
+Description: Yunion $1
+" > $BUILDROOT/DEBIAN/control
 chmod 0755 $BUILDROOT/DEBIAN/control
 
-cat $BUILDROOT/DEBIAN/control
 
-echo "#!/bin/bash
-" > $BUILDROOT/DEBIAN/preinst
-if [ -f $ROOT/preinst ]; then
-    cat $ROOT/preinst >> $BUILDROOT/DEBIAN/preinst
-else
-    if [ "$SERVICE" == "yes" ] && [ -n "$OWNER" ]; then
-        echo "
-getent group ${OWNER} >/dev/null || /usr/sbin/groupadd -r ${OWNER}
-getent passwd ${OWNER} >/dev/null || /usr/sbin/useradd -r -s /sbin/nologin -d /home/${OWNER} -M -g ${OWNER} ${OWNER}
-" >> $BUILDROOT/DEBIAN/preinst
-    fi
-fi
-chmod 0755 $BUILDROOT/DEBIAN/preinst
-
-echo "#!/bin/bash
-" > $BUILDROOT/DEBIAN/postinst
-if [ -f $ROOT/postinst ]; then
-    cat $ROOT/postinst >> $BUILDROOT/DEBIAN/postinst
-else
-    if [ "$SERVICE" == "yes" ]; then
-        echo "
-/usr/bin/systemctl preset yunion-${PKG}.service >/dev/null 2>&1 ||:
-" >> $BUILDROOT/DEBIAN/postinst
-    fi
-fi
-chmod 0755 $BUILDROOT/DEBIAN/postinst
-
-echo "#!/bin/bash
-" > $BUILDROOT/DEBIAN/prerm
-if [ -f $ROOT/prerm ]; then
-    cat $ROOT/prerm >> $BUILDROOT/DEBIAN/prerm
-else
-    if [ "$SERVICE" == "yes" ]; then
-        echo "
-/usr/bin/systemctl --no-reload disable yunion-${PKG}.service >/dev/null 2>&1 || :
-/usr/bin/systemctl stop yunion-${PKG}.service >/dev/null 2>&1 ||:
-" >> $BUILDROOT/DEBIAN/prerm
-    fi
-fi
-chmod 0755 $BUILDROOT/DEBIAN/prerm
-
-echo "#!/bin/bash
-" > $BUILDROOT/DEBIAN/postrm
-if [ -f $ROOT/postrm ]; then
-    cat $ROOT/postrm >> $BUILDROOT/DEBIAN/postrm
-else
-    if [ "$SERVICE" == "yes" ]; then
-        echo "
-/usr/bin/systemctl daemon-reload >/dev/null 2>&1 ||:
-" >> $BUILDROOT/DEBIAN/postrm
-    fi
-fi
-chmod 0755 $BUILDROOT/DEBIAN/postrm
-
-dpkg-deb --build $BUILDROOT
-
-case "$CURRENT_ARCH" in
-    "amd64")
-        DSTARCH="x86_64"
-        ;;
-    "arm64")
-        DSTARCH="aarch64"
-        ;;
-    "riscv64")
-        DSTARCH="riscv64"
-        ;;
-esac
-
-mkdir -p ${OUTPUT_DIR}/${DSTARCH}
-mv ${BUILDROOT}.deb ${OUTPUT_DIR}/${DSTARCH}/
+dpkg-deb --build $BUILDROOT

build/docker/Dockerfile.aiproxy

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
-
-ADD ./_output/alpine-build/bin/aiproxy /opt/yunion/bin/aiproxy

build/docker/Dockerfile.ansibleserver

@@ -1,8 +1,7 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.1.1
 
-# https://github.com/yunionio/telegraf/blob/yn-release-1.36/Makefile.yn#L28
 # install playbook and telegraf install pkg
-COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.5 /opt/yunion/playbook /opt/yunion/playbook
-COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.5 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg
+COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.2 /opt/yunion/playbook /opt/yunion/playbook
+COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.2 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg
 
 ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver

build/docker/Dockerfile.ansibleserver-base

@@ -1,8 +1,8 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
 
-LABEL maintainer="Yousong Zhou <zhouyousong@yunionyun.com>"
+MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
 
-ENV TZ="UTC"
+ENV TZ UTC
 
 RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
 
@@ -13,7 +13,6 @@ RUN set -x \
   && apk add openssh-client \
   && apk add sshpass \
   && apk add py3-pip \
-  && apk add py3-paramiko \
   && apk add tzdata git ca-certificates
 
 RUN apk add --no-cache openssh openssl curl rsync pv mariadb-client
@@ -22,10 +21,8 @@ RUN apk add --no-cache --virtual .build-dependencies \
 
 # ansible should be installed
 # after setuptools and wheel
-RUN rm /usr/lib/python3.*/EXTERNALLY-MANAGED
 RUN pip3 install -U pip setuptools wheel \
-  && pip3 install mysqlclient pywinrm \
+  && pip3 install paramiko mysqlclient pywinrm \
   && pip3 install 'ansible<=9.0.0' \
   && apk del --no-network .build-dependencies \
   && rm -rf /root/.cache /root/.cargo /var/cache/apk/*
-

build/docker/Dockerfile.apigateway

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/apigateway /opt/yunion/bin/apigateway

build/docker/Dockerfile.apimap

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/apimap /opt/yunion/bin/apimap

build/docker/Dockerfile.baremetal-agent

@@ -1,8 +1,8 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.9-20260724.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.9-20231219.0
 
-LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
 RUN mkdir -p /opt/yunion/bin
 
-ENV TZ="UTC"
+ENV TZ UTC
 ADD ./_output/alpine-build/bin/baremetal-agent /opt/yunion/bin/baremetal-agent

build/docker/Dockerfile.baremetal-base

@@ -1,8 +1,9 @@
+#FROM --platform=linux/amd64 registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-4 as build
 #RUN yum install -y https://iso.yunion.cn/vm-images/baremetal-pxerom-1.1.0-21092209.x86_64.rpm
 #RUN yum install -y http://192.168.23.50:8083/baremetal-pxerom-1.1.0-21092209.x86_64.rpm
-FROM registry.cn-beijing.aliyuncs.com/yunionio/yunionos:v4.0.0-20251203.0 as yunionos
+FROM registry.cn-beijing.aliyuncs.com/yunionio/yunionos:v3.10.8-20231215.0 as yunionos
 
-FROM registry.cn-beijing.aliyuncs.com/cloudpods/centos:8 as grub-stage
+FROM centos:8 as grub-stage
 
 RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
 RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
@@ -27,9 +28,9 @@ RUN cp /root/grub_arm64.efi /tftp
 RUN cp -rf /usr/lib/grub/arm64-efi /tftp/grub
 
 
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3-3.13.5
 
-LABEL maintainer="Zexi Li <zexi.li@icloud.com>"
+MAINTAINER "Zexi Li <zexi.li@icloud.com>"
 
 RUN mkdir -p /opt/yunion/bin
 
@@ -69,8 +70,6 @@ COPY --from=yunionos /yunionos/x86_64/kernel /opt/cloud/yunion/baremetal
 COPY --from=yunionos /yunionos/x86_64/initramfs /opt/cloud/yunion/baremetal
 COPY --from=yunionos /yunionos/aarch64/kernel /opt/cloud/yunion/baremetal/kernel_aarch64
 COPY --from=yunionos /yunionos/aarch64/initramfs /opt/cloud/yunion/baremetal/initramfs_aarch64
-COPY --from=yunionos /yunionos/riscv64/kernel /opt/cloud/yunion/baremetal/kernel_riscv64
-COPY --from=yunionos /yunionos/riscv64/initramfs /opt/cloud/yunion/baremetal/initramfs_riscv64
 
 # TODO: syslinux firmwares should removed in future
 COPY --from=yunionos /yunionos/x86_64/isolinux.bin /opt/cloud/yunion/baremetal

build/docker/Dockerfile.climc

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:3.22.2-2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20230731.5
 
 ADD ./build/climc/root/opt /opt
 

build/docker/Dockerfile.climc-base

@@ -4,9 +4,9 @@ ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 ARG TARGETARCH
 
-LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
-ENV TZ="Asia/Shanghai"
+ENV TZ Asia/Shanghai
 
 RUN mkdir -p /opt/yunion/bin
 

build/docker/Dockerfile.climc-base-3-22-2

@@ -1,24 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
-
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-ARG TARGETARCH
-
-LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
-
-ENV TZ="Asia/Shanghai"
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositories
-
-RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim ipmitool ceph-common dropbear shadow && \
-    rm -rf /var/cache/apk/*
-
-RUN usermod --shell /bin/bash root
-
-RUN curl -L https://iso.yunion.cn/binaries/kubernetes-release/release/v1.22.9/bin/linux/${TARGETARCH}/kubectl -o /usr/bin/kubectl && chmod a+x /usr/bin/kubectl
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-
-RUN mkdir -p /opt/yunion/bin

build/docker/Dockerfile.cloudevent

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/cloudevent /opt/yunion/bin/cloudevent

build/docker/Dockerfile.cloudid

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 COPY ./build/cloudid/root/opt/ /opt/
 ADD ./_output/alpine-build/bin/cloudid /opt/yunion/bin/cloudid

build/docker/Dockerfile.cloudmon

@@ -1,6 +1,6 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
-LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
 RUN mkdir -p /etc/yunion/data/
 

build/docker/Dockerfile.cloudnet

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/cloudnet /opt/yunion/bin/cloudnet

build/docker/Dockerfile.cloudproxy

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/cloudproxy /opt/yunion/bin/cloudproxy

build/docker/Dockerfile.debian-base

@@ -1,6 +1,6 @@
 # registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0
 
-FROM debian:trixie
+FROM debian:10
 
 RUN apt update && apt install -y alien
 

build/docker/Dockerfile.devtool

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/devtool /opt/yunion/bin/devtool

build/docker/Dockerfile.dhcprelay

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/dhcprelay /opt/yunion/bin/dhcprelay
 

build/docker/Dockerfile.esxi-agent

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/esxi-agent /opt/yunion/bin/esxi-agent

build/docker/Dockerfile.file-repo

@@ -0,0 +1,26 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.4.0 as file-repo
+
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+
+MAINTAINER "Rain Zheng <zhengyu@yunion.com>"
+
+# openssh-client, for ansible ssh connection
+# git, ca-certificates, for fetching ansible roles
+RUN set -x \
+	&& apk update \
+	&& apk add git \
+	&& rm -rf /var/cache/apk/*
+
+# install default playbook and install pkg
+Run mkdir -p /opt/yunion/ansible-install-pkg
+
+COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf-1.19.2-yn~be742cbf-0.x86_64.rpm /opt/yunion/ansible-install-pkg
+COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf-1.19.2-yn~be742cbf-0.aarch64.rpm /opt/yunion/ansible-install-pkg
+COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf_1.19.2-yn~be742cbf-0_arm64.deb /opt/yunion/ansible-install-pkg
+COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf_1.19.2-yn~be742cbf-0_amd64.deb /opt/yunion/ansible-install-pkg
+COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf-1.19.2-yn~be742cbf_windows_amd64.zip /opt/yunion/ansible-install-pkg
+COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf-1.19.2-yn~be742cbf_windows_i386.zip /opt/yunion/ansible-install-pkg
+
+Run mkdir -p /opt/yunion/playbook
+Run mkdir /opt/yunion/playbook/monitor-agent
+Run git clone https://github.com/yunionio/monitor-agent.git /opt/yunion/playbook/monitor-agent --recurse-submodules

build/docker/Dockerfile.glance

@@ -1,5 +1,5 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/glance-base:3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/glance-base:v0.0.1
 
-ENV TZ="UTC"
+ENV TZ UTC
 RUN mkdir -p /opt/yunion/bin
 ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance

build/docker/Dockerfile.glance-base

@@ -1,7 +1,5 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20210815.0
 
-LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
-RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
-
-RUN apk add --no-cache s3fs-fuse
+RUN apk add --no-cache s3fs-fuse --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing

build/docker/Dockerfile.guacd

@@ -22,25 +22,44 @@
 #
 
 # The Alpine Linux image that should be used as the basis for the guacd image
-ARG ALPINE_BASE_IMAGE=3.22.2
+ARG ALPINE_BASE_IMAGE=latest
+FROM alpine:${ALPINE_BASE_IMAGE} AS builder
 
-# The target architecture of the build. Valid values are "ARM" and "X86". By
-# default, this is detected automatically.
-ARG BUILD_ARCHITECTURE
+ARG TARGETPLATFORM
 
-# The number of processes that may run simultaneously during the build. By
-# default, this is detected automatically.
-ARG BUILD_JOBS
+RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
 
-# The directory that will house the guacamole-server source during the build 
+# Install build dependencies
+RUN apk add --no-cache                \
+        autoconf                      \
+        automake                      \
+        build-base                    \
+        cairo-dev                     \
+        cmake                         \
+        cunit-dev                     \
+        git                           \
+        grep                          \
+        libjpeg-turbo-dev             \
+        libpng-dev                    \
+        libtool                       \
+        libwebp-dev                   \
+        make                          \
+        openssl1.1-compat-dev         \
+        pango-dev                     \
+        pulseaudio-dev                \
+        util-linux-dev
+
+# Copy source to container for sake of build
 ARG BUILD_DIR=/tmp/guacamole-server
+ARG GUAC_VER=1.5.3
+RUN git clone --branch=${GUAC_VER} https://github.com/apache/guacamole-server.git /tmp/guacamole-server
 
-# FreeRDP version (default to version 2)
-ARG FREERDP_VERSION=2
-
-# The final install location for guacamole-server and all dependencies. NOTE:
-# This value is hard-coded in the entrypoint. Any change to this value must be
-# propagated there.
+#
+# Base directory for installed build artifacts.
+#
+# NOTE: Due to limitations of the Docker image build process, this value is
+# duplicated in an ARG in the second stage of the build.
+#
 ARG PREFIX_DIR=/opt/guacamole
 
 #
@@ -48,12 +67,11 @@ ARG PREFIX_DIR=/opt/guacamole
 # library (these can be overridden at build time if a specific version is
 # needed)
 #
-ARG WITH_FREERDP="${FREERDP_VERSION}(\.\d+)+"
+ARG WITH_FREERDP='2(\.\d+)+'
 ARG WITH_LIBSSH2='libssh2-\d+(\.\d+)+'
 ARG WITH_LIBTELNET='\d+(\.\d+)+'
 ARG WITH_LIBVNCCLIENT='LibVNCServer-\d+(\.\d+)+'
 ARG WITH_LIBWEBSOCKETS='v\d+(\.\d+)+'
-ARG WITH_GUACAMOLE_SERVER='\d+(\.\d+)+'
 
 #
 # Default build options for each core protocol support library, as well as
@@ -61,8 +79,6 @@ ARG WITH_GUACAMOLE_SERVER='\d+(\.\d+)+'
 # options are needed)
 #
 
-ARG FREERDP_ARM_OPTS=""
-
 ARG FREERDP_OPTS="\
     -DBUILTIN_CHANNELS=OFF \
     -DCHANNEL_URBDRC=OFF \
@@ -73,25 +89,22 @@ ARG FREERDP_OPTS="\
     -DWITH_CUPS=OFF \
     -DWITH_DIRECTFB=OFF \
     -DWITH_FFMPEG=OFF \
-    -DWITH_FUSE=OFF \
     -DWITH_GSM=OFF \
     -DWITH_GSSAPI=OFF \
     -DWITH_IPP=OFF \
     -DWITH_JPEG=ON \
-    -DWITH_KRB5=ON \
     -DWITH_LIBSYSTEMD=OFF \
     -DWITH_MANPAGES=OFF \
     -DWITH_OPENH264=OFF \
     -DWITH_OPENSSL=ON \
     -DWITH_OSS=OFF \
     -DWITH_PCSC=OFF \
-    -DWITH_PKCS11=OFF \
     -DWITH_PULSE=OFF \
     -DWITH_SERVER=OFF \
     -DWITH_SERVER_INTERFACE=OFF \
     -DWITH_SHADOW_MAC=OFF \
     -DWITH_SHADOW_X11=OFF \
-    -DWITH_SWSCALE=OFF \
+    -DWITH_SSE2=ON \
     -DWITH_WAYLAND=OFF \
     -DWITH_X11=OFF \
     -DWITH_X264=OFF \
@@ -103,47 +116,21 @@ ARG FREERDP_OPTS="\
     -DWITH_XRENDER=OFF \
     -DWITH_XTEST=OFF \
     -DWITH_XV=OFF \
-    -DCMAKE_CXX_FLAGS=-Wno-incompatible-pointer-types \
-    -DCMAKE_C_FLAGS=-Wno-incompatible-pointer-types \
-    -DWITH_ZLIB=ON" 
-
-
-ARG FREERDP_X86_OPTS=""
-
-ARG GUACAMOLE_SERVER_ARM_OPTS=""
+    -DWITH_ZLIB=ON"
 
 ARG GUACAMOLE_SERVER_OPTS="\
-    --disable-guaclog \
-    CPPFLAGS=-Wno-error=deprecated-declarations"
-
-ARG GUACAMOLE_SERVER_X86_OPTS=""
-ARG GUACAMOLE_SERVER_UNKNOWN_OPTS=""
-
-ARG LIBSSH2_ARM_OPTS=""
-
+    --disable-guaclog"
 
 ARG LIBSSH2_OPTS="\
     -DBUILD_EXAMPLES=OFF \
     -DBUILD_SHARED_LIBS=ON"
 
-ARG LIBSSH2_X86_OPTS=""
-
-ARG LIBTELNET_ARM_OPTS=""
-
 ARG LIBTELNET_OPTS="\
     --disable-static \
     --disable-util"
 
-ARG LIBTELNET_X86_OPTS=""
-
-ARG LIBVNCCLIENT_ARM_OPTS=""
-
 ARG LIBVNCCLIENT_OPTS=""
 
-ARG LIBVNCCLIENT_X86_OPTS=""
-
-ARG LIBWEBSOCKETS_ARM_OPTS=""
-
 ARG LIBWEBSOCKETS_OPTS="\
     -DDISABLE_WERROR=ON \
     -DLWS_WITHOUT_SERVER=ON \
@@ -154,179 +141,45 @@ ARG LIBWEBSOCKETS_OPTS="\
     -DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \
     -DLWS_WITH_STATIC=OFF"
 
-ARG LIBWEBSOCKETS_X86_OPTS=""
+# Build guacamole-server and its core protocol library dependencies
+RUN echo "$TARGETPLATFORM"
+RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; \
+    then FREERDP_OPTS="${FREERDP_OPTS}    -DWITH_SSE2=ON" && echo "SSE2 active"; \
+    else FREERDP_OPTS="${FREERDP_OPTS}    -DWITH_SSE2=OFF" && echo "SSE2 disabled"; \
+    fi && ${BUILD_DIR}/src/guacd-docker/bin/build-all.sh
 
-#
-# Base builder image that will be used by subsequent build stages, including
-# for building dependencies of guacamole-server.
-#
-
-FROM alpine:${ALPINE_BASE_IMAGE} AS builder
-ARG BUILD_DIR
-
-RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
-
-# Install build dependencies
-RUN apk add                           \
-        autoconf                      \
-        automake                      \
-        build-base                    \
-        cairo-dev                     \
-        cjson-dev                     \
-        cmake                         \
-        cunit-dev                     \
-        git                           \
-        grep                          \
-        krb5-dev                      \
-        libjpeg-turbo-dev             \
-        libpng-dev                    \
-        libtool                       \
-        libwebp-dev                   \
-        make                          \
-        openssl-dev                   \
-        pango-dev                     \
-        pulseaudio-dev                \
-        sdl2-dev                      \
-        sdl2_ttf-dev                  \
-        util-linux-dev                
-
-ARG GUAC_VER=1.6.0
-RUN git clone --branch=${GUAC_VER} https://github.com/apache/guacamole-server.git ${BUILD_DIR}
-        
-        
-#
-# Build dependency: libssh2
-#
-
-FROM builder AS libssh2
-ARG BUILD_DIR
-ARG LIBSSH2_ARM_OPTS
-ARG LIBSSH2_OPTS
-ARG LIBSSH2_X86_OPTS
-ARG PREFIX_DIR
-ARG WITH_LIBSSH2
-
-RUN ${BUILD_DIR}/src/guacd-docker/bin/autobuild.sh "LIBSSH2" \
-    "https://github.com/libssh2/libssh2"
-
-#
-# Build dependency: libtelnet
-#
-
-FROM builder AS libtelnet
-ARG BUILD_DIR
-ARG LIBTELNET_ARM_OPTS
-ARG LIBTELNET_OPTS
-ARG LIBTELNET_X86_OPTS
-ARG PREFIX_DIR
-ARG WITH_LIBTELNET
-
-RUN ${BUILD_DIR}/src/guacd-docker/bin/autobuild.sh "LIBTELNET" \
-    "https://github.com/seanmiddleditch/libtelnet"
-
-#
-# Build dependency: libvncclient
-#
-
-FROM builder AS libvncclient
-ARG BUILD_DIR
-ARG LIBVNCCLIENT_ARM_OPTS
-ARG LIBVNCCLIENT_OPTS
-ARG LIBVNCCLIENT_X86_OPTS
-ARG PREFIX_DIR
-ARG WITH_LIBVNCCLIENT
-
-RUN ${BUILD_DIR}/src/guacd-docker/bin/autobuild.sh "LIBVNCCLIENT" \
-    "https://github.com/LibVNC/libvncserver"
-
-#
-# Build dependency: libwebsockets
-#
-
-FROM builder AS libwebsockets
-ARG BUILD_DIR
-ARG LIBWEBSOCKETS_ARM_OPTS
-ARG LIBWEBSOCKETS_OPTS
-ARG LIBWEBSOCKETS_X86_OPTS
-ARG PREFIX_DIR
-ARG WITH_LIBWEBSOCKETS
-
-RUN ${BUILD_DIR}/src/guacd-docker/bin/autobuild.sh "LIBWEBSOCKETS" \
-    "https://github.com/warmcat/libwebsockets"
-
-#
-# Build dependency: FreeRDP
-#
-
-FROM builder AS freerdp
-ARG BUILD_DIR
-ARG FREERDP_ARM_OPTS
-ARG FREERDP_OPTS
-ARG FREERDP_X86_OPTS
-ARG PREFIX_DIR
-ARG WITH_FREERDP
-
-RUN ${BUILD_DIR}/src/guacd-docker/bin/autobuild.sh "FREERDP" \
-    "https://github.com/FreeRDP/FreeRDP"
-
-#
-# STAGE 7: Collect dependencies built by previous stages and build
-# guacamole-server.
-#
-
-FROM builder AS guacamole-server
-ARG BUILD_DIR
-ARG FREERDP_VERSION
-ARG GUACAMOLE_SERVER_ARM_OPTS
-ARG GUACAMOLE_SERVER_UNKNOWN_OPTS
-ARG GUACAMOLE_SERVER_OPTS
-ARG GUACAMOLE_SERVER_X86_OPTS
-ARG PREFIX_DIR
-ARG WITH_GUACAMOLE_SERVER
-
-# Copy dependencies built in previous stages
-COPY --from=freerdp ${PREFIX_DIR} ${PREFIX_DIR}
-COPY --from=libssh2 ${PREFIX_DIR} ${PREFIX_DIR}
-COPY --from=libtelnet ${PREFIX_DIR} ${PREFIX_DIR}
-COPY --from=libvncclient ${PREFIX_DIR} ${PREFIX_DIR}
-COPY --from=libwebsockets ${PREFIX_DIR} ${PREFIX_DIR}
-
-# Use guacamole-server source from build context
-
-COPY --from=builder ${BUILD_DIR} ${BUILD_DIR}
-
-RUN ${BUILD_DIR}/src/guacd-docker/bin/autobuild.sh "GUACAMOLE_SERVER" "${BUILD_DIR}"
-
-# Determine location of the FREERDP library based on the version.
-ARG FREERDP_LIB_PATH=${PREFIX_DIR}/lib/freerdp${FREERDP_VERSION}
 
 # Record the packages of all runtime library dependencies
 RUN ${BUILD_DIR}/src/guacd-docker/bin/list-dependencies.sh \
         ${PREFIX_DIR}/sbin/guacd               \
         ${PREFIX_DIR}/lib/libguac-client-*.so  \
-        ${FREERDP_LIB_PATH}/*guac*.so   \
+        ${PREFIX_DIR}/lib/freerdp2/*guac*.so   \
         > ${PREFIX_DIR}/DEPENDENCIES
 
-#
-# STAGE 8: Final, runtime image.
-#
-
 # Use same Alpine version as the base for the runtime image
-FROM alpine:${ALPINE_BASE_IMAGE} AS runtime
-ARG PREFIX_DIR
-ARG BUILD_DIR
-
-# Copy build artifacts into this stage
-COPY --from=guacamole-server ${PREFIX_DIR} ${PREFIX_DIR}
+FROM alpine:${ALPINE_BASE_IMAGE}
 
 RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
+#
+# Base directory for installed build artifacts. See also the
+# CMD directive at the end of this build stage.
+#
+# NOTE: Due to limitations of the Docker image build process, this value is
+# duplicated in an ARG in the first stage of the build.
+#
+ARG PREFIX_DIR=/opt/guacamole
 
-RUN cat ${PREFIX_DIR}/DEPENDENCIES
+# Runtime environment
+ENV LC_ALL=C.UTF-8
+ENV LD_LIBRARY_PATH=${PREFIX_DIR}/lib
+ENV GUACD_LOG_LEVEL=info
+
+# Copy build artifacts into this stage
+COPY --from=builder ${PREFIX_DIR} ${PREFIX_DIR}
 
 # Bring runtime environment up to date and install runtime dependencies
 RUN apk add --no-cache                \
         ca-certificates               \
-        font-noto-cjk                 \
         ghostscript                   \
         netcat-openbsd                \
         shadow                        \
@@ -336,10 +189,6 @@ RUN apk add --no-cache                \
         util-linux-login && \
     xargs apk add --no-cache < ${PREFIX_DIR}/DEPENDENCIES
 
-# Runtime environment
-ENV LC_ALL=C.UTF-8
-ENV LD_LIBRARY_PATH=${PREFIX_DIR}/lib
-
 # Checks the operating status every 5 minutes with a timeout of 5 seconds
 HEALTHCHECK --interval=5m --timeout=5s CMD nc -z 127.0.0.1 4822 || exit 1
 
@@ -348,6 +197,8 @@ ARG UID=1000
 ARG GID=1000
 RUN groupadd --gid $GID guacd
 RUN useradd --system --create-home --shell /sbin/nologin --uid $UID --gid $GID guacd
+RUN mkdir -p /opt/cloudpods
+RUN chown -R guacd:guacd /opt/cloudpods
 
 # Run with user guacd
 USER guacd
@@ -355,6 +206,9 @@ USER guacd
 # Expose the default listener port
 EXPOSE 4822
 
-COPY --from=guacamole-server ${BUILD_DIR}/src/guacd-docker/bin/entrypoint.sh /opt/guacamole/
-#COPY 
-ENTRYPOINT [ "/opt/guacamole/entrypoint.sh" ]
+# Start guacd, listening on port 0.0.0.0:4822
+#
+# Note the path here MUST correspond to the value specified in the 
+# PREFIX_DIR build argument.
+#
+CMD /opt/guacamole/sbin/guacd -b 0.0.0.0 -L $GUACD_LOG_LEVEL -f

build/docker/Dockerfile.host

@@ -1,8 +1,8 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.9.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.5.0
 
-LABEL maintainer="Yaoqi Wan wanyaoqi@yunionyun.com"
+MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 
-ENV TZ="UTC"
+ENV TZ UTC
 
 RUN mkdir -p /opt/yunion/bin
 ADD ./_output/alpine-build/bin/host /opt/yunion/bin/host

build/docker/Dockerfile.host-deployer

@@ -1,9 +1,9 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:1.5.11
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:1.4.9
 
-LABEL maintainer="Yaoqi Wan wanyaoqi@yunionyun.com"
+MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 
-ENV TZ="UTC"
+ENV TZ UTC
 
 RUN mkdir -p /opt/yunion/bin
 
-ADD ./_output/alpine-build/bin/host-deployer /opt/yunion/bin/host-deployer
+ADD ./_output/centos-build/bin/host-deployer /opt/yunion/bin/host-deployer

build/docker/Dockerfile.host-health

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/host-health /opt/yunion/bin/host-health

build/docker/Dockerfile.host-image

@@ -1,6 +1,9 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
-
-ENV TZ="UTC"
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 RUN mkdir -p /opt/yunion/bin
-ADD ./_output/alpine-build/bin/host-image /opt/yunion/bin/host-image
+
+ENV TZ UTC
+
+ADD ./_output/bin/host-image /opt/yunion/bin/host-image
+ADD ./_output/bin/.host-image.bin /opt/yunion/bin/.host-image.bin
+ADD ./_output/bin/bundles/host-image /opt/yunion/bin/bundles/host-image

build/docker/Dockerfile.keystone

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/keystone /opt/yunion/bin/keystone

build/docker/Dockerfile.kubectl

@@ -1,9 +1,4 @@
-FROM alpine:3.22.2
-
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-ARG TARGETARCH
+FROM alpine:3.11
 
 RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositories
-RUN apk update && apk add curl android-tools && rm -rf /var/cache/apk/*
-RUN curl -L https://iso.yunion.cn/binaries/kubernetes-release/release/v1.22.9/bin/linux/${TARGETARCH}/kubectl -o /usr/bin/kubectl && chmod a+x /usr/bin/kubectl
+RUN apk update && apk add kubectl && rm -rf /var/cache/apk/*

build/docker/Dockerfile.lbagent

@@ -1,8 +1,8 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/lbagent-base:v0.0.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/lbagent-base:v0.0.4
 
-LABEL maintainer="Yousong Zhou <zhouyousong@yunion.cn>"
+MAINTAINER "Yousong Zhou <zhouyousong@yunion.cn>"
 
-ENV TZ="UTC"
+ENV TZ UTC
 
 RUN mkdir -p /opt/yunion/bin
 ADD ./_output/alpine-build/bin/lbagent /opt/yunion/bin/lbagent

build/docker/Dockerfile.lbagent-base

@@ -1,12 +1,12 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.12.4-5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.12.4-2
 
-LABEL maintainer="Jian QIU <qiujian@yunion.cn>"
+MAINTAINER "Jian QIU <qiujian@yunion.cn>"
 
-ENV TZ="UTC"
+ENV TZ UTC
 
 ENV GOPATH=/root/go
 
-RUN sed -i 's!v3.20/!v3.22/!g' /etc/apk/repositories
+RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
 
 RUN set -x \
     && apk update \

build/docker/Dockerfile.llm

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
-
-ADD ./_output/alpine-build/bin/llm /opt/yunion/bin/llm

build/docker/Dockerfile.logger

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/logger /opt/yunion/bin/logger

build/docker/Dockerfile.mcp-server

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
-
-ADD ./_output/alpine-build/bin/mcp-server /opt/yunion/bin/mcp-server

build/docker/Dockerfile.monitor

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 COPY ./build/monitor/root/opt/ /opt/
 ADD ./_output/alpine-build/bin/monitor /opt/yunion/bin/monitor

build/docker/Dockerfile.notify

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 COPY ./build/notify/root/opt/ /opt/
 ADD ./_output/alpine-build/bin/notify /opt/yunion/bin/notify

build/docker/Dockerfile.onecloud-base

@@ -1,9 +1,9 @@
 # TODO: use 3.14 will lead 'apk add qemu-img fail on arm64'
-FROM alpine:3.22.1
+FROM alpine:3.13.5
 
-LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
-ENV TZ="UTC"
+ENV TZ UTC
 
 RUN mkdir -p /opt/yunion/bin
 

build/docker/Dockerfile.onecloud-base-3-15-4

@@ -1,8 +1,8 @@
 FROM alpine:3.15.4
 
-LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
-ENV TZ="UTC"
+ENV TZ UTC
 
 RUN mkdir -p /opt/yunion/bin
 

build/docker/Dockerfile.onecloud-base-3-22-2

@@ -1,13 +0,0 @@
-FROM alpine:3.22.2
-
-LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
-
-ENV TZ="UTC"
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
-
-RUN apk update && \
-    apk add --no-cache tzdata curl busybox-extras tcpdump strace ca-certificates && \
-    rm -rf /var/cache/apk/*

build/docker/Dockerfile.region

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 COPY ./build/region/root/opt/ /opt/
 ADD ./_output/alpine-build/bin/region /opt/yunion/bin/region

build/docker/Dockerfile.region-dns

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 RUN mkdir -p /opt/yunion/bin
 ADD ./_output/alpine-build/bin/region-dns /opt/yunion/bin/region-dns

build/docker/Dockerfile.s3gateway

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/s3gateway /opt/yunion/bin/s3gateway

build/docker/Dockerfile.scheduledtask

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/scheduledtask /opt/yunion/bin/scheduledtask

build/docker/Dockerfile.scheduler

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/scheduler /opt/yunion/bin/scheduler

build/docker/Dockerfile.telegraf-raid-plugin

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/yunion-rootfs:v4.0.0-20251112.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/yunion-rootfs:v1.1
 
-ADD ./_output/alpine-build/bin/telegraf-raid-plugin /opt/yunion/bin/telegraf-raid-plugin
+ADD ./_output/centos-build/bin/telegraf-raid-plugin /opt/yunion/bin/telegraf-raid-plugin

build/docker/Dockerfile.torrent

@@ -1,6 +1,10 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
-LABEL maintainer="Zexi Li <zexi.li@icloud.com>"
+MAINTAINER "Zexi Li <zexi.li@icloud.com>"
+
+# HACK: use v3.14 alpine mirror to upgrade qemu-img
+RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/main > /etc/apk/repositories
+RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/community >> /etc/apk/repositories
 
 RUN apk update && \
     apk add --no-cache qemu-img && \

build/docker/Dockerfile.vpcagent

@@ -1,7 +1,7 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.12.4-5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.10.5-1
 
-LABEL maintainer="Yousong Zhou <zhouyousong@yunion.cn>"
+MAINTAINER "Yousong Zhou <zhouyousong@yunion.cn>"
 
-ENV TZ="UTC"
+ENV TZ UTC
 RUN mkdir -p /opt/yunion/bin
 ADD ./_output/alpine-build/bin/vpcagent /opt/yunion/bin/vpcagent

build/docker/Dockerfile.webconsole

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:3.22.2-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:20230731.2
 
 ADD ./_output/alpine-build/bin/webconsole /opt/yunion/bin/webconsole

build/docker/Dockerfile.webconsole-base

@@ -1,10 +1,10 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/kubectl:3.22.2-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/kubectl:1.18.6
 
-LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
-ENV TZ="UTC"
+ENV TZ UTC
 
 RUN mkdir -p /opt/yunion/bin
 
-RUN apk add --no-cache sshpass ipmitool openssh-client tzdata ca-certificates bash && \
+RUN apk add --no-cache sshpass ipmitool openssh-client tzdata ca-certificates && \
     rm -rf /var/cache/apk/*

build/docker/Dockerfile.yunionconf

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/yunionconf /opt/yunion/bin/yunionconf

build/docker/Makefile

@@ -1,7 +1,6 @@
 REGISTRY ?= "registry.cn-beijing.aliyuncs.com/yunionio"
 DOCKER_BUILD = docker build -t $(REGISTRY)
-DOCKER_BUILDX = docker buildx build --platform linux/arm64,linux/amd64,linux/riscv64 --push -t $(REGISTRY)
-DOCKER_BUILDX_BM = docker buildx build --platform linux/arm64,linux/amd64 --push -t $(REGISTRY)
+DOCKER_BUILDX = docker buildx build --platform linux/arm64,linux/amd64 --push -t $(REGISTRY)
 
 
 debian10-base:
@@ -10,74 +9,68 @@ debian10-base:
 
 ONECLOUD_BASE_VERSION = v0.3-3.13.5
 ONECLOUD_BASE_VERSION_3-15-4 = v3.15.4-0
-ONECLOUD_BASE_VERSION_3-22-2 = 3.22.2-0
 
 onecloud-base:
 	$(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION) -f ./Dockerfile.onecloud-base .
 onecloud-base-3-15-4:
 	$(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION_3-15-4) -f ./Dockerfile.onecloud-base-3-15-4 .
-onecloud-base-3-22-2:
-	$(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION_3-22-2) -f ./Dockerfile.onecloud-base-3-22-2 .
 
-ANSIBLESERVER_BASE = 3.22.2-0
+ANSIBLESERVER_BASE = v1.1.2
 
 ansibleserver-base:
 	$(DOCKER_BUILDX)/ansibleserver-base:$(ANSIBLESERVER_BASE) -f ./Dockerfile.ansibleserver-base .
 
 CLIMC_BASE_VERSION = 20230731.5
-CLIMC_BASE_VERSION_3-22-2 = 3.22.2-2
 
 climc-base:
-	$(DOCKER_BUILDX)/climc-base:$(CLIMC_BASE_VERSION) -f ./Dockerfile.climc-base .
+	docker buildx build --platform linux/arm64,linux/amd64 --push \
+		-t registry.cn-beijing.aliyuncs.com/yunionio/climc-base:$(CLIMC_BASE_VERSION) -f ./Dockerfile.climc-base .
 
-climc-base-3-22-2:
-	$(DOCKER_BUILDX)/climc-base:$(CLIMC_BASE_VERSION_3-22-2) -f ./Dockerfile.climc-base-3-22-2 .
-
-KUBECTL_VERSION_3-22-2 = 3.22.2-1
-kubectl:
-	$(DOCKER_BUILDX)/kubectl:$(KUBECTL_VERSION_3-22-2) -f ./Dockerfile.kubectl .
-
-WEBCONSOLE_BASE_VERSION_3-22-2 = 3.22.2-1
+WEBCONSOLE_BASE_VERSION = 20230731.2
 webconsole-base:
-	$(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION_3-22-2) -f ./Dockerfile.webconsole-base .
+	$(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION) -f ./Dockerfile.webconsole-base .
 
-BAREMETAL_BASE_VERSION = v0.3.9-20260724.0
+BAREMETAL_BASE_VERSION = v0.3.9-20231219.1
 
-FEDORA_RISCV64_VERSION = 42
-fedora-riscv64-base:
-	wget -q https://dl.fedoraproject.org/pub/alt/risc-v/release/$(FEDORA_RISCV64_VERSION)/Container/riscv64/images/Fedora-Container-Base-Generic-$(FEDORA_RISCV64_VERSION).20250414-8635a3a5bfcd.riscv64.oci.tar.xz && \
-	xz -d Fedora-Container-Base-Generic-$(FEDORA_RISCV64_VERSION).20250414-8635a3a5bfcd.riscv64.oci.tar.xz && \
-	skopeo copy oci-archive:Fedora-Container-Base-Generic-$(FEDORA_RISCV64_VERSION).20250414-8635a3a5bfcd.riscv64.oci.tar docker-daemon:fedora-riscv64:$(FEDORA_RISCV64_VERSION) && \
-	rm -f Fedora-Container-Base-Generic-$(FEDORA_RISCV64_VERSION).20250414-8635a3a5bfcd.riscv64.oci.tar
-
-baremetal-base-riscv: fedora-riscv64-base
-         $(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base-riscv .
-         #docker push $(REGISTRY)/baremetal-base:$(BAREMETAL_BASE_VERSION)
-
-# TODO: support riscv64 for baremetal-base
 baremetal-base:
-	$(DOCKER_BUILDX_BM)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base .
+	$(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base .
 	#docker push $(REGISTRY)/baremetal-base:$(BAREMETAL_BASE_VERSION)
 
 TORRENT_VERSION = 20210815.0
-TORRENT_VERSION_3-22-2 = 3.22.2-0
 torrent:
 	$(DOCKER_BUILDX)/torrent:$(TORRENT_VERSION) -f ./Dockerfile.torrent .
 
 GLANCE_BASE_VERSION = v0.0.1
-GLANCE_BASE_VERSION_3-22-2 = 3.22.2-0
 glance-base:
 	$(DOCKER_BUILDX)/glance-base:$(GLANCE_BASE_VERSION) -f ./Dockerfile.glance-base .
 
-glance-base-3-22-2:
-	$(DOCKER_BUILDX)/glance-base:$(GLANCE_BASE_VERSION_3-22-2) -f ./Dockerfile.glance-base .
+FILE_REPO_VERSION = v0.5.2
 
+file-repo:
+	$(DOCKER_BUILDX)/file-repo:$(FILE_REPO_VERSION) -f ./Dockerfile.file-repo .
 
-LBAGENT_BASE_VERSION = v0.0.5
+HOST_IMAGE_VERSION ?= v1.0.2
+HOST_IMAGE_NAME = $(REGISTRY)/host-image:$(HOST_IMAGE_VERSION)
+host-image:
+	docker pull $(HOST_IMAGE_NAME)-amd64 --platform amd64
+	docker pull $(HOST_IMAGE_NAME)-arm64 --platform arm64
+	docker manifest create $(HOST_IMAGE_NAME) \
+		$(HOST_IMAGE_NAME)-amd64 \
+		$(HOST_IMAGE_NAME)-arm64
+	docker manifest annotate $(HOST_IMAGE_NAME) $(HOST_IMAGE_NAME)-amd64 --arch amd64
+	docker manifest annotate $(HOST_IMAGE_NAME) $(HOST_IMAGE_NAME)-arm64 --arch arm64
+	docker manifest push $(HOST_IMAGE_NAME)
+
+LBAGENT_BASE_VERSION = v0.0.3
 lbagent-base:
 	$(DOCKER_BUILDX)/lbagent-base:$(LBAGENT_BASE_VERSION) -f ./Dockerfile.lbagent-base .
 
-GUACD_VERSION=1.6.0
+GUACD_VERSION=1.5.3
 guacd:
-	$(DOCKER_BUILDX)/guacd:$(GUACD_VERSION) -f ./Dockerfile.guacd .
-
+	docker buildx build --platform linux/arm64 --push \
+		-t registry.cn-beijing.aliyuncs.com/yunionio/guacd:$(GUACD_VERSION)-arm64 -f ./Dockerfile.guacd .
+	docker buildx build --platform linux/amd64 --push \
+		-t registry.cn-beijing.aliyuncs.com/yunionio/guacd:$(GUACD_VERSION)-amd64 -f ./Dockerfile.guacd .
+	docker buildx imagetools create -t registry.cn-beijing.aliyuncs.com/yunionio/guacd:$(GUACD_VERSION) \
+		registry.cn-beijing.aliyuncs.com/yunionio/guacd:$(GUACD_VERSION)-amd64 \
+		registry.cn-beijing.aliyuncs.com/yunionio/guacd:$(GUACD_VERSION)-arm64

build/docker/multi-arch/Dockerfile.host

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:3.22.2-go-1.24.9-0 AS build
+FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:3.19.0-go-1.21.10-0 as build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 RUN mkdir -p /root/go/src/yunion.io/x/onecloud
@@ -7,11 +7,11 @@ COPY . /root/go/src/yunion.io/x/onecloud
 WORKDIR /root/go/src/yunion.io/x/onecloud
 RUN make cmd/host
 
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.9.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.4.0
 
-LABEL maintainer="Yaoqi Wan wanyaoqi@yunionyun.com"
+MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 
-ENV TZ="UTC"
+ENV TZ Asia/Shanghai
 
 RUN mkdir -p /opt/yunion/bin
 COPY --from=build /root/go/src/yunion.io/x/onecloud/_output/bin/host /opt/yunion/bin/host

build/docker/multi-arch/Dockerfile.torrent

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:3.22.2-go-1.24.9-0 AS build
+FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5 as build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 
@@ -6,11 +6,13 @@ RUN mkdir -p /root/go/src/yunion.io/x/onecloud
 COPY . /root/go/src/yunion.io/x/onecloud
 RUN cd /root/go/src/yunion.io/x/onecloud && make cmd/torrent
 
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
 
-LABEL maintainer="Zexi Li <zexi.li@icloud.com>"
+MAINTAINER "Zexi Li <zexi.li@icloud.com>"
 
-RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
+# HACK: use v3.14 alpine mirror to upgrade qemu-img
+RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/main > /etc/apk/repositories
+RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/community >> /etc/apk/repositories
 
 RUN apk update && \
     apk add --no-cache qemu-img && \

build/glance/vars

@@ -1,5 +1,5 @@
 DESCRIPTION="Yunion Cloud Image Service"
 
 REQUIRES=(
-    yunion-qemu-4.2.0
+    yunion-qemu-2.12.1
 )

build/monitor/root/opt/yunion/share/notify_templates/monitor/content@cn/DEFAULT

@@ -1,9 +1,9 @@
+{{.title}}
 策略名称: {{.name}}
 触发时间: {{.start_time}}
 报警级别: {{.level}}
 触发条件: {{.description | unescaped}}
-{{if .reason}}报警原因: {{.reason}}
-{{end}}报警数量：{{len .matches}}
+报警数量：{{len .matches}}
 资源名称：{{.resource_name}}
 
 详情地址: {{.web_url}}

build/monitor/root/opt/yunion/share/notify_templates/monitor/content@cn/DEFAULT.email

@@ -68,7 +68,6 @@
     border-bottom: 1px solid #d7d7d7;
   }
 </style>
-{{$match_tags_str := .match_tags_str}}
 <body>
   <h3 class="title">报警提醒</h3>
   <table border="0" cellspacing="0" cellpadding="0" class="table">
@@ -88,19 +87,8 @@
     </tr>
     <tr>
       <td class="td">策略详情：</td>
-      <td>
-        {{- range $i, $m := .matches -}}
-          {{- if $i}}<br/>{{end -}}
-          {{- $m.condition | unescaped -}}
-        {{- end -}}
-      </td>
+      <td>{{.description}}</td>
     </tr>
-    {{if .reason}}
-    <tr>
-      <td class="td">报警原因：</td>
-      <td>{{.reason}}</td>
-    </tr>
-    {{end}}
   </table>
   <table class="table" style="padding-top: 6px; padding-bottom: 10px;">
     <tr>
@@ -122,9 +110,6 @@
               <td>平台</td>
               <td>指标</td>
               <td>触发值</td>
-              {{if gt (len $match_tags_str) 1}}
-              <td>标签</td>
-              {{end}}
             </tr>
           </thead>
           <tbody>
@@ -142,9 +127,6 @@
 				  </td>
 				  <td>{{ $Matche.metric }}</td>
 				  <td>{{ $Matche.value_str }}</td>
-				  {{if gt (len $match_tags_str) 1}}
-				  <td>{{ index $match_tags_str $i }}</td>
-				  {{end}}
 				</tr>
 			{{end}}
           </tbody>

build/monitor/root/opt/yunion/share/notify_templates/monitor/content@en/DEFAULT

@@ -1,9 +1,9 @@
+{{.title}}
 AlertName: {{.name}}
 Time: {{.start_time}}
 Level: {{.level}}
 TriggerCondition: {{.description | unescaped}}
-{{if .reason}}Reason: {{.reason}}
-{{end}}AlertCount: {{len .matches}}
+AlertCount: {{len .matches}}
 ResourceName: {{.resource_name}}
 
 WebUrl: {{.web_url}}

build/monitor/root/opt/yunion/share/notify_templates/monitor/content@en/DEFAULT.email

@@ -68,7 +68,6 @@
     border-bottom: 1px solid #d7d7d7;
   }
 </style>
-{{$match_tags_str := .match_tags_str}}
 <body>
   <h3 class="title">Alert</h3>
   <table border="0" cellspacing="0" cellpadding="0" class="table">
@@ -88,19 +87,8 @@
     </tr>
     <tr>
       <td class="td">Strategy details：</td>
-      <td>
-        {{- range $i, $m := .matches -}}
-          {{- if $i}}<br/>{{end -}}
-          {{- $m.condition | unescaped -}}
-        {{- end -}}
-      </td>
+      <td>{{.description}}</td>
     </tr>
-    {{if .reason}}
-    <tr>
-      <td class="td">Reason：</td>
-      <td>{{.reason}}</td>
-    </tr>
-    {{end}}
   </table>
   <table class="table" style="padding-top: 6px; padding-bottom: 10px;">
     <tr>
@@ -122,9 +110,6 @@
               <td>Brand</td>
               <td>Metric</td>
               <td>Trigger value</td>
-              {{if gt (len $match_tags_str) 1}}
-              <td>Tags</td>
-              {{end}}
             </tr>
           </thead>
           <tbody>
@@ -142,9 +127,6 @@
 				  </td>
 				  <td>{{ $Matche.metric }}</td>
 				  <td>{{ $Matche.value_str }}</td>
-				  {{if gt (len $match_tags_str) 1}}
-				  <td>{{ index $match_tags_str $i }}</td>
-				  {{end}}
 				</tr>
 			{{end}}
           </tbody>

build/monitor/root/opt/yunion/share/notify_templates/monitor/title@cn/DEFAULT

@@ -1 +1 @@
-{{monitorTitle .}}
+{{.title}}

build/monitor/root/opt/yunion/share/notify_templates/monitor/title@cn/DEFAULT.email

@@ -1 +1 @@
-{{monitorTitle .}}
+{{.title}}

build/monitor/root/opt/yunion/share/notify_templates/monitor/title@en/DEFAULT

@@ -1 +1 @@
-{{monitorTitle .}}
+{{.title}}

build/monitor/root/opt/yunion/share/notify_templates/monitor/title@en/DEFAULT.email

@@ -1 +1 @@
-{{monitorTitle .}}
+{{.title}}

build/mps-daemon/root/usr/lib/systemd/system/yunion-mps-daemon.service

@@ -1,18 +0,0 @@
-[Unit]
-Description=Yunion MPS Daemon
-Documentation=https://docs.yunion.cn
-
-[Service]
-Type=simple
-User=root
-Group=root
-ExecStart=/opt/yunion/bin/mps-daemon
-WorkingDirectory=/opt/yunion/bin
-KillMode=process
-Restart=always
-RestartSec=30
-LimitNOFILE=500000
-LimitNPROC=500000
-
-[Install]
-WantedBy=multi-user.target

build/mps-daemon/vars

@@ -1,2 +0,0 @@
-DESCRIPTION="Yunion MPS Daemon Utility"
-SERVICE="yes"

build/notify/root/opt/yunion/share/local-templates/content@cn/BACKUP_PACK_COMPLETE.tmpl

@@ -1 +0,0 @@
-备份导出文件{{ .pack_file_name }}创建成功

build/notify/root/opt/yunion/share/local-templates/content@en/BACKUP_PACK_COMPLETE.tmpl

@@ -1 +0,0 @@
-Backup export file {{ .pack_file_name }} was created.

build/notify/root/opt/yunion/share/local-templates/title@cn/BACKUP_PACK_COMPLETE.tmpl

@@ -1 +0,0 @@
-备份导出文件{{ .pack_file_name }}创建成功

build/notify/root/opt/yunion/share/local-templates/title@en/BACKUP_PACK_COMPLETE.tmpl

@@ -1 +0,0 @@
-Backup export file {{ .pack_file_name }} was created.

cmd/aiproxy/main.go

@@ -1,26 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"yunion.io/x/onecloud/pkg/aiproxy/service"
-	"yunion.io/x/onecloud/pkg/util/atexit"
-)
-
-func main() {
-	defer atexit.Handle()
-
-	service.StartService()
-}

cmd/climc/entry/climc.go

@@ -70,7 +70,7 @@ type BaseOptions struct {
 
 	OsRegionName   string `default:"$OS_REGION_NAME" help:"Defaults to env[OS_REGION_NAME]"`
 	OsZoneName     string `default:"$OS_ZONE_NAME" help:"Defaults to env[OS_ZONE_NAME]"`
-	OsEndpointType string `default:"$OS_ENDPOINT_TYPE|internalURL" help:"Defaults to env[OS_ENDPOINT_TYPE] or internalURL" choices:"publicURL|internalURL|adminURL|apigateway"`
+	OsEndpointType string `default:"$OS_ENDPOINT_TYPE|internalURL" help:"Defaults to env[OS_ENDPOINT_TYPE] or internalURL" choices:"publicURL|internalURL|adminURL"`
 	// ApiVersion     string `default:"$API_VERSION" help:"override default modules service api version"`
 	OutputFormat string `default:"$CLIMC_OUTPUT_FORMAT|table" choices:"table|kv|json|yaml|flatten-table|flatten-kv" help:"output format"`
 
@@ -335,6 +335,7 @@ func ClimcMain() {
 	}
 
 	if parser.IsHelpSet() {
+		fmt.Print(parser.HelpString())
 		return
 	}
 

cmd/climc/main.go

@@ -17,7 +17,6 @@ package main
 import (
 	"yunion.io/x/onecloud/cmd/climc/entry"
 	_ "yunion.io/x/onecloud/cmd/climc/shell"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/aiproxy"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/ansible"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/apimap"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudevent"
@@ -31,7 +30,6 @@ import (
 	_ "yunion.io/x/onecloud/cmd/climc/shell/identity"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/image"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/k8s"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/llm"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/logger"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/misc"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/monitor"

cmd/climc/shell/aiproxy/ai_key.go

@@ -1,31 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package aiproxy
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	apmodules "yunion.io/x/onecloud/pkg/mcclient/modules/aiproxy"
-	apoptions "yunion.io/x/onecloud/pkg/mcclient/options/aiproxy"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&apmodules.AiKeys)
-	cmd.Create(new(apoptions.AiKeyCreateOptions))
-	cmd.List(new(apoptions.AiKeyListOptions))
-	cmd.Show(new(apoptions.AiKeyShowOptions))
-	cmd.Update(new(apoptions.AiKeyUpdateOptions))
-	cmd.Delete(new(apoptions.AiKeyDeleteOptions))
-	registerEnableDisable(cmd)
-}

cmd/climc/shell/aiproxy/ai_model.go

@@ -1,31 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package aiproxy
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	apmodules "yunion.io/x/onecloud/pkg/mcclient/modules/aiproxy"
-	apoptions "yunion.io/x/onecloud/pkg/mcclient/options/aiproxy"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&apmodules.AiModels)
-	cmd.Create(new(apoptions.AiModelCreateOptions))
-	cmd.List(new(apoptions.AiModelListOptions))
-	cmd.Show(new(apoptions.AiModelShowOptions))
-	cmd.Update(new(apoptions.AiModelUpdateOptions))
-	cmd.Delete(new(apoptions.AiModelDeleteOptions))
-	registerEnableDisable(cmd)
-}