fix: skip baremetal-agent riscv64 (#24124)

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

.circleci/config.yml

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

.github/pull_request_template.md

@@ -13,8 +13,7 @@ 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.7
-- release/3.6
+- release/3.11
 
 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.18'
+        go-version: '1.25'
 
     - name: Install check tools
       shell: bash
       run: |
         set -o xtrace
-        git clone --branch yun --depth 4 https://github.com/yousong/tools && cd tools
+        git clone --branch master --depth 4 https://github.com/yunionio/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
@@ -32,7 +32,7 @@ jobs:
         export GO111MODULE=on
         make -j3 check
         make test
-        targets="$(find cmd -mindepth 1 -maxdepth 1 -type d | grep -v cmd/host-image)"
+        targets="$(find cmd -mindepth 1 -maxdepth 1 -type d | grep -v cmd/host-image | grep -v torrent)"
         echo $targets | tr ' ' '\n'
         make $targets
         ls -lh _output/bin

.github/workflows/docker_apigateway.yml

@@ -22,7 +22,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.18'
+        go-version: '1.25'
         
     - 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.18'
+        go-version: '1.25'
         
     - 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.18'
+        go-version: '1.25'
         
     - 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.18'
+        go-version: '1.25'
         
     - 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.18'
+        go-version: '1.25'
         
     - 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.18'
+        go-version: '1.25'
         
     - 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.18'
+        go-version: '1.25'
         
     - 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.18'
+        go-version: '1.25'
         
     - 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.18'
+        go-version: '1.25'
         
     - 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.18'
+        go-version: '1.25'
         
     - 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.18'
+        go-version: '1.25'
         
     - 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.18'
+        go-version: '1.25'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

Makefile

@@ -47,11 +47,6 @@ 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}
@@ -63,7 +58,7 @@ ifeq ($(UNAME), Linux)
 XARGS_FLAGS = --no-run-if-empty
 endif
 
