fix(region): support create vmware vm with desc (#19740)

Automated cherry pick of #19723: fix(region): avoid duplicate zone name

.circleci/config.yml

@@ -3,22 +3,11 @@
 # Check https://circleci.com/docs/2.0/language-go/ for more details
 version: 2
 jobs:
-  check:
-    docker:
-      - image: yunionio/centos-build:1.1-4
-        environment:
-          ONECLOUD_CI_BUILD: "1"
-    working_directory: /root/go/src/yunion.io/x/onecloud
-    steps:
-      - checkout
-      - run:
-          command: |
-            make -j3 check
-  build:
+  test:
     requires:
       - check
     docker:
-      - image: yunionio/centos-build:1.1-4
+      - image: yunion/centos-build:go-1.18.3-0
         environment:
           ONECLOUD_CI_BUILD: "1"
 
@@ -27,58 +16,21 @@ jobs:
     ####   /go/src/github.com/circleci/go-tool
     ####   /go/src/bitbucket.org/circleci/go-tool
     working_directory: /root/go/src/yunion.io/x/onecloud
-    parallelism: 4
+    resource_class: large
+    parallelism: 1
     steps:
       - checkout
-      - restore_cache:
-          key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
-          paths:
-            - /root/.cache/go-build
       - run:
           command: |
+            make -j3 check
+            make test
             targets="$(circleci tests glob "cmd/*" | grep -v cmd/host-image | circleci tests split)"
             echo $targets | tr ' ' '\n'
-            make -j2 $targets
+            make $targets
             ls -lh _output/bin/
-      - save_cache:
-          key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
-          paths:
-            - /root/.cache/go-build
-      - store_artifacts:
-          path: _output/
-
-  test:
-    requires:
-      - check
-    docker:
-      - image: yunionio/centos-build:1.1-4
-        environment:
-          ONECLOUD_CI_BUILD: "1"
-    working_directory: /root/go/src/yunion.io/x/onecloud
-    parallelism: 4
-    steps:
-      - checkout
-      - restore_cache:
-          key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
-          paths:
-            - /root/.cache/go-build
-      - run:
-          name: unit_test
-          command: |
-            ./scripts/coverage.sh --codecov
-      - save_cache:
-          key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
-          paths:
-            - /root/.cache/go-build
 
 workflows:
   version: 2
   build_and_test:
     jobs:
-      - check
-      - build:
-          requires:
-            - check
-      - test:
-          requires:
-            - check
+      - test

.editorconfig

@@ -0,0 +1,3 @@
+[*.sh]
+indent_style = space
+indent_size = 4

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,18 +1,20 @@
 ---
 name: Bug report
-about: Create a report to help us improve
-title: ''
+about: 报告代码缺陷/Create a bug report to help us improve
+title: '[BUG]'
 labels: bug
 assignees: ''
 
 ---
 
-**What happened**:
+**问题描述/What happened**:
 
-**Environment**:
+**环境/Environment**:
 
 - OS (e.g. `cat /etc/os-release`):
 - Kernel (e.g. `uname -a`):
+- Host: (e.g. `dmidecode | egrep -i 'manufacturer|product' |sort -u`)
+- Service Version (e.g. `kubectl exec -n onecloud $(kubectl get pods -n onecloud | grep climc | awk '{print $1}') -- climc version-list`):
 <!--
 - Version (e.g. `climc version-list`):
 -->

.github/ISSUE_TEMPLATE/document_request.md

@@ -1,7 +1,7 @@
 ---
-name: Document Request
-about: Document request to this project
-title: ''
+name: 文档问题/Document Request
+about: 文档相关缺陷改进/Document request to this project
+title: '[文档/Docs]'
 labels:
 - area/docs
 - enhancement

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,7 +1,7 @@
 ---
-name: Feature Request
-about: Suggest an idea for this project
-title: ''
+name: 新特性/Feature Request
+about: 建议新功能特性/Suggest an idea for this project
+title: '[Feature]'
 labels: feature
 assignees: ''
 

.github/ISSUE_TEMPLATE/support-request.md

@@ -1,7 +1,7 @@
 ---
-name: Support Request
-about: Support request or question relating to this project
-title: ''
+name: 求助/Support Request
+about: 求助使用中遇到的问题/Support request relating to this project
+title: '[求助/Help]'
 labels: question
 assignees: ''
 

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

@@ -0,0 +1,38 @@
+name: Building and test for PR
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+
+    - name: Install check tools
+      shell: bash
+      run: |
+        set -o xtrace
+        git clone --branch yun --depth 4 https://github.com/yousong/tools && cd tools
+        go build ./cmd/goimports && sudo cp goimports /usr/bin/ && cd .. && rm -rf tools
+        git clone --depth 4 https://github.com/yousong/y18n && cd y18n
+        go build . && sudo cp y18n /usr/bin && cd .. && rm -rf y18n
+
+    
+    - name: Test and build
+      shell: bash
+      run: |
+        set -o xtrace
+        export GO111MODULE=on
+        make -j3 check
+        make test
+        targets="$(find cmd -mindepth 1 -maxdepth 1 -type d | grep -v cmd/host-image)"
+        echo $targets | tr ' ' '\n'
+        make $targets
+        ls -lh _output/bin

.github/workflows/docker.yml

@@ -1,233 +0,0 @@
-name: Docker image
-
-on:
-  push:
-    branches:
-    - master
-    - releases/*
-    #paths:
-    #- 'cmd/*'
-    #- 'pkg/*'
-    #- 'vendor/*'
-
-jobs:
-
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Set up Go 1.14
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.14
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v1
-
-    - name: Build
-      run: |
-        sudo apt-get update
-        sudo apt-get install librados-dev librbd-dev # baremetal-agent needs this
-        make cmd/baremetal-agent && ./scripts/bundle_libraries.sh _output/bin/bundles/baremetal-agent _output/bin/baremetal-agent
-        make docker-alpine-build F='-j4 cmd/host cmd/vpcagent cmd/region-dns make cmd/apigateway cmd/climc cmd/keystone make cmd/logger cmd/region cmd/scheduler cmd/webconsole make cmd/yunionconf cmd/glance cmd/torrent cmd/s3gateway make cmd/ansibleserver cmd/cloudnet cmd/notify make cmd/host-deployer make cmd/cloudevent cmd/devtool cmd/cloudid make cmd/*cli make cmd/esxi-agent'
-    - name: Image region
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/region
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.region
-
-    - name: Image host
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/host
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.host
-
-    - name: Image host-deployer
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/host-deployer
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.host-deployer
-
-    - name: Image baremetal-agent
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/baremetal-agent
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.baremetal-agent
-
-    - name: Image esxi-agent
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/esxi-agent
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.esxi-agent
-
-    - name: Image vpcagent
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/vpcagent
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.vpcagent
-
-    - name: Image climc
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/climc
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.climc
-
-    - name: Image keystone
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/keystone
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.keystone
-
-    - name: Image logger
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/logger
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.logger
-
-    - name: Image scheduler
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/scheduler
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.scheduler
-
-    - name: Image apigateway
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/apigateway
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.apigateway
-
-    - name: Image s3gateway
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/s3gateway
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.s3gateway
-
-    - name: Image ansibleserver
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.ansibleserver
-
-    - name: Image cloudnet
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudnet
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.cloudnet
-
-    - name: Image glance
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/glance
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.glance
-
-    - name: Image notify
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/notify
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.notify
-
-    - name: Image cloudevent
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudevent
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.cloudevent
-
-    - name: Image cloudid
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudid
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.cloudid
-
-    - name: Image devtool
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/devtool
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.devtool
-
-    - name: Image region DNS
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/region-dns
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.region-dns

.github/workflows/docker_apigateway.yml

@@ -0,0 +1,52 @@
+name: Apigateway Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/appsrv/**.go'
+      - 'pkg/cloudcommon/db/**.go'
+      - 'pkg/apigateway/**.go'
+      - 'pkg/apis/apigateway/**.go'
+      - 'pkg/mcclient/modules/**.go'
+jobs:
+  build_apigateway:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+       
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image apigateway

.github/workflows/docker_climc.yml

@@ -0,0 +1,50 @@
+name: Climc Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'cmd/climc/**.go'
+      - 'pkg/mcclient/**.go'
+      - 'vendor/yunion.io/x/structarg/**.go'
+jobs:
+  build_climc:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image climc

.github/workflows/docker_cloudmon.yml

@@ -0,0 +1,51 @@
+name: Cloudmon Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/appsrv/**.go'
+      - 'pkg/cloudmon/**.go'
+      - 'vendor/yunion.io/x/cloudmux/pkg/multicloud/loader/**.go'
+
+jobs:
+  build_webconsole:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image cloudmon

.github/workflows/docker_esxi_agent.yml

@@ -0,0 +1,49 @@
+name: Esxi Agent Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/esxi/**.go'
+
+jobs:
+  build_webconsole:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image esxi-agent

.github/workflows/docker_glance.yml

@@ -0,0 +1,53 @@
+name: Glance Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/appsrv/**.go'
+      - 'pkg/cloudcommon/db/**.go'
+      - 'pkg/image/**.go'
+      - 'pkg/apis/image/**.go'
+      - 'vendor/yunion.io/x/sqlchemy/**.go'
+      - 'vendor/yunion.io/x/jsonutils/**.go'
+jobs:
+  build_glance:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image glance

.github/workflows/docker_host.yml

@@ -0,0 +1,49 @@
+name: Host Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/hostman/**.go'
+      - 'pkg/apis/host/**.go'
+jobs:
+  build_host:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image host

.github/workflows/docker_keystone.yml

@@ -0,0 +1,53 @@
+name: Keystone Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/appsrv/**.go'
+      - 'pkg/cloudcommon/db/**.go'
+      - 'pkg/keystone/**.go'
+      - 'pkg/apis/identity/**.go'
+      - 'vendor/yunion.io/x/sqlchemy/**.go'
+      - 'vendor/yunion.io/x/jsonutils/**.go'
+jobs:
+  build_keystone:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+       
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image keystone

.github/workflows/docker_logger.yml

@@ -0,0 +1,53 @@
+name: Logger Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/appsrv/**.go'
+      - 'pkg/cloudcommon/db/**.go'
+      - 'pkg/logger/**.go'
+      - 'pkg/apis/logger/**.go'
+      - 'vendor/yunion.io/x/sqlchemy/**.go'
+      - 'vendor/yunion.io/x/jsonutils/**.go'
+jobs:
+  build_webconsole:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image logger

.github/workflows/docker_notify.yml

@@ -0,0 +1,53 @@
+name: Notify Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/appsrv/**.go'
+      - 'pkg/cloudcommon/db/**.go'
+      - 'pkg/notify/**.go'
+      - 'pkg/apis/notify/**.go'
+      - 'vendor/yunion.io/x/sqlchemy/**.go'
+      - 'vendor/yunion.io/x/jsonutils/**.go'
+jobs:
+  build_notify:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image notify

.github/workflows/docker_region.yml

@@ -0,0 +1,54 @@
+name: Region Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/appsrv/**.go'
+      - 'pkg/cloudcommon/db/**.go'
+      - 'pkg/compute/**.go'
+      - 'pkg/apis/compute/**.go'
+      - 'vendor/yunion.io/x/cloudmux/**.go'
+      - 'vendor/yunion.io/x/sqlchemy/**.go'
+      - 'vendor/yunion.io/x/jsonutils/**.go'
+jobs:
+  build_region:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image region

.github/workflows/docker_scheduler.yml

@@ -0,0 +1,50 @@
+name: Scheduler Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/scheduler/**.go'
+      - 'pkg/apis/scheduler/**.go'
+
+jobs:
+  build_webconsole:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image scheduler

.github/workflows/docker_webconsole.yml

@@ -0,0 +1,53 @@
+name: Webconsole Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/appsrv/**.go'
+      - 'pkg/cloudcommon/db/**.go'
+      - 'pkg/webconsole/**.go'
+      - 'pkg/apis/webconsole/**.go'
+      - 'vendor/yunion.io/x/sqlchemy/**.go'
+      - 'vendor/yunion.io/x/jsonutils/**.go'
+jobs:
+  build_webconsole:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image webconsole

.gitignore

@@ -41,3 +41,5 @@ pkg/generated
 
 # gotext extracted
 out.gotext.json
+
+pkg/notify/sender/email_test.go

Makefile

@@ -49,7 +49,7 @@ 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  -L ${LIBQEMUIO_PATH}/src
+		X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread -lgnutls -lnettle -L ${LIBQEMUIO_PATH}/src
 endif
 
 export GOOS ?= linux
@@ -241,10 +241,25 @@ y18n-check:
 
 .PHONY: y18n-check
 
+define hostdeployer-grpc-gen
+	set -o errexit; \
+	set -o pipefail; \
+	protoc -I pkg/hostman/hostdeployer/apis \
+		--go_out=pkg/hostman/hostdeployer/apis \
+		--go_opt=paths=source_relative \
+		--go-grpc_out=pkg/hostman/hostdeployer/apis \
+		--go-grpc_opt=paths=source_relative \
+		pkg/hostman/hostdeployer/apis/deploy.proto
+
+endef
+
+hostdeployer-grpc-gen:
+	$(hostdeployer-grpc-gen)
+
 check: fmt-check
 check: gendocgo-check
 check: goimports-check
-check: vet-check
+#check: vet-check
 #check: y18n-check
 .PHONY: check
 
@@ -267,10 +282,14 @@ dep:
 	@echo "$$depDeprecated"
 	@$(MAKE) mod
 
+RELEASE_BRANCH:=release/3.11
+GOPROXY ?= direct
+
 mod:
-	go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p'))
-	go mod tidy
-	go mod vendor -v
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d yunion.io/x/cloudmux@$(RELEASE_BRANCH)
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p' | grep -v '/cloudmux$$'))
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go mod tidy
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go mod vendor -v
 
 define helpText
 Build with docker
@@ -330,7 +349,7 @@ image:
 .PHONY: image
 
 image-telegraf-raid-plugin:
-	VERSION=release-1.6.1 ARCH=all make image telegraf-raid-plugin
+	VERSION=release-1.6.5 ARCH=all make image telegraf-raid-plugin
 
 %:
 	@:

Makefile.common.mk

@@ -4,12 +4,12 @@ __inc_Makefile_common_mk:=1
 ifeq ($(ModName),)
   $(error ModName must be set, e.g. yunion.io/x/onecloud)
 endif
+
 ModBaseName:=$(notdir $(ModName))
 
 DockerImageRegistry?=registry.cn-beijing.aliyuncs.com
-DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:1.1-5
-DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:1.1-5
-
+DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:3.16.0-go-1.18.2-0
+DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:go-1.18.3-0
 
 EnvIf=$(if $($(1)),$(1)=$($(1)))
 
@@ -17,6 +17,7 @@ define dockerCentOSBuildCmd
 set -o xtrace
 set -o errexit
 set -o pipefail
+git config --global --add safe.directory /root/go/src/yunion.io/x/$(ModBaseName)
 cd /root/go/src/yunion.io/x/$(ModBaseName)
 env \
 	$(call EnvIf,GOARCH) \
@@ -26,12 +27,14 @@ env \
 chown -R $(shell id -u):$(shell id -g) _output
 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-$(ModBaseName) &>/dev/null || true
+	docker rm --force docker-centos-build-$(tmpName) &>/dev/null || true
 	docker run \
 		--rm \
-		--name docker-centos-build-$(ModBaseName) \
+		--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 \
@@ -42,7 +45,7 @@ docker-centos-build:
 # 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-$(ModBaseName) || true
+	docker stop --time 0 docker-centos-build-$(tmpName) || true
 
 .PHONY: docker-centos-build
 .PHONY: docker-centos-build-stop
@@ -52,7 +55,9 @@ define dockerAlpineBuildCmd
 set -o xtrace
 set -o errexit
 set -o pipefail
+git config --global --add safe.directory /root/go/src/yunion.io/x/$(ModBaseName)
 cd /root/go/src/yunion.io/x/$(ModBaseName)
+git config --global --add safe.directory /root/go/src/yunion.io/x/onecloud
 env \
 	$(call EnvIf,GOARCH) \
 	$(call EnvIf,GOOS) \
@@ -63,10 +68,10 @@ endef
 
 docker-alpine-build: export dockerAlpineBuildCmd:=$(call dockerAlpineBuildCmd,$(F))
 docker-alpine-build:
-	docker rm --force docker-alpine-build-$(ModBaseName) &>/dev/null || true
+	docker rm --force docker-alpine-build-$(tmpName) &>/dev/null || true
 	docker run \
 		--rm \
-		--name docker-alpine-build-$(ModBaseName) \
+		--name docker-alpine-build-$(tmpName) \
 		-v $(CURDIR):/root/go/src/yunion.io/x/$(ModBaseName) \
 		-v $(CURDIR)/_output/alpine-build:/root/go/src/yunion.io/x/$(ModBaseName)/_output \
 		-v $(CURDIR)/_output/alpine-build/_cache:/root/.cache \
@@ -75,7 +80,7 @@ docker-alpine-build:
 	ls -lh _output/alpine-build/bin
 
 docker-alpine-build-stop:
-	docker stop --time 0 docker-alpine-build-$(ModBaseName) || true
+	docker stop --time 0 docker-alpine-build-$(tmpName) || true
 
 .PHONY: docker-alpine-build
 .PHONY: docker-alpine-build-stop

OWNERS

@@ -1,9 +1,6 @@
 # See the OWNERS docs at https://go.k8s.io/owners
-reviewers:
-  - Zexi
-  - ioito
-  - swordqiu
-  - tb365
 approvers:
   - swordqiu
   - Zexi
+  - ioito
+  - wanyaoqi

README-CN.md

@@ -21,16 +21,184 @@ Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的
 
 ## 功能
 
-Cloudpods提供了如下的功能：
+### 概览 & UI 展示
+
+<details>
+  <summary>管理多云资源的功能，可以管理大多数的主流云，包括私有云，例如OpenStack，以及公有云，例如AWS，Azure，GCP，阿里云，华为云和腾讯云等</summary>
+  <ul>
+    <li>
+      <p>云帐号纳管</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudselect.png" alt="multi cloud management">
+    </li>
+    <li>
+      <p>云帐号列表</p>
+      <img src="https://i.imgur.com/Q0LipfI.png" alt="cloud account list">
+    </li>
+    <li>
+      <p>公有云虚拟机列表</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/publicvmlist.png">
+    </li>
+  </ul>
+</details>
+
+<details>
+  <summary>
+  一个可以管理海量KVM虚拟机的轻量级私有云
+  </summary>
+  <ul>
+    <li>
+      <p>虚拟机列表</p>
+      <img src="https://i.imgur.com/DbkRUoo.png">
+    </li>
+    <li>
+      <p>虚拟机创建页面</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createkvmvm1.png">
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createkvmvm2.png">
+    </li>
+    <li>
+      <p>虚拟机可通过 VNC 或者 SSH 登录</p>
+      <img src="https://i.imgur.com/m0rkeQ3.png">
+    </li>
+    <li>
+      <p>宿主机列表</p>
+      <img src="https://imgur.com/i509t5a.png">
+    </li>
+    <li>
+      <p>镜像模板列表</p>
+      <img src="https://imgur.com/UVFLGi2.png">
+    </li>
+    <li>
+      <p>VPC列表</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vpclist.png">
+    </li>
+    <li>
+      <p>二层网络列表（经典网络）</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/wirelist.png">
+    </li>
+    <li>
+      <p>IP子网列表</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/ipsubnetlist.png">
+    </li> 
+    <li>
+      <p>弹性公网IP列表（VPC网络）</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vpclist.png">
+    </li>
+    <li>
+      <p>LB列表</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/lblist.png">
+    </li>
+  </ul>
+</details>
+
+<details>
+  <summary>
+  一个能进行物理机全生命周期管理的裸机云
+  </summary>
+  <ul>
+    <li>
+      <p>物理机列表</p>
+      <img src="https://i.imgur.com/Jz8b5nC.png">
+    </li>
+    <li>
+      <p>物理机纳管</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/addphysicalmachine.png">
+    </li>
+    <li>
+      <p>安装操作系统</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createbaremetal.png">
+    </li>
+    <li>支持 ARM64 的物理机服务器</li>
+  </ul>
+</details>
+
+<details>
+  <summary>一套完整的多租户认证和访问控制体系</summary>
+  <ul>
+    <li>
+      <p>支持本地sql、LDAP 等认证源</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/idplist.png">
+    </li>
+    <li>
+      <p>多租户系统，包括域，项目，组，用户，角色和权限等</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/domainlist.png">
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/projectlist.png">
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/grouplist.png">
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/userlist.png">
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/rolelist.png">
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/policylist.png">
+    </li>
+  </ul>
+</details>
+
+<details>
+  <summary>
+  实现了VMware vSphere虚拟化集群的自助服务和自动化
+  </summary>
+  <ul>
+    <li>
+      <p>添加VMware云账号</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmware.png">
+    </li>
+    <li>
+      <p>VMware云账号列表</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwarelist.png">
+    </li>
+    <li>
+      <p>自动创建二层网络</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwarewirelist.png">
+    </li>
+    <li>
+      <p>自动创建IP子网</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwareipsubnetlist.png">
+    </li>
+    <li>
+      <p>新建VMware虚拟机</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmwarevm1.png">
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmwarevm2.png">
+    </li>
+  </ul>
+</details>
+
+
+<details>
+  <summary>
+  允许以统一的联邦身份访问各个云平台的原生控制台的SSO
+  </summary>
+  <ul>
+    <li>
+      <p>为云账号开启免密登录（以阿里云为例）</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/enablecloudsso.png">
+    </li>
+    <li>
+      <p>将Cloudpods平台用户添加为免密登录用户</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/addsamluser.png">
+    </li>
+    <li>
+      <p>多云统一登录入口</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudssoentry.png">
+    </li>
+    <li>
+      <p>多云统一登录-免密登录用户列表</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudsamluser.png">
+    </li>
+    <li>
+      <p>Cloudpods平台用户免密登录阿里云</p>
+    </li>
+  </ul>
+</details>
+
+<details>
+  <summary>
+  一套功能丰富、统一一致的RESTAPI和模型访问以上的云资源和功能
+  </summary>
+</details>
+
+<details>
+  <summary>
+  自动将镜像转换为不同云平台需要的格式的多云镜像服务
+  </summary>
+</details>
 
-* 管理多云资源的功能，可以管理大多数的主流云，包括私有云，例如OpenStack，以及公有云，例如AWS，Azure，GCP，阿里云，华为云和腾讯云等
-* 允许以统一的联邦身份访问各个云平台的原生控制台的SSO
-* 一个可以管理海量KVM虚拟机的轻量级私有云
-* 一个能进行物理机全生命周期管理的裸机云
-* 实现了VMware vSphere虚拟化集群的自助服务和自动化
-* 一套功能丰富、统一一致的RESTAPI和模型访问以上的云资源和功能
-* 一套完整的多租户认证和访问控制体系
-* 自动将镜像转换为不同云平台需要的格式的多云镜像服务
 
 ### 支持的云平台
 
@@ -42,15 +210,17 @@ Cloudpods提供了如下的功能：
   * 华为云
   * 腾讯云
   * UCloud
-  * 中国电信云
-  * 中国移动云
+  * 天翼云
+  * 移动云
   * 京东云
 * 私有云:
   * OpenStack
   * ZStack
-  * AlibabaCloud Aspara (阿里飞天)
+  * Alibaba Cloud Aspara (阿里飞天)
+  * Huawei HCSO (华为HCSO)
+  * Nutanix
 * 本地基础设施资源:
-  * KVM
+  * 基于 KVM 实现的轻量级私有云
   * VMWare vSphere vCenter/ESXi
   * Baremetals (IPMI, Redfish API)
   * Object storages (Minio, Ceph, XSky)
@@ -67,50 +237,12 @@ Cloudpods提供了如下的功能：
 * DNS: DNS zones, DNS records
 * VPC: VPCs, VPC peering, inter-VPC network, NAT gateway, DNAT/SNAT rules, route tables, route entries
 
-## 快速开始
+## 安装部署
 
-我们可以通过以下简单三步将Cloudpods安装在一台至少8GiB内存和100GB硬盘的Linux主机上（目前CentOS 7和Debian 10经过充分测试）
-
-(下面假设该主机的IP为 *10.168.26.216*)
-
-### 1. 准备SSH免密登录
-
-```bash
-# Generate the local ssh keypair
-# (SKIP this stekp if you already have ~/.ssh/id_rsa.pub locally)
-$ ssh-keygen
-# Copy the generated ~/.ssh/id_rsa.pub public key to the machine to be deployed
-$ ssh-copy-id -i ~/.ssh/id_rsa.pub root@10.168.26.216
-# Try to login to the machine to be deployed without password,
-# should be able to get the hostname of the deployed machine
-# without entering the login password
-$ ssh root@10.168.26.216 "hostname"
-```
-
-### 2. 安装git和相关工具
-
-#### CentOS 7安装git和epel源
-```bash
-yum install -y git epel-release ansible
-```
-
-#### Debian 10安装git
-```bash
-apt install -y git ansible
-```
-
-### 3. 安装Cloudpods
-
-通过以下命令开始安装Cloudpods：
-
-```bash
-# Git clone the ocboot installation tool locally
-$ git clone https://github.com/yunionio/ocboot && cd ./ocboot && ./run.py 10.168.26.216
-```
-
-大概10-30分钟后，安装完成。访问 https://10.168.26.216 登入Cloudpods的Web控制台。初始的账号为 *admin* ，密码为 *admin@123*
-
-请参考文档 [快速开始](https://www.cloudpods.org/zh/docs/quickstart/) 获得更详细的安装指导。
+- [All in One 安装](https://www.cloudpods.org/zh/docs/quickstart/allinone/)：在 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 服务，包括**内置私有云**和**多云管理**的功能。
 
 ## 文档
 
@@ -126,13 +258,13 @@ $ git clone https://github.com/yunionio/ocboot && cd ./ocboot && ./run.py 10.168
 
 您可以通过如下方式联系我们：
 
-* Reddit: [r/Cloudpods](https://www.reddit.com/r/Cloudpods/)
+* [服务订阅](https://www.yunion.cn/subscription/index.html)
 
-* 哔哩哔哩: [Cloudpods](https://space.bilibili.com/623431553/)
+* 哔哩哔哩: [Cloudpods](https://space.bilibili.com/3493131737631540/)
 
 * 微信: 请扫描如下二维码联系我们
 
-<img src="https://www.cloudpods.org/images/contact_me_qr_20210701.png" alt="WeChat QRCode">
+<img src="https://www.cloudpods.org/images/contact_me_qr_20230321.png" alt="WeChat QRCode">
 
 ## 版本历史
 

README.md

@@ -23,14 +23,186 @@ Cloudpods is a cloud-native open source unified multi/hybrid-cloud platform deve
 
 ## Features
 
-* Multi-cloud management that is able to manage a wide range of cloud providers, including private cloud, such as OpenStack, and public clouds, such as AWS, Azure, Google Cloud, Alibaba Cloud, Tencent Cloud, Huawei Cloud, etc.
-* Cloud SSO that allows accessing native webconsole of cloud providers with unified federated identities
-* A light-weight private cloud that manages KVM hypervisor in scale
-* A BareMetal cloud that automates the full life-cycle management of baremetal physical machines
-* VMware vSphere management that enables self-service and automation
-* One set of feature-rich APIs to access a wide range of resources from cloud providers above with consistent models and APIs
-* A complete multi-tenancy RBAC-enabled IAM (identity and access management) system
-* Multi-cloud image management system that automates image conversion between different cloud providers
+### Summary & UI
+
+<details>
+  <summary>
+  Multi-cloud management that is able to manage a wide range of cloud providers, including private cloud, such as OpenStack, and public clouds, such as AWS, Azure, Google Cloud, Alibaba Cloud, Tencent Cloud, Huawei Cloud, etc.
+  </summary>
+  <ul>
+    <li>
+      <p>Cloud account create form</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudselect.png" alt="multi cloud management">
+    </li>
+    <li>
+      <p>Cloud accounts list</p>
+      <img src="https://i.imgur.com/Q0LipfI.png" alt="cloud account list">
+    </li>
+    <li>
+      <p>Multi public cloud VM list</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/publicvmlist.png">
+    </li>
+  </ul>
+</details>
+
+<details>
+  <summary>
+  A light-weight private cloud that manages KVM hypervisor in scale
+  </summary>
+  <ul>
+    <li>
+      <p>VM instances list</p>
+      <img src="https://i.imgur.com/DbkRUoo.png">
+    </li>
+    <li>
+      <p>Create VM instance form</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createkvmvm1.png">
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createkvmvm2.png">
+    </li>
+    <li>
+      <p>VNC and SSH login page</p>
+      <img src="https://i.imgur.com/m0rkeQ3.png">
+    </li>
+    <li>
+      <p>Host list</p>
+      <img src="https://imgur.com/i509t5a.png">
+    </li>
+    <li>
+      <p>Image template list</p>
+      <img src="https://imgur.com/UVFLGi2.png">
+    </li>
+    <li>
+      <p>VPC list</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vpclist.png">
+    </li>
+    <li>
+      <p>Wire list (Classic Network)</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/wirelist.png">
+    </li>
+    <li>
+      <p>IPsubnet list</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/ipsubnetlist.png">
+    </li> 
+    <li>
+      <p>Eip list (VPC Network)</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vpclist.png">
+    </li>
+    <li>
+      <p>LB list</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/lblist.png">
+    </li>   
+  </ul>
+</details>
+
+<details>
+  <summary>
+  A BareMetal cloud that automates the full life-cycle management of baremetal physical machines
+  </summary>
+  <ul>
+    <li>
+      <p>BareMetal list</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/physicalmachinelist.png">
+    </li>
+    <li>
+      <p>Baremetal Management</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/addphysicalmachine.png">
+    </li>
+    <li>
+      <p>Create OS on BareMetal</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createbaremetal.png">
+    </li>
+    <li>ARM64 baremetal supported</li>
+  </ul>
+</details>
+
+<details>
+  <summary>
+  A complete multi-tenancy RBAC-enabled IAM (identity and access management) system
+  </summary>
+  <ul>
+    <li>
+      <p>sql, LDAP supported</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/idplist.png">
+    </li>
+    <li>
+      <p>Multi-tenancy system, include domain, project, group, user, role, policy</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/domainlist.png">
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/projectlist.png">
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/grouplist.png">
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/userlist.png">
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/rolelist.png">
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/policylist.png">
+  </ul>
+</details>
+
+<details>
+  <summary>
+  VMware vSphere management that enables self-service and automation
+  </summary>
+  <ul>
+    <li>
+      <p>Add VMware account</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmware.png">
+    </li>
+    <li>
+      <p>VMware account list</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwarelist.png">
+    </li>
+    <li>
+      <p>Automatic creation of wire</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwarewirelist.png">
+    </li>
+    <li>
+      <p>Automatic creation of ipsubnet</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwareipsubnetlist.png">
+    </li>
+    <li>
+      <p>Create a VMware VM instance</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmwarevm1.png">
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmwarevm2.png">
+    </li>
+  </ul>
+</details>
+
+
+<details>
+  <summary>
+  Cloud SSO that allows accessing native webconsole of cloud providers with unified federated identities
+  </summary>
+  <ul>
+    <li>
+      <p>Enable the SSO login function of the cloud account (aliyun as an example)</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/enablecloudsso.png">
+    </li>
+    <li>
+      <p>create saml users</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/addsamluser.png">
+    </li>
+    <li>
+      <p>Cloud SSO entry</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudssoentry.png">
+    </li>
+    <li>
+      <p>Cloud SSO - SSO login user</p>
+      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudsamluser.png">
+    </li>
+    <li>
+      <p>Sign in to the public cloud platform with SSO</p>
+    </li>
+  </ul>
+</details>
+
+<details>
+  <summary>
+  One set of feature-rich APIs to access a wide range of resources from cloud providers above with consistent models and APIs
+  </summary>
+</details>
+
+<details>
+  <summary>
+  Multi-cloud image management system that automates image conversion between different cloud providers
+  </summary>
+</details>
 
 ### Supported cloud providers
 
@@ -48,9 +220,11 @@ Cloudpods is a cloud-native open source unified multi/hybrid-cloud platform deve
 * Private Clouds:
   * OpenStack
   * ZStack
-  * AlibabaCloud Aspara
+  * Alibaba Cloud Aspara
+  * Huawei HCSO
+  * Nutanix
 * On-premise resources:
-  * KVM
+  * Lightweight private cloud built on KVM
   * VMWare vSphere vCenter/ESXi
   * Baremetals (IPMI, Redfish API)
   * Object storages (Minio, Ceph, XSky)
@@ -67,54 +241,12 @@ Cloudpods is a cloud-native open source unified multi/hybrid-cloud platform deve
 * DNS: DNS zones, DNS records
 * VPC: VPCs, VPC peering, inter-VPC network, NAT gateway, DNAT/SNAT rules, route tables, route entries
 
-## Quick start
-
-You may install Cloudpods in a Linux box (currently CentOS 7 and Debian 10 are fully tested) with at least 8GiB RAM and 100GB storage by following three steps.
-
-(Assuming that you install Cloudpods on a Linux box with IP *10.168.26.216*):
-
-
-### 1. Prepare passwordless SSH login
-
-```bash
-# Generate a local ssh keypair
-# (SKIP this step if you already have ~/.ssh/id_rsa.pub locally)
-$ ssh-keygen
-
-# Copy the generated ~/.ssh/id_rsa.pub public key to the machine to be deployed
-$ ssh-copy-id -i ~/.ssh/id_rsa.pub root@10.168.26.216
-
-# Try to login to the machine to be deployed without password,
-# should be able to get the hostname of the deployed machine
-# without entering the login password
-$ ssh root@10.168.26.216 "hostname"
-```
-
-### 2. Install git and relevant tools
-
-#### For CentOS 7
-```bash
-yum install -y git epel-release ansible
-```
-
-#### For Debian 10
-```bash
-apt install -y git ansible
-```
-
-### 3. Install Cloudpods
-
-Run the following commands to start installing Cloudpods.
-
-```bash
-# Git clone the ocboot installation tool locally
-$ git clone https://github.com/yunionio/ocboot && cd ./ocboot && ./run.py 10.168.26.216
-```
-
-It takes 10-30 minutes to finish the installation. You may visit the webconsole of Cloudpods at https://10.168.26.216. The initial login account is *admin* and password is *admin@123*.
-
-For more detailed instructions, please refers to [quick start](https://www.cloudpods.org/en/docs/quickstart/).
+## Getting started
 
+- [All in One Installation](https://www.cloudpods.org/zh/docs/quickstart/allinone/)：Building a full-featured Cloudpods service on linux distributions such as CentOS 7 or Debian 10 allows for a quick experience of the **built-in private cloud** and **multi-cloud management** features.
+- [Kubernetes Helm Installation](https://www.cloudpods.org/zh/docs/quickstart/k8s/)：Deploying the Cloudpods CMP service on an existing Kubernetes cluster using Helm and experience the **multi-cloud management** feature.
+- [Docker Compose Installation](https://www.cloudpods.org/zh/docs/quickstart/docker-compose/)：Deploying the Cloudpods CMP service using Docker Compose and quickly experience the **multi-cloud management** feature.
+- [High availability installation](https://www.cloudpods.org/zh/docs/setup/ha-ce/)：Deploying Cloudpods services in a highly available manner for production environments, including **built-in private cloud** and **multi-cloud management** features.
 
 ## Documentations
 
@@ -131,13 +263,13 @@ Please check this [issue](https://github.com/yunionio/cloudpods/issues/11427) fo
 
 You may contact us by:
 
-* Reddit: [r/Cloudpods](https://www.reddit.com/r/Cloudpods/)
+* [Subscription](https://www.yunion.cn/subscription/index.html)
 
-* Bilibili: [Cloudpods](https://space.bilibili.com/623431553/)
+* Bilibili: [Cloudpods](https://space.bilibili.com/3493131737631540/)
 
 * WeChat: please scan the following QRCode to contact us
 
-<img src="https://www.cloudpods.org/images/contact_me_qr_20210701.png" alt="WeChat QRCode">
+<img src="https://www.cloudpods.org/images/contact_me_qr_20230321.png" alt="WeChat QRCode">
 
 ## Changelog
 

build/build.sh

@@ -44,7 +44,12 @@ echo "Build root ${BUILDROOT}"
 if [ -z "$VERSION" ]; then
 	TAG=$(git describe --abbrev=0 --tags || echo testing)
 	VERSION=${TAG/\//-}
-	VERSION=${VERSION/v/}
+	if [[ "$VERSION" =~ ^v0. ]]; then
+		VERSION=${VERSION/v0./}
+	elif [[ "$VERSION" =~ ^v ]]; then
+		VERSION=${VERSION/v/}
+	fi
+	VERSION=${VERSION//-/.}
 fi
 RELEASE=`date +"%y%m%d%H"`
 

build/build_deb.sh

@@ -48,7 +48,9 @@ mkdir -p $BUILDROOT/DEBIAN
 mkdir -p $BUILDROOT/$BIN_PATH
 
 cp -rf $BIN $BUILDROOT/$BIN_PATH
-cp -rf $ROOT/root/* $BUILDROOT/
+if [ -d $ROOT/root ]; then
+    cp -rf $ROOT/root/* $BUILDROOT/
+fi
 
 
 echo "Build root ${BUILDROOT}"

build/climc/root/opt/climc-entrypoint.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+BASHRC=/etc/profile.d/climc.sh
+
+grep -q rcadmin $BASHRC || echo 'source /etc/yunion/rcadmin' >> $BASHRC
+
+source $BASHRC
+
+climc sshkeypair-inject --admin --target-dir /root/
+
+mkdir -p /etc/dropbear
+
+mkdir -p /var/run/dropbear
+
+test -f /etc/dropbear/dropbear_rsa_host_key || dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
+
+dropbear -RFEjk -G root -p 22

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

@@ -1,3 +1,14 @@
+export PATH=/opt/yunion/bin:$PATH
+
+if [ -f /etc/profile.d/bash_completion.sh ]; then
+    source /etc/profile.d/bash_completion.sh
+fi
+
+test -f /etc/yunion/rcadmin && source /etc/yunion/rcadmin
+
+source <(climc --completion bash)
+source <(kubectl completion bash)
+
 echo "Welcome to Cloud Shell :-) You may execute climc and other command tools in this shell."
 echo "Please exec 'climc' to get started"
 echo ""

build/climc/root/opt/yunion/scripts/tools/clean_host.sh

@@ -47,6 +47,11 @@ do
     climc server-purge $i > /dev/null
 done
 
+for i in $(climc server-list --admin --limit 2048 --system  --filter "backup_host_id.equals($HOSTID)" | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    climc server-delete-backup $i > /dev/null
+done
+
 echo "3. Clean disks on $HOSTNAME($HOSTID)"
 
 for storageid in $(climc host-storage-list --host $HOSTID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $4}')

build/docker/Dockerfile.ansibleserver

@@ -1,7 +1,7 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.0.5-2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.1.1
 
 # install playbook and telegraf install pkg
-COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.3.4 /opt/yunion/playbook /opt/yunion/playbook
-COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.3.4 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg
+COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.4.0 /opt/yunion/playbook /opt/yunion/playbook
+COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.4.0 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg
 
 ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver

build/docker/Dockerfile.ansibleserver-base

@@ -4,12 +4,25 @@ MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
 
 ENV TZ UTC
 
+RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
+
 # openssh-client, for ansible ssh connection
 # git, ca-certificates, for fetching ansible roles
 RUN set -x \
-	&& apk update \
-	&& apk add openssh-client \
-	&& apk add sshpass \
-	&& apk add ansible \
-	&& apk add tzdata git ca-certificates \
-	&& rm -rf /var/cache/apk/*
+  && apk update \
+  && apk add openssh-client \
+  && apk add sshpass \
+  && apk add py3-pip \
+  && apk add tzdata git ca-certificates
+
+RUN apk add --no-cache openssh openssl curl rsync pv mariadb-client
+RUN apk add --no-cache --virtual .build-dependencies \
+  libffi-dev openssl-dev python3-dev build-base py-setuptools rust cargo mariadb-dev
+
+# ansible should be installed
+# after setuptools and wheel
+RUN pip3 install -U pip setuptools wheel \
+  && pip3 install paramiko mysqlclient pywinrm \
+  && pip3 install 'ansible<=9.0.0' \
+  && apk del --no-network .build-dependencies \
+  && rm -rf /root/.cache /root/.cargo /var/cache/apk/*

build/docker/Dockerfile.apimap

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

build/docker/Dockerfile.baremetal-agent

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.3-2-grub
+FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.9-20231219.0
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 

build/docker/Dockerfile.baremetal-base

@@ -1,10 +1,12 @@
 #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:v0.1.1 as yunionos
+FROM registry.cn-beijing.aliyuncs.com/yunionio/yunionos:v3.10.8-20231215.0 as yunionos
 
 FROM centos:8 as grub-stage
 
+RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
 RUN dnf install -y grub2*
 
 # make grub_booti386 firmware

build/docker/Dockerfile.climc

@@ -1,7 +1,7 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20210901
+FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20230731.5
 
 ADD ./build/climc/root/opt /opt
 
-RUN cat /opt/yunion/scripts/motd/climc.sh >> /root/.bashrc
+RUN cp /opt/yunion/scripts/motd/climc.sh /etc/profile.d/climc.sh && ln -sf /etc/profile.d/climc.sh /root/.bashrc
 
 ADD ./_output/alpine-build/bin/climc ./_output/alpine-build/bin/*cli /opt/yunion/bin/

build/docker/Dockerfile.climc-base

@@ -1,5 +1,9 @@
 FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
 
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+ARG TARGETARCH
+
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
 ENV TZ Asia/Shanghai
@@ -8,11 +12,13 @@ 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 kubectl ceph-common && \
+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 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
 
-ENV PATH="/opt/yunion/bin:${PATH}"
-
 RUN mkdir -p /opt/yunion/bin

build/docker/Dockerfile.esxi-agent

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

build/docker/Dockerfile.file-repo

@@ -11,10 +11,12 @@ RUN set -x \
 
 # install default playbook and install pkg
 Run mkdir -p /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~fe11a96b-0.aarch64.rpm -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~fe11a96b-0.x86_64.rpm -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.19.2-yn~fe11a96b-0_amd64.deb -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.19.2-yn~fe11a96b-0_arm64.deb -P /opt/yunion/ansible-install-pkg
+Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~be742cbf-0.x86_64.rpm -P /opt/yunion/ansible-install-pkg
+Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~be742cbf-0.aarch64.rpm -P /opt/yunion/ansible-install-pkg
+Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.19.2-yn~be742cbf-0_arm64.deb -P /opt/yunion/ansible-install-pkg
+Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.19.2-yn~be742cbf-0_amd64.deb -P /opt/yunion/ansible-install-pkg
+Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~be742cbf_windows_amd64.zip -P /opt/yunion/ansible-install-pkg
+Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~be742cbf_windows_i386.zip -P /opt/yunion/ansible-install-pkg
 
 Run mkdir -p /opt/yunion/playbook
 Run mkdir /opt/yunion/playbook/monitor-agent

build/docker/Dockerfile.glance

@@ -1,8 +1,5 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20210815.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/glance-base:v0.0.1
 
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-RUN apk add --no-cache s3fs-fuse --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing
 ENV TZ UTC
 RUN mkdir -p /opt/yunion/bin
 ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance

build/docker/Dockerfile.glance-base

@@ -0,0 +1,5 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20210815.0
+
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+
+RUN apk add --no-cache s3fs-fuse --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing

build/docker/Dockerfile.guacd

@@ -0,0 +1,214 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+#
+
+#
+# Dockerfile for guacamole-server
+#
+
+# 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 TARGETPLATFORM
+
+RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
+
+# Install build dependencies
+RUN apk add --no-cache                \
+        autoconf                      \
+        automake                      \
+        build-base                    \
+        cairo-dev                     \
+        cmake                         \
+        cunit-dev                     \
+        git                           \
+        grep                          \
+        libjpeg-turbo-dev             \
+        libpng-dev                    \
+        libtool                       \
+        libwebp-dev                   \
+        make                          \
+        openssl1.1-compat-dev         \
+        pango-dev                     \
+        pulseaudio-dev                \
+        util-linux-dev
+
+# Copy source to container for sake of build
+ARG BUILD_DIR=/tmp/guacamole-server
+ARG GUAC_VER=1.5.3
+RUN git clone --branch=${GUAC_VER} https://github.com/apache/guacamole-server.git /tmp/guacamole-server
+
+#
+# Base directory for installed build artifacts.
+#
+# NOTE: Due to limitations of the Docker image build process, this value is
+# duplicated in an ARG in the second stage of the build.
+#
+ARG PREFIX_DIR=/opt/guacamole
+
+#
+# Automatically select the latest versions of each core protocol support
+# library (these can be overridden at build time if a specific version is
+# needed)
+#
+ARG WITH_FREERDP='2(\.\d+)+'
+ARG WITH_LIBSSH2='libssh2-\d+(\.\d+)+'
+ARG WITH_LIBTELNET='\d+(\.\d+)+'
+ARG WITH_LIBVNCCLIENT='LibVNCServer-\d+(\.\d+)+'
+ARG WITH_LIBWEBSOCKETS='v\d+(\.\d+)+'
+
+#
+# Default build options for each core protocol support library, as well as
+# guacamole-server itself (these can be overridden at build time if different
+# options are needed)
+#
+
+ARG FREERDP_OPTS="\
+    -DBUILTIN_CHANNELS=OFF \
+    -DCHANNEL_URBDRC=OFF \
+    -DWITH_ALSA=OFF \
+    -DWITH_CAIRO=ON \
+    -DWITH_CHANNELS=ON \
+    -DWITH_CLIENT=ON \
+    -DWITH_CUPS=OFF \
+    -DWITH_DIRECTFB=OFF \
+    -DWITH_FFMPEG=OFF \
+    -DWITH_GSM=OFF \
+    -DWITH_GSSAPI=OFF \
+    -DWITH_IPP=OFF \
+    -DWITH_JPEG=ON \
+    -DWITH_LIBSYSTEMD=OFF \
+    -DWITH_MANPAGES=OFF \
+    -DWITH_OPENH264=OFF \
+    -DWITH_OPENSSL=ON \
+    -DWITH_OSS=OFF \
+    -DWITH_PCSC=OFF \
+    -DWITH_PULSE=OFF \
+    -DWITH_SERVER=OFF \
+    -DWITH_SERVER_INTERFACE=OFF \
+    -DWITH_SHADOW_MAC=OFF \
+    -DWITH_SHADOW_X11=OFF \
+    -DWITH_SSE2=ON \
+    -DWITH_WAYLAND=OFF \
+    -DWITH_X11=OFF \
+    -DWITH_X264=OFF \
+    -DWITH_XCURSOR=ON \
+    -DWITH_XEXT=ON \
+    -DWITH_XI=OFF \
+    -DWITH_XINERAMA=OFF \
+    -DWITH_XKBFILE=ON \
+    -DWITH_XRENDER=OFF \
+    -DWITH_XTEST=OFF \
+    -DWITH_XV=OFF \
+    -DWITH_ZLIB=ON"
+
+ARG GUACAMOLE_SERVER_OPTS="\
+    --disable-guaclog"
+
+ARG LIBSSH2_OPTS="\
+    -DBUILD_EXAMPLES=OFF \
+    -DBUILD_SHARED_LIBS=ON"
+
+ARG LIBTELNET_OPTS="\
+    --disable-static \
+    --disable-util"
+
+ARG LIBVNCCLIENT_OPTS=""
+
+ARG LIBWEBSOCKETS_OPTS="\
+    -DDISABLE_WERROR=ON \
+    -DLWS_WITHOUT_SERVER=ON \
+    -DLWS_WITHOUT_TESTAPPS=ON \
+    -DLWS_WITHOUT_TEST_CLIENT=ON \
+    -DLWS_WITHOUT_TEST_PING=ON \
+    -DLWS_WITHOUT_TEST_SERVER=ON \
+    -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
+
+
+# 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   \
+        > ${PREFIX_DIR}/DEPENDENCIES
+
+# 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
+
+# Copy build artifacts into this stage
+COPY --from=builder ${PREFIX_DIR} ${PREFIX_DIR}
+
+# Bring runtime environment up to date and install runtime dependencies
+RUN apk add --no-cache                \
+        ca-certificates               \
+        ghostscript                   \
+        netcat-openbsd                \
+        shadow                        \
+        terminus-font                 \
+        ttf-dejavu                    \
+        ttf-liberation                \
+        util-linux-login && \
+    xargs apk add --no-cache < ${PREFIX_DIR}/DEPENDENCIES
+
+# 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
+
+# Create a new user guacd
+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
+
+# 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

build/docker/Dockerfile.host

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.4.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.5.0
 
 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 

build/docker/Dockerfile.host-deployer

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:1.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:1.4.6
 
 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 

build/docker/Dockerfile.host-health

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

build/docker/Dockerfile.lbagent

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

build/docker/Dockerfile.lbagent-base

@@ -0,0 +1,35 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.12.4-2
+
+MAINTAINER "Jian QIU <qiujian@yunion.cn>"
+
+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 set -x \
+    && apk update \
+    && apk upgrade \
+    && apk add --no-cache bash haproxy keepalived iptables \
+    && apk add --no-cache --virtual .build-deps \
+        build-base \
+        make \
+       	go \
+        git \
+        gcc \
+        libc-dev \
+        libgcc \
+        linux-headers
+
+RUN set -x \
+    && mkdir -p $GOPATH/src/github.com/yyyar $GOPATH/bin \
+    && cd $GOPATH/src/github.com/yyyar \
+    && git clone --depth 1 https://github.com/yyyar/gobetween.git \
+    && cd gobetween \
+    && make deps \
+    && make build \
+    && cp bin/gobetween /bin/gobetween \
+    && rm -fr $GOPATH \
+    && apk del .build-deps \
+    && rm -rf /var/cache/apk/*

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

@@ -0,0 +1,13 @@
+FROM alpine:3.15.4
+
+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.telegraf-raid-plugin

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

build/docker/Dockerfile.webconsole

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

build/docker/Makefile

@@ -8,31 +8,42 @@ debian10-base:
 		-t registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0 -f ./Dockerfile.debian-base .
 
 ONECLOUD_BASE_VERSION = v0.3-3.13.5
+ONECLOUD_BASE_VERSION_3-15-4 = v3.15.4-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 .
 
-ANSIBLESERVER_BASE = v1.0.5-2
+ANSIBLESERVER_BASE = v1.1.2
 
 ansibleserver-base:
 	$(DOCKER_BUILDX)/ansibleserver-base:$(ANSIBLESERVER_BASE) -f ./Dockerfile.ansibleserver-base .
 
-CLIMC_BASE_VERSION = 20210901
+CLIMC_BASE_VERSION = 20230731.5
 
 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 .
 
-WEBCONSOLE_BASE_VERSION = v0.2-1
+WEBCONSOLE_BASE_VERSION = 20230731.2
 webconsole-base:
 	$(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION) -f ./Dockerfile.webconsole-base .
 
-BAREMETAL_BASE_VERSION = v0.3.3-2-grub
+BAREMETAL_BASE_VERSION = v0.3.9-20231219.1
 
 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:
+	$(DOCKER_BUILDX)/torrent:$(TORRENT_VERSION) -f ./Dockerfile.torrent .
+
+GLANCE_BASE_VERSION = v0.0.1
+glance-base:
+	$(DOCKER_BUILDX)/glance-base:$(GLANCE_BASE_VERSION) -f ./Dockerfile.glance-base .
+
 FILE_REPO_VERSION = v0.3.3
 
 file-repo:
@@ -49,3 +60,17 @@ host-image:
 	docker manifest annotate $(HOST_IMAGE_NAME) $(HOST_IMAGE_NAME)-amd64 --arch amd64
 	docker manifest annotate $(HOST_IMAGE_NAME) $(HOST_IMAGE_NAME)-arm64 --arch arm64
 	docker manifest push $(HOST_IMAGE_NAME)
+
+LBAGENT_BASE_VERSION = v0.0.3
+lbagent-base:
+	$(DOCKER_BUILDX)/lbagent-base:$(LBAGENT_BASE_VERSION) -f ./Dockerfile.lbagent-base .
+
+GUACD_VERSION=1.5.3
+guacd:
+	docker buildx build --platform linux/arm64 --push \
+		-t registry.cn-beijing.aliyuncs.com/yunionio/guacd:$(GUACD_VERSION)-arm64 -f ./Dockerfile.guacd .
+	docker buildx build --platform linux/amd64 --push \
+		-t registry.cn-beijing.aliyuncs.com/yunionio/guacd:$(GUACD_VERSION)-amd64 -f ./Dockerfile.guacd .
+	docker buildx imagetools create -t registry.cn-beijing.aliyuncs.com/yunionio/guacd:$(GUACD_VERSION) \
+		registry.cn-beijing.aliyuncs.com/yunionio/guacd:$(GUACD_VERSION)-amd64 \
+		registry.cn-beijing.aliyuncs.com/yunionio/guacd:$(GUACD_VERSION)-arm64

build/docker/climc-entrypoint.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+BASHRC=/root/.bashrc
+
+source $BASHRC
+
+climc sshkeypair-inject --admin
+
+mkdir -p /etc/dropbear
+
+mkdir -p /var/run/dropbear
+
+dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
+
+dropbear -RFEjk -G root -p 22

build/docker/multi-arch/Dockerfile.host

@@ -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.16.0-go-1.18.2-0 as build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 RUN mkdir -p /root/go/src/yunion.io/x/onecloud

build/esxi-agent/root/opt/yunion/share/vmware/ovf.xml

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Envelope xmlns="http://schemas.dmtf.org/ovf/envelope/1"
-          xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
-          xmlns:cim="http://schemas.dmtf.org/wbem/wscim/1/common"
-          xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-          xmlns:vmw="http://www.vmware.com/schema/ovf"
-          xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <References>
-    <File ovf:href="{{ .Name }}" ovf:id="file1" ovf:size="{{ .Size }}"/>
-  </References>
-  <DiskSection>
-    <Info>Virtual disk information</Info>
-    <Disk ovf:capacity="{{ .Capacity }}" ovf:capacityAllocationUnits="byte" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:populatedSize="0"/>
-  </DiskSection>
-  <VirtualSystem ovf:id="{{ .ImportName }}">
-    <Info>A virtual machine</Info>
-    <Name>{{ .ImportName }}</Name>
-    <OperatingSystemSection ovf:id="100" vmw:osType="other26xLinux64Guest">
-      <Info>The kind of installed guest operating system</Info>
-    </OperatingSystemSection>
-    <VirtualHardwareSection>
-      <Info>Virtual hardware requirements</Info>
-      <System>
-        <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
-        <vssd:InstanceID>0</vssd:InstanceID>
-        <vssd:VirtualSystemIdentifier>{{ .ImportName }}</vssd:VirtualSystemIdentifier>
-        <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
-      </System>
-      <Item>
-        <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
-        <rasd:Description>Number of Virtual CPUs</rasd:Description>
-        <rasd:ElementName>1 virtual CPU(s)</rasd:ElementName>
-        <rasd:InstanceID>1</rasd:InstanceID>
-        <rasd:ResourceType>3</rasd:ResourceType>
-        <rasd:VirtualQuantity>1</rasd:VirtualQuantity>
-      </Item>
-      <Item>
-        <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
-        <rasd:Description>Memory Size</rasd:Description>
-        <rasd:ElementName>1024MB of memory</rasd:ElementName>
-        <rasd:InstanceID>2</rasd:InstanceID>
-        <rasd:ResourceType>4</rasd:ResourceType>
-        <rasd:VirtualQuantity>1024</rasd:VirtualQuantity>
-      </Item>
-      <Item>
-        <rasd:Address>0</rasd:Address>
-        <rasd:Description>SCSI Controller</rasd:Description>
-        <rasd:ElementName>SCSI Controller 0</rasd:ElementName>
-        <rasd:InstanceID>3</rasd:InstanceID>
-        <rasd:ResourceSubType>VirtualSCSI</rasd:ResourceSubType>
-        <rasd:ResourceType>6</rasd:ResourceType>
-      </Item>
-      <Item>
-        <rasd:AddressOnParent>0</rasd:AddressOnParent>
-        <rasd:ElementName>Hard Disk 1</rasd:ElementName>
-        <rasd:HostResource>ovf:/disk/vmdisk1</rasd:HostResource>
-        <rasd:InstanceID>9</rasd:InstanceID>
-        <rasd:Parent>3</rasd:Parent>
-        <rasd:ResourceType>17</rasd:ResourceType>
-        <vmw:Config ovf:required="false" vmw:key="backing.writeThrough" vmw:value="false"/>
-      </Item>
-    </VirtualHardwareSection>
-  </VirtualSystem>
-</Envelope>

build/memclean/vars

@@ -0,0 +1 @@
+DESCRIPTION="Memclean Utility"

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details.action -}}
+当前日志 ID: {{ $d.id }}

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

@@ -0,0 +1,16 @@
+{{- $d := .resource_details -}}
+{{- if eq .resource_type "db_table_record" }}
+表{{ $d.table_name }}记录{{ $d.name }}被修改，完整性校验失败。期望校验和({{ $d.expected_checksum }}) != 计算校验和({{ $d.calculated_checksum }})。
+{{- end -}}
+{{- if eq .resource_type "cloudpods_component" }}
+{{ $d.details }}
+{{- end -}}
+{{- if eq .resource_type "snapshot" }}
+快照{{ $d.name }}的内存快照完整性校验失败
+{{- end -}}
+{{- if eq .resource_type "image" }}
+镜像{{ $d.name }}完整性校验失败
+{{- end -}}
+{{- if eq .resource_type "vm_integrity" }}
+主机{{ $d.name }}完整性校验失败
+{{- end -}}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.name }} 发生异常: {{ $d.message }}

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

@@ -11,4 +11,4 @@
 {{- if $d.public_dns -}}
 ，外网地址为{{ $d.public_dns }}:{{ $d.public_connect_port }}的
 {{- end -}}
-{{ .resource_type_display }}{{ $d.name }}还有{{ .advance_days }}天就要到期释放，如需续期使用，请尽快前往控制台处理
+{{ .resource_type_display }}{{ $d.name }}还有{{ .advance_days }}天就要到期释放，{{ if $d.auto_renew }}到期已开启自动续费，{{ end }}如有其它变更，请尽快前往控制台处理

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

@@ -0,0 +1,18 @@
+{{- $d := .resource_details -}}
+数据库 {{$d.ip}} 的主从同步不一致，请及时检查。
+
+{{ range $status := $d.status }}
+数据库 {{$status.ip}} 状态:
+{{- if not $status.operator_error }}
+  - Slave_IO_Running: {{$status.slave_io_running}}
+  - Slave_SQL_Running: {{$status.slave_sql_running}}
+  {{- if $status.last_error }}
+  - Last_Error: {{$status.last_error}}
+  {{- end -}}
+  {{- if $status.last_io_error }}
+  - Last_IO_Error: {{$status.last_io_error}}
+  {{- end }}
+{{else}}
+  - Operator_Error: {{$status.operator_error}}
+{{- end}}
+{{end}}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.service_name }}服务的网络拓扑信息同步不一致，请及时检查。	

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.name }} 离线 {{- if $d.reason -}} 原因: {{ $d.reason }} {{- end -}}

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

@@ -0,0 +1,4 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.task_name }} PANIC {{- if $d.error -}} 错误: {{ $d.error }} {{- end -}}
+堆栈信息: 
+{{ $d.stack }}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.account }}:您的密码将在{{ $d.advance_days }} 天后过期，请及时登录平台更新密码。

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+您在{{ $d.project }}项目的虚拟机{{ $d.name }}崩溃了

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

@@ -0,0 +1,8 @@
+{{- $d := .resource_details -}}
+服务: {{ $d.service_name }} 异常。
+方法: {{ $d.method }}
+路径: {{ $d.path }} 
+{{- if $d.body }}
+请求: {{ $d.body -}}
+{{ end }}
+错误: {{ $d.error }}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+云账号{{ $d.name }}状态异常，请及时检查。

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+账号{{ $d.name }}由于异常登录已被锁定，请核实情况，如果需要为用户解锁，请到用户列表启用该用户。

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+服务{{ d.service_name}} worker阻塞半小时，请及时检查。

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details.action -}}
+Current log ID: {{ $d.id }}

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

@@ -0,0 +1,14 @@
+{{- $d := .resource_details -}}
+{{- if eq .resource_type "db_table_record" }}
+The record {{ $d.name }} in table {{ $d.table_name }} of the database {{ $d.db_name }} has been modified because the checksum test failed. Expected_checksum({{ $d.expected_checksum }}) != Calculated_checksum({{ $d.calculated_checksum }}).
+{{- end -}}
+{{- if eq .resource_type "cloudpods_component" }}
+{{ $d.details }}
+{{- end -}}
+{{- if eq .resource_type "snapshot" }}
+The checksum of the memory snapshot of the snapshot {{ $d.name }} test failed.
+{{- end -}}
+{{- if eq .resource_type "image" }}
+The checksum of the image {{ $d.name }} test failed.
+{{- end -}}
+

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.name }} exception occurs: {{ $d.message }}

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

@@ -1,2 +1,2 @@
 {{- $d := .resource_details -}}
-Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type }} {{ $d.name }} {{ if $d.public_dns -}} with external address {{ $d.public_dns }}:{{ $d.public_connect_port }} {{ end -}} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} will expire and be released in {{ .advance_days }} days. If you need to renew, please go to the console as soon as possible
+Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type }} {{ $d.name }} {{ if $d.public_dns -}} with external address {{ $d.public_dns }}:{{ $d.public_connect_port }} {{ end -}} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} will expire and be released in {{ .advance_days }} days. {{ if $d.auto_renew }}It has turned on automatic renewal. {{ end }}If there are other changes, please go to the console as soon as possible.

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

@@ -0,0 +1,18 @@
+{{- $d := .resource_details -}}
+The primary and secondary synchronization of the database ({{ $d.ip }}) is inconsistent, please check in time.
+
+{{ range $status := $d.status }}
+Database {{$status.ip}} status:
+{{- if not $status.operator_error }}
+  - Slave_IO_Running: {{$status.slave_io_running}}
+  - Slave_SQL_Running: {{$status.slave_sql_running}}
+  {{- if $status.last_error }}
+  - Last_Error: {{$status.last_error}}
+  {{- end -}}
+  {{- if $status.last_io_error }}
+  - Last_IO_Error: {{$status.last_io_error}}
+  {{- end }}
+{{else}}
+  - Operator_Error: {{$status.operator_error}}
+{{- end}}
+{{end}}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.service_name }}: The network topology information of the service is inconsistent, please check in time.

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The {{ .resource_type }} {{ $d.name }} Offline {{- if $d.reason -}} Reason: {{ $d.reason }}的 {{- end -}}

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

@@ -0,0 +1,4 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.task_name }} PANIC {{- if $d.error -}} Error: {{ $d.error }} {{- end -}}
+Stack Info: 
+{{ $d.stack }}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.account }}:Your password will expire in {{ $d.advance_days}} days. Please log in to the platform in time to update your password.

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The server {{ $d.name }} in project {{ $d.project }} panicked.

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

@@ -0,0 +1,8 @@
+{{- $d := .resource_details -}}
+Service: {{ $d.service_name }} abnormal
+Method: {{ $d.method }}
+Path: {{ $d.path }} 
+{{- if $d.body }}
+Body: {{ $d.body -}}
+{{ end }}
+Error: {{ $d.error }}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The account {{ $d.name }} status is abnormal. Please check in time.

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The account {{ $d.name }} has been locked due to abnormal login. Please verify the situation. If you need to unlock the user, please go to the user list to enable the user.

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The service: {{ d.service_name}} worker has been block 30 minutes.Please verify the service in time.

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+操作日志超出设置数量{{ $d.exceed_count }}条，当前{{ $d.current_count }}条

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

@@ -0,0 +1,6 @@
+{{- $d := .resource_details -}}
+{{- if eq .resource_type "cloudpods_component" }}
+{{ $d.title }}
+{{- else -}}
+{{ .resource_type_display }}完整性校验失败
+{{- end -}}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.name }} 发生异常: {{ $d.message }}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+数据库 {{$d.ip}} 的主从同步不一致，请及时检查。

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.service_name }}服务的网络拓扑信息同步不一致，请及时检查。	

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.name }} 离线

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.task_name }} PANIC

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.account }}:您的密码有效期将过

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+您在{{ $d.project }}项目的虚拟机{{ $d.name }}崩溃了

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+服务{{ $d.service_name }}异常

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+云账号{{ $d.name}}状态异常，请及时检查。

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+账号{{ $d.name }}已被锁定

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+服务{{ d.service_name}} worker阻塞半小时，请及时检查。

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+Action logs excced expected count {{ $d.exceed_count }}, current count is {{ $d.current_count }}

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

@@ -0,0 +1,6 @@
+{{- $d := .resource_details -}}
+{{- if eq .resource_type "cloudpods_component" }}
+{{ $d.title }}
+{{- else -}}
+The checksum of {{ .resource_type_display }} test failed
+{{- end -}}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.name }} exception occurs: {{ $d.message }}