-cmdTargets:=$(filter-out cmd/host-image,$(wildcard cmd/*))
+cmdTargets:=$(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)))
 
@@ -81,7 +76,7 @@ gencopyright:
 	@bash scripts/gencopyright.sh pkg cmd
 
 test:
-	@go test $(GO_BUILD_FLAGS) $(shell go list ./... | egrep -v 'host-image|hostimage')
+	@go test $(GO_BUILD_FLAGS) $(shell go list ./... | egrep -v 'host-image|hostimage|torrent')
 
 vet:
 	go vet ./...
@@ -89,11 +84,8 @@ vet:
 # cmd/esxi-agent: prepare_dir
 # 	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
-cmd/fetcherfs: prepare_dir
-	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
-
 cmd/%: prepare_dir
-	$(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
+	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
 rpm/%: cmd/%
 	$(BUILD_SCRIPT) $*
@@ -104,21 +96,6 @@ 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)
 
@@ -189,7 +166,8 @@ 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 "$@: see \"yun\" branch at https://github.com/yousong/tools" >&2 ; \
+		echo "$@: goimports should be installed by: \
+		echo "$@: git clone --depth 4 https://github.com/yunionio/tools && cd tools && go install ./cmd/goimports ; \
 		false ; \
 	fi
 .PHONY: goimports-check
@@ -258,7 +236,7 @@ hostdeployer-grpc-gen:
 
 check: fmt-check
 check: gendocgo-check
-check: goimports-check
+#check: goimports-check
 #check: vet-check
 #check: y18n-check
 .PHONY: check
@@ -282,22 +260,18 @@ dep:
 	@echo "$$depDeprecated"
 	@$(MAKE) mod
 
-RELEASE_BRANCH:=master
+RELEASE_BRANCH:=release/4.0.2
 GOPROXY ?= direct
 
 mod:
-	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 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 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
@@ -349,7 +323,7 @@ image:
 .PHONY: image
 
 image-telegraf-raid-plugin:
-	VERSION=release-1.6.5 ARCH=all make image telegraf-raid-plugin
+	VERSION=v4.0-20260115.0 GOOS=linux ARCH=all make image telegraf-raid-plugin
 
 %:
 	@:

Makefile.common.mk

@@ -8,8 +8,7 @@ endif
 ModBaseName:=$(notdir $(ModName))
 
 DockerImageRegistry?=registry.cn-beijing.aliyuncs.com
-DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:3.16.0-go-1.18.2-0
-DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:go-1.18.3-0
+DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:3.22.2-go-1.24.9-0
 
 EnvIf=$(if $($(1)),$(1)=$($(1)))
 
@@ -29,27 +28,6 @@ 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,9 +1,10 @@
 # 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">
@@ -52,7 +53,7 @@ Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的
 ### 支持的云资源
 
 * 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
+* Load Balancers: instances, listeners, backend groups, backends, TLS certificates, ACLs
 * Object Storage: buckets, objects
 * NAS: file_systems, access_groups, mount_targets
 * RDS: instances, accounts, backups, databases, parameters, privileges
@@ -62,10 +63,7 @@ Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的
 
 ## 安装部署
 
-- [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 服务，包括**内置私有云**和**多云管理**的功能。
+请参考文档[安装部署](https://www.cloudpods.org/docs/getting-started/)选择合适的场景部署。
 
 ## 文档
 
@@ -79,7 +77,9 @@ Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的
 
 ## 联系我们
 
-请查看[联系我们](https://www.cloudpods.org/docs/contact/)。
+* 请查看[联系我们](https://www.cloudpods.org/docs/contact/)。
+
+* TG群: [cloudpods](https://t.me/cloudpods_org)
 
 ## 版本历史
 
@@ -92,3 +92,7 @@ Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的
 ## License
 
 Apache license 2.0，详情请看 [LICENSE](./LICENSE)。
+
+## AI生成文档
+
+[DeepWiki](https://deepwiki.com/yunionio/cloudpods) 提供了对本项目代码详细和全面的AI解读，可以参考。

README.md

@@ -1,7 +1,6 @@
 # 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)
@@ -54,7 +53,7 @@ See [Introduction](https://www.cloudpods.org/docs/introduction/) for details.
 ### 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, TSL certificates, ACLs
+* Load Balancers: instances, listeners, backend groups, backends, TLS certificates, ACLs
 * Object Storage: buckets, objects
 * NAS: file_systems, access_groups, mount_targets
 * RDS: instances, accounts, backups, databases, parameters, privileges
@@ -64,10 +63,7 @@ See [Introduction](https://www.cloudpods.org/docs/introduction/) for details.
 
 ## Getting started
 
-- [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.
+Please refer to the document [Getting Started](https://www.cloudpods.org/en/docs/getting-started/) to select the appropriate scenario for installation.
 
 ## Documentations
 
@@ -82,7 +78,9 @@ 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.
+* See [Contact Us](https://www.cloudpods.org/en/docs/contact/) for details.
+
+* Telegram: [cloudpods](https://t.me/cloudpods_org)
 
 ## Changelog
 
@@ -95,3 +93,8 @@ 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/build.sh

@@ -36,6 +36,12 @@ 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}"
 
@@ -104,41 +110,87 @@ if [ -d $ROOT/root ]; then
   rsync -a $ROOT/root/ \$RPM_BUILD_ROOT
 fi
 
-%pre
+%pre" > $SPEC_FILE
+
+if [ -f $ROOT/preinst ]; then
+    cat $ROOT/preinst >> $SPEC_FILE
+else
+    echo "
 %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
 
-%post
+echo "
+%post" >> $SPEC_FILE
+
+if [ -f $ROOT/postinst ]; then
+    cat $ROOT/postinst >> $SPEC_FILE
+else
+    echo "
 %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
 
-%preun
+echo "
+%preun" >> $SPEC_FILE
+
+if [ -f $ROOT/prerm ]; then
+    cat $ROOT/prerm >> $SPEC_FILE
+else
+    echo "
 %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
 
-%postun
+echo "
+%postun" >> $SPEC_FILE
+
+if [ -f $ROOT/postrm ]; then
+    cat $ROOT/postrm >> $SPEC_FILE
+else
+    echo "
 %if %{use_systemd}
     /usr/bin/systemctl daemon-reload >/dev/null 2>&1 ||:
 %endif
+" >> $SPEC_FILE
+fi
 
+echo -n "
 %files
 %doc
 $BIN_PATH/$PKG
-$(for b in $EXTRA_BINS; do echo $BIN_PATH/$b; done)
-" > $SPEC_FILE
+" >> $SPEC_FILE
+
+for b in $EXTRA_BINS; do
+    echo $BIN_PATH/$b >> $SPEC_FILE
+done
 
 if [ -d $ROOT/root/ ]; then
     find $ROOT/root/ -type f | sed -e "s:$ROOT/root::g" >> $SPEC_FILE
 fi
 
-rpmbuild --define "_topdir $BUILDROOT" -bb $SPEC_FILE
+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
 
 find $RPM_DIR -type f | while read f; do
 	d="$(dirname "$f")"
@@ -146,5 +198,3 @@ find $RPM_DIR -type f | while read f; do
 	mkdir -p "$d"
 	cp $f $d
 done
-
-rm -fr $BUILDROOT

build/build_deb.sh

@@ -35,14 +35,48 @@ 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-$1-$FULL_VERSION
+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
+
 rm -rf $BUILDROOT
 mkdir -p $BUILDROOT/DEBIAN
 mkdir -p $BUILDROOT/$BIN_PATH
@@ -52,27 +86,90 @@ if [ -d $ROOT/root ]; then
     cp -rf $ROOT/root/* $BUILDROOT/
 fi
 
-
 echo "Build root ${BUILDROOT}"
 
-case $(uname -m) in
-    x86_64)
-        CURRENT_ARCH=amd64
-        ;;
-    aarch64)
-        CURRENT_ARCH=arm64
-        ;;
-esac
-
-echo "Package: yunion-$1
+echo "Package: yunion-$PKG
 Version: $FULL_VERSION
 Section: base
 Priority: optional
 Architecture: $CURRENT_ARCH
 Maintainer: wanyaoqi@yunionyun.com
-Description: Yunion $1
-" > $BUILDROOT/DEBIAN/control
+Description: $DESCRIPTION" > $BUILDROOT/DEBIAN/control
+if [ ${#REQUIRES[@]} -gt 0 ]; then
+    DEPS=$(IFS=, ; echo "${REQUIRES[*]}")
+    echo "Depends: $DEPS" >> $BUILDROOT/DEBIAN/control
+fi
 chmod 0755 $BUILDROOT/DEBIAN/control
 
+cat $BUILDROOT/DEBIAN/control
 
-dpkg-deb --build $BUILDROOT
+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}/

build/climc/root/opt/yunion/scripts/motd/climc.sh

@@ -6,6 +6,14 @@ fi
 
 test -f /etc/yunion/rcadmin && source /etc/yunion/rcadmin
 
+if [ -n "$OS_AUTH_TOKEN" ]; then
+    test -n "$OS_USERNAME" && unset OS_USERNAME
+    test -n "$OS_PASSWORD" && unset OS_PASSWORD
+    test -n "$OS_DOMAIN_NAME" && unset OS_DOMAIN_NAME
+    test -n "$OS_ACCESS_KEY" && unset OS_ACCESS_KEY
+    test -n "$OS_SECRET_KEY" && unset OS_SECRET_KEY
+fi
+
 source <(climc --completion bash)
 source <(kubectl completion bash)
 

build/cloudid/root/opt/yunion/share/saml/sp-metadata/volcengine.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+    xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.volcengine.com/">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
+        <KeyDescriptor use="signing">
+            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+                <ds:X509Data>
+                    <ds:X509Certificate>MIIDJjCCAg6gAwIBAgIUF3lH8/cdlQeyPBqt066RFnt3cI4wDQYJKoZIhvcNAQELBQAwJTEjMCEGA1UEAxMadXJuOnZvbGNlbmdpbmU6d2Vic2VydmljZXMwHhcNMjMwODA4MDIzNzI4WhcNMzMwODIxMTYwMDAwWjAlMSMwIQYDVQQDExp1cm46dm9sY2VuZ2luZTp3ZWJzZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPZ+nhODpFTe+A8PbuZYA5XDQ04WckV1A5U90tKaaUX5uKLUYfDtFA1TwMO/qG87LU/0Pxs4FhgZJkUOeBHkyYzzXZQvtfsJ9frcKkcTjX/WF4XJyitXCULSjhcclMS3gOqeI/Mo3P90KutfhNli/mAHQJaRsuPFG4ZwBusbUo8i5sqBqt/Sg8JapH7DjEU2mN1165o59gavPGSByPeEuu28EkivVFcI7Jox5ztwgMrOYY+pYP9GeSurzpyLq3CfvvahTsAJjuHDHTTnYNcq/I3VOap/y4cOU6vgxcQvBmgb+CBvGldjn0em3BIn5meQwuB6jfQ7kqBaO1PRD1nhDTMCAwEAAaNOMEwwSgYIKwYBBQUHAQEEPjA8MDoGCCsGAQUFBzABhi5odHRwOi8vbmV4dXMtcHJvZHVjdGlvbi5ieXRlZGFuY2UubmV0L3BjYS9vY3NwMA0GCSqGSIb3DQEBCwUAA4IBAQBxySDr9TPJxRN+otrFDaV8HSeFKUUSO3+r8bEVAXmS+xUsdUOZbaf2r/g+eKrW58dpn+iBWTAAKug9Jwe5KVGqB7G5r2r6k/eI5dvv5r/Fr5T7NppRCXKQTQiAhrrVlqttsagPztJ6LmVAcm4sh4Ckx99FgibQCbT/zui+c6IUyEQcVIwtmoPANl3K2Yn85t+G+Cu9xxXY0JPlZcUHntHg0R0PUWc3LuzLXnff7JWEzPyhMUBLpQk5BltxuD5cTGCA6WafJuBTAqkt48VN0MFTP5c5m3PJFz8Ro1GLY8hw1uhUEx28DKBkQSGpkZNx0oJXETIDpSBfD0dHWBvZQPd0</ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:entity</NameIDFormat>
+        <AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.volcengine.com/saml/sso"/>
+        <AttributeConsumingService index="1">
+            <ServiceName xml:lang="en">Volcengine Single Sign-On</ServiceName>
+            <RequestedAttribute isRequired="true" Name="https://www.volcengine.com/SAML/Attributes/Identity" FriendlyName="Identity"/>
+            <RequestedAttribute isRequired="true" Name="https://www.volcengine.com/SAML/Attributes/SessionName" FriendlyName="SessionName"/>
+            <RequestedAttribute isRequired="false" Name="https://www.volcengine.com/SAML/Attributes/SessionDuration" FriendlyName="SessionDuration"/>
+
+        </AttributeConsumingService>
+    </SPSSODescriptor>
+    <Organization>
+        <OrganizationName xml:lang="en">Volcengine, Inc.</OrganizationName>
+        <OrganizationDisplayName xml:lang="en">Volcengine</OrganizationDisplayName>
+        <OrganizationURL xml:lang="en">https://www.volcengine.com</OrganizationURL>
+    </Organization>
+</EntityDescriptor>

build/docker/Dockerfile.ansibleserver

@@ -1,5 +1,6 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.1.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:3.22.2-0
 
+# 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.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

build/docker/Dockerfile.ansibleserver-base

@@ -1,8 +1,8 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
-MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
+LABEL 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,6 +13,7 @@ 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
@@ -21,8 +22,10 @@ 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 paramiko mysqlclient pywinrm \
+  && pip3 install 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:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
 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:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
 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-20231219.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.9-20251215.0
 
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+LABEL 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,7 +1,6 @@
-#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:v3.10.8-20231215.0 as yunionos
+FROM registry.cn-beijing.aliyuncs.com/yunionio/yunionos:v4.0.0-20251201.0 as yunionos
 
 FROM centos:8 as grub-stage
 
@@ -28,9 +27,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:v0.3-3.13.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
-MAINTAINER "Zexi Li <zexi.li@icloud.com>"
+LABEL maintainer="Zexi Li <zexi.li@icloud.com>"
 
 RUN mkdir -p /opt/yunion/bin
 
@@ -70,6 +69,8 @@ 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:20230731.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:3.22.2-2
 
 ADD ./build/climc/root/opt /opt
 

build/docker/Dockerfile.climc-base

@@ -4,9 +4,9 @@ ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 ARG TARGETARCH
 
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+LABEL 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

@@ -0,0 +1,24 @@
+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:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
 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:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
 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:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+LABEL 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:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
 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:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
 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:10
+FROM debian:trixie
 
 RUN apt update && apt install -y alien
 

build/docker/Dockerfile.devtool

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

build/docker/Dockerfile.file-repo

@@ -1,26 +0,0 @@
-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:v0.0.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/glance-base:3.22.2-0
 
-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,5 +1,7 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20210815.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:3.22.2-0
 
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
 
-RUN apk add --no-cache s3fs-fuse --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing
+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

build/docker/Dockerfile.guacd

@@ -22,44 +22,25 @@
 #
 
 # The Alpine Linux image that should be used as the basis for the guacd image
-ARG ALPINE_BASE_IMAGE=latest
-FROM alpine:${ALPINE_BASE_IMAGE} AS builder
+ARG ALPINE_BASE_IMAGE=3.22.2
 
-ARG TARGETPLATFORM
+# The target architecture of the build. Valid values are "ARM" and "X86". By
+# default, this is detected automatically.
+ARG BUILD_ARCHITECTURE
 
-RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
+# The number of processes that may run simultaneously during the build. By
+# default, this is detected automatically.
+ARG BUILD_JOBS
 
-# 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
+# The directory that will house the guacamole-server source during the 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
 
-#
-# 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.
-#
+# 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.
 ARG PREFIX_DIR=/opt/guacamole
 
 #
@@ -67,11 +48,12 @@ ARG PREFIX_DIR=/opt/guacamole
 # library (these can be overridden at build time if a specific version is
 # needed)
 #
-ARG WITH_FREERDP='2(\.\d+)+'
+ARG WITH_FREERDP="${FREERDP_VERSION}(\.\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
@@ -79,6 +61,8 @@ ARG WITH_LIBWEBSOCKETS='v\d+(\.\d+)+'
 # options are needed)
 #
 
+ARG FREERDP_ARM_OPTS=""
+
 ARG FREERDP_OPTS="\
     -DBUILTIN_CHANNELS=OFF \
     -DCHANNEL_URBDRC=OFF \
@@ -89,22 +73,25 @@ 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_SSE2=ON \
+    -DWITH_SWSCALE=OFF \
     -DWITH_WAYLAND=OFF \
     -DWITH_X11=OFF \
     -DWITH_X264=OFF \
@@ -116,21 +103,47 @@ ARG FREERDP_OPTS="\
     -DWITH_XRENDER=OFF \
     -DWITH_XTEST=OFF \
     -DWITH_XV=OFF \
-    -DWITH_ZLIB=ON"
+    -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=""
 
 ARG GUACAMOLE_SERVER_OPTS="\
-    --disable-guaclog"
+    --disable-guaclog \
+    CPPFLAGS=-Wno-error=deprecated-declarations"
+
+ARG GUACAMOLE_SERVER_X86_OPTS=""
+ARG GUACAMOLE_SERVER_UNKNOWN_OPTS=""
+
+ARG LIBSSH2_ARM_OPTS=""
+
 
 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 \
@@ -141,45 +154,179 @@ ARG LIBWEBSOCKETS_OPTS="\
     -DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \
     -DLWS_WITH_STATIC=OFF"
 
-# 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
+ARG LIBWEBSOCKETS_X86_OPTS=""
 
+#
+# 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  \
-        ${PREFIX_DIR}/lib/freerdp2/*guac*.so   \
+        ${FREERDP_LIB_PATH}/*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}
-
-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
-
-# Runtime environment
-ENV LC_ALL=C.UTF-8
-ENV LD_LIBRARY_PATH=${PREFIX_DIR}/lib
-ENV GUACD_LOG_LEVEL=info
+FROM alpine:${ALPINE_BASE_IMAGE} AS runtime
+ARG PREFIX_DIR
+ARG BUILD_DIR
 
 # Copy build artifacts into this stage
-COPY --from=builder ${PREFIX_DIR} ${PREFIX_DIR}
+COPY --from=guacamole-server ${PREFIX_DIR} ${PREFIX_DIR}
+
+RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
+
+RUN cat ${PREFIX_DIR}/DEPENDENCIES
 
 # Bring runtime environment up to date and install runtime dependencies
 RUN apk add --no-cache                \
         ca-certificates               \
+        font-noto-cjk                 \
         ghostscript                   \
         netcat-openbsd                \
         shadow                        \
@@ -189,6 +336,10 @@ 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
 
@@ -197,8 +348,6 @@ 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
@@ -206,9 +355,6 @@ USER guacd
 # Expose the default listener port
 EXPOSE 4822
 
-# 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
+COPY --from=guacamole-server ${BUILD_DIR}/src/guacd-docker/bin/entrypoint.sh /opt/guacamole/
+#COPY 
+ENTRYPOINT [ "/opt/guacamole/entrypoint.sh" ]

build/docker/Dockerfile.host

@@ -1,8 +1,8 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.5.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.9.0
 
-MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
+LABEL 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.4.6
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:1.5.3
 
-MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
+LABEL maintainer="Yaoqi Wan wanyaoqi@yunionyun.com"
 
-ENV TZ UTC
+ENV TZ="UTC"
 
 RUN mkdir -p /opt/yunion/bin
 
-ADD ./_output/centos-build/bin/host-deployer /opt/yunion/bin/host-deployer
+ADD ./_output/alpine-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:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
 ADD ./_output/alpine-build/bin/host-health /opt/yunion/bin/host-health

build/docker/Dockerfile.host-image

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

build/docker/Dockerfile.keystone

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

build/docker/Dockerfile.kubectl

@@ -1,4 +1,9 @@
-FROM alpine:3.11
+FROM alpine:3.22.2
+
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+ARG TARGETARCH
 
 RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositories
-RUN apk update && apk add kubectl && rm -rf /var/cache/apk/*
+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

build/docker/Dockerfile.lbagent

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

build/docker/Dockerfile.llm

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

build/docker/Dockerfile.mcp-server

@@ -0,0 +1,3 @@
+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:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
 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:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
 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.13.5
+FROM alpine:3.22.1
 
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+LABEL 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
 
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+LABEL 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

@@ -0,0 +1,13 @@
+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:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
 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:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
 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:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
 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:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
 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:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
 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:v1.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/yunion-rootfs:v4.0.0-20251112.0
 
-ADD ./_output/centos-build/bin/telegraf-raid-plugin /opt/yunion/bin/telegraf-raid-plugin
+ADD ./_output/alpine-build/bin/telegraf-raid-plugin /opt/yunion/bin/telegraf-raid-plugin

build/docker/Dockerfile.torrent

@@ -1,10 +1,6 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
-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
+LABEL maintainer="Zexi Li <zexi.li@icloud.com>"
 
 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.10.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.12.4-5
 
-MAINTAINER "Yousong Zhou <zhouyousong@yunion.cn>"
+LABEL 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:20230731.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:3.22.2-1
 
 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:1.18.6
+FROM registry.cn-beijing.aliyuncs.com/yunionio/kubectl:3.22.2-1
 
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+LABEL 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 && \
+RUN apk add --no-cache sshpass ipmitool openssh-client tzdata ca-certificates bash && \
     rm -rf /var/cache/apk/*

build/docker/Dockerfile.yunionconf

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

build/docker/Makefile

@@ -1,6 +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 --push -t $(REGISTRY)
+DOCKER_BUILDX = docker buildx build --platform linux/arm64,linux/amd64,linux/riscv64 --push -t $(REGISTRY)
 
 
 debian10-base:
@@ -9,45 +9,67 @@ 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 = v1.1.2
+ANSIBLESERVER_BASE = 3.22.2-0
 
 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 build --platform linux/arm64,linux/amd64 --push \
-		-t registry.cn-beijing.aliyuncs.com/yunionio/climc-base:$(CLIMC_BASE_VERSION) -f ./Dockerfile.climc-base .
+	$(DOCKER_BUILDX)/climc-base:$(CLIMC_BASE_VERSION) -f ./Dockerfile.climc-base .
 
-WEBCONSOLE_BASE_VERSION = 20230731.2
+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:
-	$(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION) -f ./Dockerfile.webconsole-base .
+	$(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION_3-22-2) -f ./Dockerfile.webconsole-base .
 
-BAREMETAL_BASE_VERSION = v0.3.9-20231219.1
+BAREMETAL_BASE_VERSION = v0.3.9-20251112.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)
 
 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 .
 
-FILE_REPO_VERSION = v0.5.2
+glance-base-3-22-2:
+	$(DOCKER_BUILDX)/glance-base:$(GLANCE_BASE_VERSION_3-22-2) -f ./Dockerfile.glance-base .
 
-file-repo:
-	$(DOCKER_BUILDX)/file-repo:$(FILE_REPO_VERSION) -f ./Dockerfile.file-repo .
 
 HOST_IMAGE_VERSION ?= v1.0.2
 HOST_IMAGE_NAME = $(REGISTRY)/host-image:$(HOST_IMAGE_VERSION)
@@ -61,16 +83,11 @@ host-image:
 	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_VERSION = v0.0.5
 lbagent-base:
 	$(DOCKER_BUILDX)/lbagent-base:$(LBAGENT_BASE_VERSION) -f ./Dockerfile.lbagent-base .
 
-GUACD_VERSION=1.5.3
+GUACD_VERSION=1.6.0
 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
+	$(DOCKER_BUILDX)/guacd:$(GUACD_VERSION) -f ./Dockerfile.guacd .
+

build/docker/multi-arch/Dockerfile.host

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:3.16.0-go-1.18.2-0 as build
+FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:3.22.2-go-1.24.9-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.4.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.9.0
 
-MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
+LABEL maintainer="Yaoqi Wan wanyaoqi@yunionyun.com"
 
-ENV TZ Asia/Shanghai
+ENV TZ="UTC"
 
 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:1.0-5 as build
+FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:3.22.2-go-1.24.9-0 AS build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 
@@ -6,13 +6,11 @@ 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:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
 
-MAINTAINER "Zexi Li <zexi.li@icloud.com>"
+LABEL 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 sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /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-2.12.1
+    yunion-qemu-4.2.0
 )

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

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

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

@@ -68,6 +68,7 @@
     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">
@@ -108,7 +109,11 @@
 	          <td>名称</td>
               <td>IP</td>
               <td>平台</td>
+              <td>指标</td>
               <td>触发值</td>
+              {{if gt (len $match_tags_str) 1}}
+              <td>标签</td>
+              {{end}}
             </tr>
           </thead>
           <tbody>
@@ -124,7 +129,11 @@
 				  <td>
 				   	{{ index .tags "brand" }}
 				  </td>
-				  <td>{{$Matche.value_str}}</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,8 @@
-{{.title}}
 AlertName: {{.name}}
 Time: {{.start_time}}
 Level: {{.level}}
 TriggerCondition: {{.description | unescaped}}
-ResourceCount: {{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,6 +68,7 @@
     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">
@@ -108,7 +109,11 @@
 	          <td>Name</td>
               <td>IP</td>
               <td>Brand</td>
+              <td>Metric</td>
               <td>Trigger value</td>
+              {{if gt (len $match_tags_str) 1}}
+              <td>Tags</td>
+              {{end}}
             </tr>
           </thead>
           <tbody>
@@ -124,7 +129,11 @@
 				  <td>
 				   	{{ index .tags "brand" }}
 				  </td>
-				  <td>{{$Matche.value_str}}</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 @@
-{{.title}}
+{{monitorTitle .}}

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

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

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

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

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

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

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

@@ -0,0 +1,18 @@
+[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

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

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

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

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

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

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

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

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

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

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"`
+	OsEndpointType string `default:"$OS_ENDPOINT_TYPE|internalURL" help:"Defaults to env[OS_ENDPOINT_TYPE] or internalURL" choices:"publicURL|internalURL|adminURL|apigateway"`
 	// 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,7 +335,6 @@ func ClimcMain() {
 	}
 
 	if parser.IsHelpSet() {
-		fmt.Print(parser.HelpString())
 		return
 	}
 

cmd/climc/main.go

@@ -30,6 +30,7 @@ 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/compute/ai_gateways.go

@@ -0,0 +1,31 @@
+// 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 compute
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.AiGateways).WithKeyword("ai-gateway")
+	cmd.List(&compute.AiGatewayListOptions{})
+	cmd.Delete(&options.BaseIdOptions{})
+	cmd.Create(&compute.AiGatewayCreateOptions{})
+	cmd.Perform("syncstatus", &options.BaseIdOptions{})
+	cmd.Perform("change-config", &compute.AiGatewayChangeConfigOptions{})
+}

cmd/climc/shell/compute/app.go

@@ -25,6 +25,10 @@ func init() {
 	cmd.List(&compute.AppListOptions{})
 	cmd.Show(&compute.AppIdOptions{})
 	cmd.Perform("syncstatus", &compute.AppIdOptions{})
+	cmd.Get("hybird-connections", &compute.AppIdOptions{})
+	cmd.Get("certificates", &compute.AppIdOptions{})
+	cmd.Get("backups", &compute.AppIdOptions{})
+	cmd.Get("custom-domains", &compute.AppIdOptions{})
 
 	cmd1 := shell.NewResourceCmd(&modules.AppEnvironments)
 	cmd1.List(&compute.AppEnvironmentListOptions{})

cmd/climc/shell/compute/backup.go

@@ -15,6 +15,11 @@
 package compute
 
 import (
+	"fmt"
+	"os"
+
+	"yunion.io/x/jsonutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
@@ -39,6 +44,16 @@ func init() {
 	dbCmd.Create(&compute.DiskBackupCreateOptions{})
 	dbCmd.Perform("recovery", &compute.DiskBackupRecoveryOptions{})
 	dbCmd.Perform("syncstatus", &compute.DiskBackupSyncstatusOptions{})
+	dbCmd.GetWithCustomOptionShow("export-info", func(info jsonutils.JSONObject, opts shell.IGetOpt) {
+		args := opts.(*compute.DiskBackupExportOptions)
+		if args.Output != "" {
+			os.WriteFile(args.Output, []byte(info.String()), 0644)
+			fmt.Printf("Exported to %s\n", args.Output)
+		} else {
+			printObject(info)
+		}
+	}, &compute.DiskBackupExportOptions{})
+	dbCmd.PerformClass("import", &compute.DiskBackupImportOptions{})
 
 	ibCmd := shell.NewResourceCmd(&modules.InstanceBackups)
 	ibCmd.List(&compute.InstanceBackupListOptions{})
@@ -50,4 +65,10 @@ func init() {
 	ibCmd.Create(&compute.InstanceBackupManagerCreateFromPackageOptions{})
 	ibCmd.Perform("syncstatus", &compute.DiskBackupSyncstatusOptions{})
 	ibCmd.Perform("set-class-metadata", &options.ResourceMetadataOptions{})
+
+	hbsCmd := shell.NewJointCmd(&modules.HostBackupstorages)
+	hbsCmd.List(&compute.HostBackupStorageListOptions{})
+	hbsCmd.Show(&compute.HostBackupStorageJoinOptions{})
+	hbsCmd.Attach(&compute.HostBackupStorageJoinOptions{})
+	hbsCmd.Detach(&compute.HostBackupStorageJoinOptions{})
 }

cmd/climc/shell/compute/baremetal_profiles.go

@@ -0,0 +1,50 @@
+// 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 compute
+
+import (
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/util/printutils"
+
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	baremetalmodules "yunion.io/x/onecloud/pkg/mcclient/modules/compute/baremetal"
+	baremetaloptions "yunion.io/x/onecloud/pkg/mcclient/options/compute/baremetal"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&baremetalmodules.BaremetalProfiles)
+	cmd.List(new(baremetaloptions.BaremetalProfileListOptions))
+	cmd.Show(new(baremetaloptions.BaremetalProfileIdOptions))
+	cmd.Delete(new(baremetaloptions.BaremetalProfileIdOptions))
+
+	type BaremetalProfileMatchOpts struct {
+		OEMNAME string
+		MODEL   string
+	}
+	R(&BaremetalProfileMatchOpts{}, "baremetal-profile-match", "find match baremetal profile by oemname and model", func(s *mcclient.ClientSession, args *BaremetalProfileMatchOpts) error {
+		specs, err := baremetalmodules.BaremetalProfiles.GetMatchProfiles(s, args.OEMNAME, args.MODEL)
+		if err != nil {
+			return errors.Wrap(err, "GetMatchProfiles")
+		}
+		listResults := printutils.ListResult{}
+		for _, spec := range specs {
+			listResults.Data = append(listResults.Data, jsonutils.Marshal(spec))
+		}
+		printList(&listResults, nil)
+		return nil
+	})
+}

cmd/climc/shell/compute/buckets.go

@@ -19,178 +19,71 @@ import (
 	"io"
 	"os"
 
-	"yunion.io/x/cloudmux/pkg/multicloud/objectstore"
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/fileutils"
 	"yunion.io/x/pkg/util/printutils"
 
-	api "yunion.io/x/onecloud/pkg/apis/compute"
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	computeoptions "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	type BucketListOptions struct {
-		options.BaseListOptions
-		DistinctField string `help:"query specified distinct field"`
-	}
-	R(&BucketListOptions{}, "bucket-list", "List all buckets", func(s *mcclient.ClientSession, args *BucketListOptions) error {
-		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
-		if len(args.DistinctField) > 0 {
-			params.Add(jsonutils.NewString(args.DistinctField), "extra_field")
-			result, err := modules.Buckets.Get(s, "distinct-field", params)
-			if err != nil {
-				return err
-			}
-			fmt.Println(result)
-			return nil
-		}
-		result, err := modules.Buckets.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Buckets.GetColumns(s))
-		return nil
-	})
-
-	type BucketIdOptions struct {
-		ID string `help:"ID or name of bucket"`
-	}
-	R(&BucketIdOptions{}, "bucket-show", "Id details of bucket", func(s *mcclient.ClientSession, args *BucketIdOptions) error {
-		result, err := modules.Buckets.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&BucketIdOptions{}, "bucket-syncstatus", "Sync bucket statust", func(s *mcclient.ClientSession, args *BucketIdOptions) error {
-		result, err := modules.Buckets.PerformAction(s, args.ID, "syncstatus", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketUpdateOptions struct {
-		ID   string `help:"ID or name of bucket" json:"-"`
-		Name string `help:"new name of bucket" json:"name"`
-		Desc string `help:"Description of bucket" json:"description" token:"desc"`
-	}
-	R(&BucketUpdateOptions{}, "bucket-update", "update bucket", func(s *mcclient.ClientSession, args *BucketUpdateOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Buckets.Update(s, args.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketDeleteOptions struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-	}
-	R(&BucketDeleteOptions{}, "bucket-delete", "delete bucket", func(s *mcclient.ClientSession, args *BucketDeleteOptions) error {
-		result, err := modules.Buckets.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketCreateOptions struct {
-		NAME        string `help:"name of bucket" json:"name"`
-		CLOUDREGION string `help:"location of bucket" json:"cloudregion"`
-		MANAGER     string `help:"cloud provider" json:"manager"`
-
-		StorageClass string `help:"bucket storage class"`
-		Acl          string `help:"bucket ACL"`
-	}
-	R(&BucketCreateOptions{}, "bucket-create", "Create a bucket", func(s *mcclient.ClientSession, args *BucketCreateOptions) error {
-		params, err := options.StructToParams(args)
-		if err != nil {
-			return err
-		}
-		result, err := modules.Buckets.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketListObjectsOptions struct {
-		ID           string `help:"ID or name of bucket" json:"-"`
-		Prefix       string `help:"List objects with prefix"`
-		Recursive    bool   `help:"List objects recursively"`
-		Limit        int    `help:"maximal items per request"`
-		PagingMarker string `help:"paging marker"`
-	}
-	R(&BucketListObjectsOptions{}, "bucket-object-list", "List objects in a bucket", func(s *mcclient.ClientSession, args *BucketListObjectsOptions) error {
-		params, err := options.StructToParams(args)
-		if err != nil {
-			return err
-		}
-		result, err := modules.Buckets.GetSpecific(s, args.ID, "objects", params)
-		if err != nil {
-			return err
-		}
-
+	cmd := shell.NewResourceCmd(&modules.Buckets)
+	cmd.List(&computeoptions.BucketListOptions{})
+	cmd.GetProperty(&computeoptions.BucketGetPropertyOptions{})
+	cmd.Show(&computeoptions.BucketIdOptions{})
+	cmd.Perform("syncstatus", &computeoptions.BucketIdOptions{})
+	cmd.Update(&computeoptions.BucketUpdateOptions{})
+	cmd.Delete(&computeoptions.BucketIdOptions{})
+	cmd.Create(&computeoptions.BucketCreateOptions{})
+	cmd.GetWithCustomOptionShow("objects", func(data jsonutils.JSONObject, args shell.IGetOpt) {
 		listResult := printutils.ListResult{}
-		err = result.Unmarshal(&listResult)
+		err := data.Unmarshal(&listResult)
 		if err != nil {
-			return err
+			return
 		}
 		printList(&listResult, []string{})
-		return nil
-	})
+	}, &computeoptions.BucketListObjectsOptions{})
+	cmd.Perform("delete", &computeoptions.BucketDeleteObjectsOptions{})
+	cmd.Perform("makedir", &computeoptions.BucketMakeDirOptions{})
+	cmd.Perform("temp-url", &computeoptions.BucketPresignObjectsOptions{})
+	cmd.Perform("acl", &computeoptions.BucketSetAclOptions{})
+	cmd.GetWithCustomOptionShow("acl", func(data jsonutils.JSONObject, args shell.IGetOpt) {
+		printObject(data)
+	}, &computeoptions.BucketAclOptions{})
+	cmd.Perform("sync", &computeoptions.BucketSyncOptions{})
+	cmd.Perform("limit", &computeoptions.BucketLimitOptions{})
+	cmd.GetWithCustomOptionShow("access-info", func(data jsonutils.JSONObject, args shell.IGetOpt) {
+		printObject(data)
+	}, &computeoptions.BucketAccessInfoOptions{})
+	cmd.Perform("metadata", &computeoptions.BucketSetMetadataOptions{})
+	cmd.Perform("set-website", &computeoptions.BucketSetWebsiteOption{})
+	cmd.GetWithCustomOptionShow("website", func(data jsonutils.JSONObject, args shell.IGetOpt) {
+		printObject(data)
+	}, &computeoptions.BucketGetWebsiteConfOption{})
+	cmd.Perform("delete-website", &computeoptions.BucketDeleteWebsiteConfOption{})
+	cmd.Perform("set-cors", &computeoptions.BucketSetCorsOption{})
+	cmd.GetWithCustomOptionShow("cors", func(data jsonutils.JSONObject, args shell.IGetOpt) {
+		printObject(data)
+	}, &computeoptions.BucketGetCorsOption{})
+	cmd.Perform("delete-cors", &computeoptions.BucketDeleteCorsOption{})
+	cmd.Perform("set-referer", &computeoptions.BucketSetRefererOption{})
+	cmd.GetWithCustomOptionShow("referer", func(data jsonutils.JSONObject, args shell.IGetOpt) {
+		printObject(data)
+	}, &computeoptions.BucketGetRefererOption{})
+	cmd.GetWithCustomOptionShow("cdn-domain", func(data jsonutils.JSONObject, args shell.IGetOpt) {
+		printObject(data)
+	}, &computeoptions.BucketGetCdnDomainOption{})
+	cmd.GetWithCustomOptionShow("policy", func(data jsonutils.JSONObject, args shell.IGetOpt) {
+		printObject(data)
+	}, &computeoptions.BucketGetPolicyOption{})
+	cmd.Perform("set-policy", &computeoptions.BucketSetPolicyOption{})
+	cmd.Perform("delete-policy", &computeoptions.BucketDeletePolicyOption{})
 
-	type BucketDeleteObjectsOptions struct {
-		ID   string   `help:"ID or name of bucket" json:"-"`
-		KEYS []string `help:"List of objects to delete"`
-	}
-	R(&BucketDeleteObjectsOptions{}, "bucket-object-delete", "Delete objects in a bucket", func(s *mcclient.ClientSession, args *BucketDeleteObjectsOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Buckets.PerformAction(s, args.ID, "delete", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketMakeDirOptions struct {
-		ID  string `help:"ID or name of bucket" json:"-"`
-		KEY string `help:"DIR key to create"`
-	}
-	R(&BucketMakeDirOptions{}, "bucket-mkdir", "Mkdir in a bucket", func(s *mcclient.ClientSession, args *BucketMakeDirOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Buckets.PerformAction(s, args.ID, "makedir", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketUploadObjectsOptions struct {
-		ID   string `help:"ID or name of bucket" json:"-"`
-		KEY  string `help:"Key of object to upload"`
-		Path string `help:"Path to file to upload" required:"true"`
-
-		ContentLength int64  `help:"Content lenght (bytes)" default:"-1"`
-		StorageClass  string `help:"storage CLass"`
-		Acl           string `help:"object acl." choices:"private|public-read|public-read-write"`
-
-		objectstore.ObjectHeaderOptions
-	}
-	R(&BucketUploadObjectsOptions{}, "bucket-object-upload", "Upload an object into a bucket", func(s *mcclient.ClientSession, args *BucketUploadObjectsOptions) error {
+	R(&computeoptions.BucketUploadObjectsOptions{}, "bucket-object-upload", "Upload an object into a bucket", func(s *mcclient.ClientSession, args *computeoptions.BucketUploadObjectsOptions) error {
 		var body io.Reader
 		if len(args.Path) > 0 {
 			file, err := os.Open(args.Path)
@@ -223,332 +116,36 @@ func init() {
 		return nil
 	})
 
-	type BucketPresignObjectsOptions struct {
-		ID            string `help:"ID or name of bucket" json:"-"`
-		KEY           string `help:"Key of object to upload"`
-		Method        string `help:"Request method" choices:"GET|PUT|DELETE"`
-		ExpireSeconds int    `help:"expire in seconds" default:"60"`
-	}
-	R(&BucketPresignObjectsOptions{}, "bucket-object-tempurl", "Get temporal URL for an object in a bucket", func(s *mcclient.ClientSession, args *BucketPresignObjectsOptions) error {
-		params, err := options.StructToParams(args)
+	R(&computeoptions.BucketPerfMonOptions{}, "bucket-perf-mon", "Bucket performance monitor", func(s *mcclient.ClientSession, args *computeoptions.BucketPerfMonOptions) error {
+		result, err := modules.Buckets.Get(s, args.ID, nil)
 		if err != nil {
 			return err
 		}
-		result, err := modules.Buckets.PerformAction(s, args.ID, "temp-url", params)
+		bucketDetails := compute.BucketDetails{}
+		err = result.Unmarshal(&bucketDetails)
 		if err != nil {
 			return err
 		}
-		printObject(result)
-		return nil
-	})
 
-	type BucketSetAclOptions struct {
-		ID  string   `help:"ID or name of bucket" json:"-"`
-		ACL string   `help:"ACL to set" choices:"default|private|public-read|public-read-write" json:"acl"`
-		Key []string `help:"Optional object key" json:"key"`
-	}
-	R(&BucketSetAclOptions{}, "bucket-set-acl", "Set ACL of bucket or object", func(s *mcclient.ClientSession, args *BucketSetAclOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Buckets.PerformAction(s, args.ID, "acl", params)
+		bucket, err := modules.GetIBucket(s.GetContext(), s, &bucketDetails)
 		if err != nil {
 			return err
 		}
-		printObject(result)
-		return nil
-	})
 
-	type BucketAclOptions struct {
-		ID  string `help:"ID or name of bucket" json:"-"`
-		Key string `help:"Optional object key"`
-	}
-	R(&BucketAclOptions{}, "bucket-acl", "Get ACL of bucket or object", func(s *mcclient.ClientSession, args *BucketAclOptions) error {
-		params, err := options.StructToParams(args)
+		payload, err := fileutils.GetSizeBytes(args.Payload, 1024)
 		if err != nil {
 			return err
 		}
-		result, err := modules.Buckets.GetSpecific(s, args.ID, "acl", params)
+
+		stats, err := modules.ProbeBucketStats(s.GetContext(), bucket, "test", int64(payload))
 		if err != nil {
 			return err
 		}
-		printObject(result)
-		return nil
-	})
 
-	type BucketSyncOptions struct {
-		ID        string `help:"ID or name of bucket" json:"-"`
-		StatsOnly bool   `help:"sync statistics only"`
-	}
-	R(&BucketSyncOptions{}, "bucket-sync", "Sync bucket", func(s *mcclient.ClientSession, args *BucketSyncOptions) error {
-		params, err := options.StructToParams(args)
-		if err != nil {
-			return err
-		}
-		result, err := modules.Buckets.PerformAction(s, args.ID, "sync", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
+		fmt.Printf("Upload delay %f ms throughput %f MB/s\n", stats.UploadDelayMs(), stats.UploadThroughputMbps(payload/1024/1024))
+		fmt.Printf("Download delay %f ms throughput %f MB/s\n", stats.DownloadDelayMs(), stats.DownloadThroughputMbps(payload/1024/1024))
+		fmt.Printf("Delete delay %f ms\n", stats.DeleteDelayMs())
 
-	type BucketLimitOptions struct {
-		ID          string `help:"ID or name of bucket" json:"-"`
-		SizeBytes   int64  `help:"size limit in bytes"`
-		ObjectCount int64  `help:"object count limit"`
-	}
-	R(&BucketLimitOptions{}, "bucket-limit", "Set limit of bucket", func(s *mcclient.ClientSession, args *BucketLimitOptions) error {
-		limit := jsonutils.Marshal(args)
-		params := jsonutils.NewDict()
-		params.Set("limit", limit)
-		result, err := modules.Buckets.PerformAction(s, args.ID, "limit", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketAccessInfoOptions struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-	}
-	R(&BucketAccessInfoOptions{}, "bucket-access-info", "Show backend access info of a bucket", func(s *mcclient.ClientSession, args *BucketAccessInfoOptions) error {
-		result, err := modules.Buckets.GetSpecific(s, args.ID, "access-info", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketSetMetadataOptions struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-
-		Key []string `help:"Optional object key" json:"key"`
-
-		objectstore.ObjectHeaderOptions
-	}
-	R(&BucketSetMetadataOptions{}, "bucket-set-metadata", "Set metadata of object", func(s *mcclient.ClientSession, args *BucketSetMetadataOptions) error {
-		input := api.BucketMetadataInput{}
-		input.Key = args.Key
-		input.Metadata = args.ObjectHeaderOptions.Options2Header()
-		err := input.Validate()
-		if err != nil {
-			return err
-		}
-		result, err := modules.Buckets.PerformAction(s, args.ID, "metadata", jsonutils.Marshal(input))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketSetWebsiteOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-		// 主页
-		Index string `help:"main page"`
-		// 错误时返回的文档
-		ErrorDocument string `help:"error return"`
-		// http或https
-		Protocol string `help:"force https" choices:"http|https"`
-	}
-	R(&BucketSetWebsiteOption{}, "bucket-set-website", "Set bucket website", func(s *mcclient.ClientSession, args *BucketSetWebsiteOption) error {
-		conf := api.BucketWebsiteConf{
-			Index:         args.Index,
-			ErrorDocument: args.ErrorDocument,
-			Protocol:      args.Protocol,
-		}
-		result, err := modules.Buckets.PerformAction(s, args.ID, "set-website", jsonutils.Marshal(conf))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketGetWebsiteConfOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-	}
-	R(&BucketGetWebsiteConfOption{}, "bucket-get-website", "Get bucket website", func(s *mcclient.ClientSession, args *BucketGetWebsiteConfOption) error {
-		result, err := modules.Buckets.GetSpecific(s, args.ID, "website", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketDeleteWebsiteConfOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-	}
-	R(&BucketDeleteWebsiteConfOption{}, "bucket-delete-website", "Delete bucket website", func(s *mcclient.ClientSession, args *BucketDeleteWebsiteConfOption) error {
-		result, err := modules.Buckets.PerformAction(s, args.ID, "delete-website", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketSetCorsOption struct {
-		ID             string   `help:"ID or name of bucket" json:"-"`
-		AllowedMethods []string `help:"allowed http method" choices:"PUT|GET|POST|DELETE|HEAD"`
-		// 允许的源站，可以设为*
-		AllowedOrigins []string
-		AllowedHeaders []string
-		MaxAgeSeconds  int
-		ExposeHeaders  []string
-		RuleId         string
-	}
-	R(&BucketSetCorsOption{}, "bucket-set-cors", "Set bucket cors", func(s *mcclient.ClientSession, args *BucketSetCorsOption) error {
-
-		rule := api.BucketCORSRule{
-			AllowedOrigins: args.AllowedOrigins,
-			AllowedMethods: args.AllowedMethods,
-			AllowedHeaders: args.AllowedHeaders,
-			MaxAgeSeconds:  args.MaxAgeSeconds,
-			ExposeHeaders:  args.ExposeHeaders,
-			Id:             args.RuleId,
-		}
-		rules := api.BucketCORSRules{Data: []api.BucketCORSRule{rule}}
-		result, err := modules.Buckets.PerformAction(s, args.ID, "set-cors", jsonutils.Marshal(rules))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketGetCorsOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-	}
-	R(&BucketGetCorsOption{}, "bucket-get-cors", "Get bucket cors", func(s *mcclient.ClientSession, args *BucketGetCorsOption) error {
-		result, err := modules.Buckets.GetSpecific(s, args.ID, "cors", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketDeleteCorsOption struct {
-		ID string   `help:"ID or name of bucket" json:"-"`
-		Id []string `"help:Id of rules to delete"`
-	}
-	R(&BucketDeleteCorsOption{}, "bucket-delete-cors", "Delete bucket cors", func(s *mcclient.ClientSession, args *BucketDeleteCorsOption) error {
-		input := api.BucketCORSRuleDeleteInput{}
-		input.Id = args.Id
-		result, err := modules.Buckets.PerformAction(s, args.ID, "delete-cors", jsonutils.Marshal(input))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketSetRefererOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-		// 域名列表
-		DomainList []string
-		// 是否允许空referer 访问
-		AllowEmptyRefer bool `help:"all empty refer access"`
-		Enabled         bool
-		RerererType     string `help:"Referer type" choices:"Black-List|White-List"`
-	}
-	R(&BucketSetRefererOption{}, "bucket-set-referer", "Set bucket referer", func(s *mcclient.ClientSession, args *BucketSetRefererOption) error {
-		conf := api.BucketRefererConf{
-			Enabled:         args.Enabled,
-			AllowEmptyRefer: args.AllowEmptyRefer,
-			RefererType:     args.RerererType,
-			DomainList:      args.DomainList,
-		}
-		result, err := modules.Buckets.PerformAction(s, args.ID, "set-referer", jsonutils.Marshal(conf))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketGetRefererOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-	}
-	R(&BucketGetRefererOption{}, "bucket-get-referer", "get bucket referer", func(s *mcclient.ClientSession, args *BucketGetRefererOption) error {
-		result, err := modules.Buckets.GetSpecific(s, args.ID, "referer", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketGetCdnDomainOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-	}
-	R(&BucketGetRefererOption{}, "bucket-get-cdn-domain", "get bucket cdn domain", func(s *mcclient.ClientSession, args *BucketGetRefererOption) error {
-		result, err := modules.Buckets.GetSpecific(s, args.ID, "cdn-domain", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketGetPolicyOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-	}
-	R(&BucketGetPolicyOption{}, "bucket-get-policy", "get bucket policy", func(s *mcclient.ClientSession, args *BucketGetPolicyOption) error {
-		result, err := modules.Buckets.GetSpecific(s, args.ID, "policy", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketSetPolicyOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-		// 格式主账号id:子账号id
-		PrincipalId []string `help:"ext account id, accountId:subaccountId"`
-		// Read|ReadWrite|FullControl
-		CannedAction string `help:"authority action" choice:"Read|FullControl"`
-		// Allow|Deny
-		Effect string `help:"allow or deny" choice:"Allow|Deny"`
-		// 被授权的资源地址
-		ResourcePath []string
-		// ip 条件
-		IpEquals    []string
-		IpNotEquals []string
-	}
-	R(&BucketSetPolicyOption{}, "bucket-set-policy", "set bucket policy", func(s *mcclient.ClientSession, args *BucketSetPolicyOption) error {
-		opts := api.BucketPolicyStatementInput{}
-		opts.CannedAction = args.CannedAction
-		opts.Effect = args.Effect
-		opts.IpEquals = args.IpEquals
-		opts.IpNotEquals = args.IpNotEquals
-		opts.ResourcePath = args.ResourcePath
-		opts.PrincipalId = args.PrincipalId
-
-		result, err := modules.Buckets.PerformAction(s, args.ID, "set-policy", jsonutils.Marshal(opts))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketDeletePolicyOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-		Id []string
-	}
-	R(&BucketDeletePolicyOption{}, "bucket-delete-policy", "delete bucket policy", func(s *mcclient.ClientSession, args *BucketDeletePolicyOption) error {
-		input := api.BucketPolicyDeleteInput{}
-		input.Id = args.Id
-		result, err := modules.Buckets.PerformAction(s, args.ID, "delete-policy", jsonutils.Marshal(input))
-		if err != nil {
-			return err
-		}
-		printObject(result)
 		return nil
 	})
 }

cmd/climc/shell/compute/cachedimages.go

@@ -15,62 +15,17 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	opts "yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	type CachedImageListOptions struct {
-		options.BaseListOptions
-		ImageType string `help:"image type" choices:"system|customized|shared|market"`
-
-		Region string `help:"show images cached at cloud region"`
-		Zone   string `help:"show images cached at zone"`
-
-		HostSchedtagId string `help:"filter cached image with host schedtag"`
-		Valid          *bool  `help:"valid cachedimage"`
-	}
-	R(&CachedImageListOptions{}, "cached-image-list", "List cached images", func(s *mcclient.ClientSession, args *CachedImageListOptions) error {
-		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
-		result, err := modules.Cachedimages.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Cachedimages.GetColumns(s))
-		return nil
-	})
-
-	type CachedImageShowOptions struct {
-		ID string `help:"ID or Name of the cached image to show"`
-	}
-	R(&CachedImageShowOptions{}, "cached-image-show", "Show cached image details", func(s *mcclient.ClientSession, args *CachedImageShowOptions) error {
-		result, err := modules.Cachedimages.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&CachedImageShowOptions{}, "cached-image-refresh", "Refresh cached image details", func(s *mcclient.ClientSession, args *CachedImageShowOptions) error {
-		result, err := modules.Cachedimages.PerformAction(s, args.ID, "refresh", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type CachedImageDeleteOptions struct {
-		ID []string `help:"ID or Name of the cached image to show"`
-	}
-	R(&CachedImageDeleteOptions{}, "cached-image-delete", "Remove cached image information", func(s *mcclient.ClientSession, args *CachedImageDeleteOptions) error {
-		results := modules.Cachedimages.BatchDelete(s, args.ID, nil)
-		printBatchResults(results, modules.Cachedimages.GetColumns(s))
-		return nil
-	})
+	cmd := shell.NewResourceCmd(&modules.Cachedimages).WithKeyword("cached-image")
+	cmd.List(&options.CachedImageListOptions{})
+	cmd.Show(&opts.BaseIdOptions{})
+	cmd.PerformClass("cache-image", &options.CachedImageCacheImageOptions{})
+	cmd.Perform("refresh", &opts.BaseIdOptions{})
+	cmd.BatchDelete(&opts.BaseIdsOptions{})
 }

cmd/climc/shell/compute/cdn_domains.go

@@ -28,4 +28,8 @@ func init() {
 	cmd.Update(&compute.CDNDomainUpdateOptions{})
 	cmd.Delete(&options.BaseIdOptions{})
 	cmd.Create(&compute.CDNDomainCreateOptions{})
+	cmd.Perform("clear-cache", &compute.CDNClearCacheOptions{})
+	cmd.Perform("change-config", &compute.CDNChangeConfigOptions{})
+	cmd.Perform("delete-custom-hostname", &compute.CDNDeleteCustomHostnameOptions{})
+	cmd.Get("custom-hostnames", &compute.CDNCustomHostnameOptions{})
 }

cmd/climc/shell/compute/cloudaccounts.go

@@ -17,7 +17,7 @@ package compute
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
@@ -62,6 +62,8 @@ func init() {
 	cmd.CreateWithKeyword("create-qingcloud", &options.SQingCloudCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-oracle", &options.SOracleCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-cephfs", &options.SCephFSCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-cnware", &options.SCNwareCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-oceanbase", &options.SOceanbaseCloudAccountCreateOptions{})
 
 	cmd.UpdateWithKeyword("update-vmware", &options.SVMwareCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-aliyun", &options.SAliyunCloudAccountUpdateOptions{})
@@ -88,6 +90,8 @@ func init() {
 	cmd.UpdateWithKeyword("update-baidu", &options.SBaiduCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-cucloud", &options.SCucloudCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-qingcloud", &options.SQingCloudCloudAccountUpdateOptions{})
+	cmd.UpdateWithKeyword("update-cnware", &options.SCNwareCloudAccountUpdateOptions{})
+	cmd.UpdateWithKeyword("update-oceanbase", &options.SOceanbaseCloudAccountUpdateOptions{})
 
 	cmd.Perform("update-credential", &options.CloudaccountUpdateCredentialOptions{})
 
@@ -117,6 +121,7 @@ func init() {
 	cmd.PerformWithKeyword("update-credential-baidu", "update-credential", &options.SBaiduCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-cucloud", "update-credential", &options.SCucloudCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-qingcloud", "update-credential", &options.SQingCloudCloudAccountUpdateCredentialOptions{})
+	cmd.PerformWithKeyword("update-credential-cnware", "update-credential", &options.SCNwareCloudAccountUpdateCredentialOptions{})
 
 	cmd.PerformWithKeyword("test-connectivity-google", "test-connectivity", &options.SGoogleCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("test-connectivity-vmware", "test-connectivity", &options.SVMwareCloudAccountUpdateCredentialOptions{})
@@ -133,6 +138,7 @@ func init() {
 	cmd.PerformWithKeyword("test-connectivity-ctyun", "test-connectivity", &options.SCtyunCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("test-connectivity-jdcloud", "test-connectivity", &options.SJDcloudCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("test-connectivity-cloudpods", "test-connectivity", &options.SCloudpodsCloudAccountUpdateCredentialOptions{})
+	cmd.PerformWithKeyword("test-connectivity-oceanbase", "test-connectivity", &options.SOceanbaseCloudAccountUpdateCredentialOptions{})
 
 	cmd.Perform("enable", &options.SCloudAccountIdOptions{})
 	cmd.Perform("disable", &options.SCloudAccountIdOptions{})