Merge pull request #13169 from swordqiu/hotfix/qj-sync-status-persist-block-stream

fix: guest sync status persistent block_stream status

.circleci/config.yml

@@ -5,10 +5,10 @@ version: 2
 jobs:
   check:
     docker:
-      - image: yunionio/centos-build:1.0-1
+      - image: yunionio/centos-build:1.1-4
         environment:
           ONECLOUD_CI_BUILD: "1"
-    working_directory: /root/go/onecloud
+    working_directory: /root/go/src/yunion.io/x/onecloud
     steps:
       - checkout
       - run:
@@ -18,7 +18,7 @@ jobs:
     requires:
       - check
     docker:
-      - image: yunionio/centos-build:1.0-1
+      - image: yunionio/centos-build:1.1-4
         environment:
           ONECLOUD_CI_BUILD: "1"
 
@@ -26,7 +26,7 @@ jobs:
     #### expecting it in the form of
     ####   /go/src/github.com/circleci/go-tool
     ####   /go/src/bitbucket.org/circleci/go-tool
-    working_directory: /root/go/onecloud
+    working_directory: /root/go/src/yunion.io/x/onecloud
     parallelism: 4
     steps:
       - checkout
@@ -51,10 +51,10 @@ jobs:
     requires:
       - check
     docker:
-      - image: yunionio/centos-build:1.0-1
+      - image: yunionio/centos-build:1.1-4
         environment:
-          GO111MODULE: "on"
-    working_directory: /root/go/onecloud
+          ONECLOUD_CI_BUILD: "1"
+    working_directory: /root/go/src/yunion.io/x/onecloud
     parallelism: 4
     steps:
       - checkout

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,13 +9,10 @@ assignees: ''
 
 **What happened**:
 
-**What you expected to happen**:
-
-**How to reproduce it**:
-
-**Anything else we need to know?**:
-
 **Environment**:
-- OS (e.g: `cat /etc/os-release`):
+
+- OS (e.g. `cat /etc/os-release`):
 - Kernel (e.g. `uname -a`):
-- Others:
+<!--
+- Version (e.g. `climc version-list`):
+-->

.github/ISSUE_TEMPLATE/document_request.md

@@ -0,0 +1,12 @@
+---
+name: Document Request
+about: Document request to this project
+title: ''
+labels:
+- area/docs
+- enhancement
+assignees: ''
+
+---
+
+**What part of the document needs to be added**:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,5 +1,5 @@
 ---
-name: Feature request
+name: Feature Request
 about: Suggest an idea for this project
 title: ''
 labels: feature
@@ -7,8 +7,4 @@ assignees: ''
 
 ---
 
-<!-- Please only use this template for submitting feature requests -->
-
 **What would you like to be added**:
-
-**Why is this needed**:

.github/pull_request_template.md

@@ -1,15 +1,20 @@
-**这个 PR 实现什么功能/修复什么问题**:
+**What this PR does / why we need it**:
 
 <!--
-- [ ] 功能、bugfix描述
-- [ ] 冒烟测试
-- [ ] 单元测试编写
+- [ ] Smoke testing completed
+- [ ] Unit test written
 -->
 
-**是否需要 backport 到之前的 release 分支**:
+**Does this PR need to be backport to the previous release branch?**:
 
 <!--
-如果不需要，填写 "NONE".
-如果需要，就以下面 item 的格式写 release 分支名，并提交对应的 cherry-pick PR:
-- release/3.2
+If no, just write "NONE".
+
+If don't know, write "UNKNOWN", and let the reviewer decide.
+
+If yes, write the release branches name in the below format and submit the related cherry-pick PR:
+- release/3.7
+- release/3.6
+
+Take a look at "https://www.cloudpods.org/en/docs/contribute/contrib/" to learn how to submit a cherry-pick PR. 
 -->

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+abuse@cloudpods.org.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

CONTRIBUTING.md

@@ -1,3 +1,51 @@
-# 开发贡献参考
+# Contribution Guide
+
+[English](CONTRIBUTING.md) | [中文](CONTRIBUTING_zh.md)
+
+You can help to make Cloudpods better! There are many things you can do:
+
+## Help others know Cloudpods
+
+First of all, the easiest way to contribute to Cloudpods is to let more people know Cloudpods. To share your experience of Cloudpods. Hopefully Cloudpods may help resolve the issues in their daily jobs.
+
+## Report Bugs
+
+Cloudpods is an infrastructure management tool. Even though it has been thourougly tested and codes have been peer reviwed before merge, due to its complexity, you may still encounter bugs when using Cloudpods. This is frustrating. However, please do not hesitate to submit a issue at Github. The issue may help developers to improve the codes and make Cloudpods more and more robust. Meanwhile, the answer to the issues may also help others who have the similar bugs.
+
+## Answer issues
+
+You may answer issues at Github and help those who encounter issues when using Cloudpods. Sometimes, the issues are not due to bugs in codes but simplely because of misconfigurations, environment or misunderstandings.
+
+## Contribute codes
+
+You are welcome to contribute codes to Cloudpods. Please refers to [CONTRIBUTING](https://www.cloudpods.org/en/docs/contribute/contrib/) for more details on how to contribute codes to Cloudpods.
+
+### Fix Issues
+
+You may help solve bugs by submiting patches.
+
+
+### New Features
+
+You may help improve the codes of Cloudpods, including:
+
+* Develop new features for Cloudpods
+* Recode some part of Cloudpods so as to make the code easier to be understood, or less error-prone, or more efficient
+
+## Documentation
+
+You may help improve documentations of Cloudpds by directly make pull request to documentations. Once the Pull Request is accepted and merged, the documentations will be updated immediately.
+
+## Translation
+
+You may help translate the UI texts or documents of Cloudpds to other languages. Currently, we support Simplified Chinese and English.
+
+## Write articles
+
+You are also welcome to write articles about Cloudpods and sharing your experience with others. The content of the articles may include the following but not be limited to:
+* Your user experiences with Cloudpods
+* Your opinion about the direction and area of Cloudpods
+* Comparison with other cloud platforms
+* Benchmarks
+
 
-详情见文档 [开发贡献](https://docs.yunion.io/docs/contribute/)

CONTRIBUTING_zh.md

@@ -0,0 +1,48 @@
+# 贡献指南
+
+[English](CONTRIBUTING.md) | [中文](CONTRIBUTING_zh.md)
+
+如果您对Cloudpods感兴趣并且愿意为Cloudpods贡献，可以通过以下任意方式贡献您的力量，使得Cloudpods变得更完善。
+
+## 让别人知道Cloudpods
+
+最简单的方式就是让更多的人知道Cloudpods，向他们分享您对Cloudpds的看法和使用经验，向他们推荐Cloudpods。很有可能，在您的推荐下，他们开始使用Cloudpods，并解决了他们在工作中遇到的基础设施管理问题。
+
+## 报告BUG
+
+Cloudpods是一款开源的基础设施管理工具软件，运行场景复杂。尽管在开发阶段开发者很有可能已经进行了详尽的测试，但难免在实际运行中还会遇到各种意想不到的bug。遇到这种情况，请不要犹豫在Github上提交一个issue。这能帮助开发者更好地改进代码逻辑，使得Cloudpods越来越鲁棒。同时，issue的解答记录也能帮助到遇到类似问题的其他人。
+
+## 回答问题
+
+有时候，人们在使用Cloudpods中遇到的问题并不是因为Cloudpods软件缺陷造成的，而是因为配置错误，环境因素或者误会导致的。这样的问题也许只需要简单地一两句就能解答，不需要代码的修改。您可以在Github回答issue或者社区群中回答提问，帮助那些在使用Cloudpods中遇到问题的人。
+
+## 贡献代码
+
+我们非常欢迎和感谢开发者向项目提交代码PR，流程细节请查看 [CONTRIBUTING](https://www.cloudpods.org/zh/docs/contribute/contrib/).
+
+### 修复BUG
+
+您可以通过提交代码补丁来修复Cloudpods存在的BUG。
+
+### 开发新的功能特性
+
+不仅仅是修复BUG，您也可以通过提交代码以改进Cloudpods，包括但不限于：
+* 开发新的功能特性，您可以在[Cloudpods Roadmap](https://www.cloudpods.org/zh/docs/roadmap/)找到Cloudpods的功能规划
+* 重构代码，使得代码更加简洁易读，更加低健壮，或者执行起来更加高效
+
+## 文档
+
+您也可以通过给文档提交PR来改进Cloudpods的文档。一旦您的PR被接收并合并，Cloudpods的在线文档就能及时地自动更新。
+
+## 翻译
+
+您也可以帮助翻译Cloudpods，要么翻译UI界面的i18n配置文件，要么翻译文档，使得Cloudpods支持更多的语言。目前，Cloudpods支持简体中文和英文。
+
+## 写文章
+
+另外，欢迎您写关于Cloudpods的文章，通过文字分享您使用Cloudpods的经验和技巧。文章可以包括但不限于如下内容：
+* 使用Cloudpods的体验
+* Cloudpods技术领域的观点
+* 和其他竞品的比较
+* 性能评测
+

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2018] [Yunion Technology]
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -6,6 +6,7 @@ ROOT_DIR := $(CURDIR)
 BUILD_DIR := $(ROOT_DIR)/_output
 BIN_DIR := $(BUILD_DIR)/bin
 BUILD_SCRIPT := $(ROOT_DIR)/build/build.sh
+DEB_BUILD_SCRIPT := $(ROOT_DIR)/build/build_deb.sh
 
 ifeq ($(ONECLOUD_CI_BUILD),)
 	GIT_COMMIT := $(shell git rev-parse --short HEAD)
@@ -64,6 +65,7 @@ endif
 
 cmdTargets:=$(filter-out cmd/host-image,$(wildcard cmd/*))
 rpmTargets:=$(foreach b,$(patsubst cmd/%,%,$(cmdTargets)),$(if $(shell [ -f "$(CURDIR)/build/$(b)/vars" ] && echo 1),rpm/$(b)))
+debTargets:=$(foreach b,$(patsubst cmd/%,%,$(cmdTargets)),$(if $(shell [ -f "$(CURDIR)/build/$(b)/vars" ] && echo 1),deb/$(b)))
 
 all: build
 
@@ -87,21 +89,45 @@ vet:
 cmd/esxi-agent: prepare_dir
 	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
+cmd/fetcherfs: prepare_dir
+	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
+
 cmd/%: prepare_dir
 	$(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
 rpm/%: cmd/%
 	$(BUILD_SCRIPT) $*
 
+deb/%: cmd/%
+	$(DEB_BUILD_SCRIPT) $*
+
 pkg/%: prepare_dir
 	$(GO_INSTALL) $(REPO_PREFIX)/$@
 
+rpm/fetcherfs: cmd/fetcherfs
+	docker run --rm \
+		--name docker-centos-build-fetcherfs \
+		-v $(CURDIR):/data \
+		registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-4 \
+		/bin/bash -c "VERSION=3.6 /data/build/build.sh fetcherfs /opt/yunion/fetchclient/bin"
+
+deb/fetcherfs: rpm/fetcherfs
+	#VERSION=3.6 $(DEB_BUILD_SCRIPT) fetcherfs /opt/yunion/fetchclient/bin
+	docker run --rm \
+		--name docker-debian-build-fetcherfs \
+		-v $(CURDIR):/data \
+		registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0 \
+		/data/build/convert_rpm2deb.sh
+
 build:
 	$(MAKE) $(cmdTargets)
 
 rpm:
 	$(MAKE) $(rpmTargets)
 
+deb:
+	$(MAKE) $(debTargets)
+
 rpmclean:
 	rm -fr $(BUILD_DIR)/rpms
 
@@ -173,10 +199,53 @@ vet-check:
 	./scripts/vet.sh chk
 .PHONY: vet-check
 
+comma:=,
+space:=$(space) $(space)
+# NOTE: keep y18n-packages in alphabetical order
+y18n-src-lang := en-US
+y18n-lang     := en-US,zh-CN
+y18n-packages := \
+		yunion.io/x/onecloud/cmd/apigateway \
+		yunion.io/x/onecloud/cmd/keystone \
+		yunion.io/x/onecloud/cmd/monitor \
+		yunion.io/x/onecloud/cmd/region \
+		yunion.io/x/onecloud/cmd/yunionconf \
+
+define y18n-gen
+	set -o errexit; \
+	set -o pipefail; \
+	export GO111MODULE=off; \
+	y18n \
+		-chdir $(CURDIR) \
+		-dir ./locales/ \
+		-out ./locales/locales.go \
+		-lang $(y18n-lang) \
+		$(y18n-packages) \
+		; \
+	$(foreach lang,$(filter-out $(y18n-src-lang),$(subst $(comma), ,$(y18n-lang))),cp ./locales/$(lang)/{out,messages}.gotext.json;) \
+
+endef
+
+y18n-gen:
+	$(y18n-gen)
+	$(y18n-gen)
+
+.PHONY: y18n-gen
+
+y18n-check:
+	$(y18n-gen)
+	if git status --short ./locales | sed 's/^/$@: /' | grep .; then \
+		echo "$@: Locales content needs care" >&2 ; \
+		false; \
+	fi
+
+.PHONY: y18n-check
+
 check: fmt-check
 check: gendocgo-check
 check: goimports-check
 check: vet-check
+#check: y18n-check
 .PHONY: check
 
 
@@ -199,74 +268,11 @@ dep:
 	@$(MAKE) mod
 
 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 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 sqlchemy))
+	go get -d yunion.io/x/sqlchemy@v1.0.0
 	go mod tidy
 	go mod vendor -v
 
-
-DOCKER_CENTOS_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-3
-
-define dockerCentOSBuildCmd
-set -o xtrace
-set -o errexit
-set -o pipefail
-cd /root/onecloud
-export GOFLAGS=-mod=vendor
-make $(1)
-chown -R $(shell id -u):$(shell id -g) _output
-endef
-
-docker-centos-build: export dockerCentOSBuildCmd:=$(call dockerCentOSBuildCmd,$(F))
-docker-centos-build:
-	docker rm --force onecloud-ci-build &>/dev/null || true
-	docker run \
-		--name onecloud-docker-centos-build \
-		--rm \
-		--volume $(CURDIR):/root/onecloud \
-		--volume $(CURDIR)/_output/_cache:/root/.cache \
-		$(DOCKER_CENTOS_BUILD_IMAGE) \
-		/bin/bash -c "$$dockerCentOSBuildCmd"
-	chown -R $$(id -u):$$(id -g) _output
-	ls -lh _output/bin
-
-# NOTE we need a way to stop and remove the container started by docker-build.
-# No --tty, --stop-signal won't work
-docker-centos-build-stop:
-	docker stop --time 0 onecloud-docker-centos-build || true
-
-.PHONY: docker-centos-build
-.PHONY: docker-centos-build-stop
-
-DOCKER_ALPINE_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5
-
-define dockerAlpineBuildCmd
-set -o xtrace
-set -o errexit
-set -o pipefail
-cd /root/go/src/yunion.io/x/onecloud
-export GOFLAGS=-mod=vendor
-make $(1)
-chown -R $(shell id -u):$(shell id -g) _output
-endef
-
-docker-alpine-build: export dockerAlpineBuildCmd:=$(call dockerAlpineBuildCmd,$(F))
-docker-alpine-build:
-	docker rm --force onecloud-docker-alpine-build &>/dev/null || true
-	docker run --rm \
-		--name onecloud-docker-alpine-build \
-		-v $(CURDIR):/root/go/src/yunion.io/x/onecloud \
-		-v $(CURDIR)/_output/alpine-build:/root/go/src/yunion.io/x/onecloud/_output \
-		-v $(CURDIR)/_output/alpine-build/_cache:/root/.cache \
-		$(DOCKER_ALPINE_BUILD_IMAGE) \
-		/bin/sh -c "$$dockerAlpineBuildCmd"
-	ls -lh _output/alpine-build/bin
-
-docker-alpine-build-stop:
-	docker stop --time 0 onecloud-docker-alpine-build || true
-
-.PHONY: docker-alpine-build
-.PHONY: docker-alpine-build-stop
-
 define helpText
 Build with docker
 
@@ -324,5 +330,11 @@ image:
 
 .PHONY: image
 
+image-telegraf-raid-plugin:
+	VERSION=release-1.6.1 ARCH=all make image telegraf-raid-plugin
+
 %:
 	@:
+
+ModName:=yunion.io/x/onecloud
+include $(CURDIR)/Makefile.common.mk

Makefile.common.mk

@@ -0,0 +1,83 @@
+ifeq ($(__inc_Makefile_common_mk),)
+__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
+
+
+EnvIf=$(if $($(1)),$(1)=$($(1)))
+
+define dockerCentOSBuildCmd
+set -o xtrace
+set -o errexit
+set -o pipefail
+cd /root/go/src/yunion.io/x/$(ModBaseName)
+env \
+	$(call EnvIf,GOARCH) \
+	$(call EnvIf,GOOS) \
+	$(call EnvIf,CGO_ENABLED) \
+	make $(1)
+chown -R $(shell id -u):$(shell id -g) _output
+endef
+
+docker-centos-build: export dockerCentOSBuildCmd:=$(call dockerCentOSBuildCmd,$(F))
+docker-centos-build:
+	docker rm --force docker-centos-build-$(ModBaseName) &>/dev/null || true
+	docker run \
+		--rm \
+		--name docker-centos-build-$(ModBaseName) \
+		-v $(CURDIR):/root/go/src/yunion.io/x/$(ModBaseName) \
+		-v $(CURDIR)/_output/centos-build:/root/go/src/yunion.io/x/$(ModBaseName)/_output \
+		-v $(CURDIR)/_output/centos-build/_cache:/root/.cache \
+		$(DockerImageCentOSBuild) \
+		/bin/bash -c "$$dockerCentOSBuildCmd"
+	ls -lh _output/centos-build/bin
+
+# NOTE we need a way to stop and remove the container started by docker-build.
+# No --tty, --stop-signal won't work
+docker-centos-build-stop:
+	docker stop --time 0 docker-centos-build-$(ModBaseName) || true
+
+.PHONY: docker-centos-build
+.PHONY: docker-centos-build-stop
+
+
+define dockerAlpineBuildCmd
+set -o xtrace
+set -o errexit
+set -o pipefail
+cd /root/go/src/yunion.io/x/$(ModBaseName)
+env \
+	$(call EnvIf,GOARCH) \
+	$(call EnvIf,GOOS) \
+	$(call EnvIf,CGO_ENABLED) \
+	make $(1)
+chown -R $(shell id -u):$(shell id -g) _output
+endef
+
+docker-alpine-build: export dockerAlpineBuildCmd:=$(call dockerAlpineBuildCmd,$(F))
+docker-alpine-build:
+	docker rm --force docker-alpine-build-$(ModBaseName) &>/dev/null || true
+	docker run \
+		--rm \
+		--name docker-alpine-build-$(ModBaseName) \
+		-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 \
+		$(DockerImageAlpineBuild) \
+		/bin/sh -c "$$dockerAlpineBuildCmd"
+	ls -lh _output/alpine-build/bin
+
+docker-alpine-build-stop:
+	docker stop --time 0 docker-alpine-build-$(ModBaseName) || true
+
+.PHONY: docker-alpine-build
+.PHONY: docker-alpine-build-stop
+
+endif # __inc_Makefile_common_mk

OWNERS

@@ -4,12 +4,6 @@ reviewers:
   - ioito
   - swordqiu
   - tb365
-  - wanyaoqi
-  - yousong
-  - zhaoxiangchun
-  - zhasm
 approvers:
   - swordqiu
-  - yousong
-  - wanyaoqi
   - Zexi

README-CN.md

@@ -1,54 +1,151 @@
-# Yunion OneCloud (云联融合云）
+# Cloudpods
 
-[![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud) 
-[![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.org/yunionio/onecloud) 
-[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud) 
+[![CircleCI](https://circleci.com/gh/yunionio/cloudpods.svg?style=svg)](https://circleci.com/gh/yunionio/cloudpods)
+[![Build Status](https://travis-ci.com/yunionio/cloudpods.svg?branch=master)](https://travis-ci.org/yunionio/cloudpods)
+[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/cloudpods)](https://goreportcard.com/report/github.com/yunionio/cloudpods)
 
-## 什么是云联融合云?
+## Cloudpods是什么?
 
-云联融合云（Yunion OneCloud）是一个开源的多云平台。融合云构建在用户分布于多云基础设施之上，通过技术手段将分布于多云的异构IT资源统一管理，将多底层多云的差异向用户屏蔽，并通过网络和调度实现资源的融合与打通，在多云之上进行抽象，向用户呈现统一的使用界面和API接口，让用户就像使用一个云平台一样使用分布于多云的资源，实现一个统一的“云上之云”的云平台。
+<img src="https://www.cloudpods.org/images/cloudpods_logo_green.png" alt="Cloudpods" height="100">
 
-鉴于企业IT基础设施的两个趋势：1. 企业使用多云基础设施，并且公有云是最主要的基础设施提供者；2. 企业应用将逐步云原生化，企业IT基础设施需要为Kubernetes优化。融合云为此架构而设计。一方面抽象管理底层的多云基础设施，另一方面为多云Kubernetes提供运行环境。融合云为企业未来的的IT基础设施架构而设计。
+Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的云平台，也就是一个“云上之云”。Cloudpods不仅可以管理本地的虚拟机和物理机资源，还可以管理多个云平台和云账号。Cloudpods隐藏了这些异构基础设施资源的数据模型和API的差异，对外暴露了一套统一的API，允许用户就像用一个云一样地访问多云。从而大大降低了访问多云的复杂度，提升了管理多云的效率。
 
-云联融合云具备以下功能特性:
+## 谁需要Cloudpods?
 
-- 多云资源统一管理
+* 将几台物理服务器虚拟化成一个私有云平台
+* 需要一个紧凑而且功能相对完整的物理机全生命周期管理工具
+* 将VMware vSphere虚拟化集群转换为一个可以自服务的私有云平台
+* 在混合云的场景，能够在一个界面访问私有云和公有云
+* 通过一个集中的入口访问分布在多个公有云平台上的多个账号
+* 当前只使用一个云公有云账号但希望将来使用多云的用户
 
-  统一API、镜像、调度、账号体系、监控和计费等操作，能够全面管理 On premises、 私有云、公有云资源。
+## 功能
 
-- 内置私有云
+Cloudpods提供了如下的功能：
 
-  OneCloud内置完备的私有云实现，提供对用户本地IDC的虚拟机、物理机和负载均衡等资源管理。
+* 管理多云资源的功能，可以管理大多数的主流云，包括私有云，例如OpenStack，以及公有云，例如AWS，Azure，GCP，阿里云，华为云和腾讯云等
+* 允许以统一的联邦身份访问各个云平台的原生控制台的SSO
+* 一个可以管理海量KVM虚拟机的轻量级私有云
+* 一个能进行物理机全生命周期管理的裸机云
+* 实现了VMware vSphere虚拟化集群的自助服务和自动化
+* 一套功能丰富、统一一致的RESTAPI和模型访问以上的云资源和功能
+* 一套完整的多租户认证和访问控制体系
+* 自动将镜像转换为不同云平台需要的格式的多云镜像服务
 
-- 为多云Kubernetes提供运行环境
+### 支持的云平台
 
-  OneCloud自身为运行在Kubernetes的云原生应用，并且能在多云环境部署运行Kubernetes集群。
+* 公有云:
+  * AWS
+  * Azure
+  * Google Cloud Platform
+  * 阿里云
+  * 华为云
+  * 腾讯云
+  * UCloud
+  * 中国电信云
+  * 中国移动云
+  * 京东云
+* 私有云:
+  * OpenStack
+  * ZStack
+  * AlibabaCloud Aspara (阿里飞天)
+* 本地基础设施资源:
+  * KVM
+  * VMWare vSphere vCenter/ESXi
+  * Baremetals (IPMI, Redfish API)
+  * Object storages (Minio, Ceph, XSky)
+  * NAS (Ceph)
 
-欢迎安装部署云联融合云，期待大家的反馈！
+### 支持的云资源
 
+* Servers: instances, disks, network interfaces, networks, vpcs, storages, hosts, wires, snapshots, snapshot policies, security groups, elastic IPs, SSH keypairs, images
+* Load Balancers: instances, listeners, backend groups, backends, TSL certificates, ACLs
+* Object Storage: buckets, objects
+* NAS: file_systems, access_groups, mount_targets
+* RDS: instances, accounts, backups, databases, parameters, privileges
+* Elastic Cache: instances, accounts, backups, parameters
+* DNS: DNS zones, DNS records
+* VPC: VPCs, VPC peering, inter-VPC network, NAT gateway, DNAT/SNAT rules, route tables, route entries
 
-## 部署
+## 快速开始
 
-请参考文档 [安装部署](https://docs.yunion.io/docs/setup/) 搭建 OneCloud 集群。
+我们可以通过以下简单三步将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
+```
+
+#### Debian 10安装git
+```bash
+apt install -y git
+```
+
+### 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/) 获得更详细的安装指导。
 
 ## 文档
 
-- [文档中心](https://docs.yunion.io/)
+* [Cloudpods文档](https://www.cloudpods.org/zh)
 
-- [Swagger API文档](https://docs.yunion.cn/api/)
+* [Swagger API文档](https://www.cloudpods.org/zh/docs/swagger/)
 
+## 谁在使用Cloudpods？
 
-## 架构
+请在[这里](https://github.com/yunionio/cloudpods/issues/11427)查看Cloudpods用户列表。如果你正在使用Cloudpods，欢迎回复留下你的信息。谢谢对Cloudpods的支持！
 
-![architecture](https://www.yunion.cn/static/frame.png)
+## 联系我们
 
+您可以通过如下方式联系我们：
+
+* Reddit: [r/Cloudpods](https://www.reddit.com/r/Cloudpods/)
+
+* 哔哩哔哩: [Cloudpods](https://space.bilibili.com/623431553/)
+
+* 微信: 请扫描如下二维码联系我们
+
+<img src="https://www.cloudpods.org/images/contact_me_qr_20210701.png" alt="WeChat QRCode">
+
+## 版本历史
+
+请访问[Cloudpods Changelog](https://www.cloudpods.org/zh/docs/changelog/).
+
+## 开发规划
+
+请访问[Cloudpods Roadmap](https://www.cloudpods.org/zh/docs/roadmap/).
 
 ## 贡献
 
-我们非常欢迎和感谢开发者向项目做贡献，流程细节请查看 [CONTRIBUTING.md](./CONTRIBUTING.md) 。
-
+欢迎和感谢任何形式的贡献，不局限于贡献代码，流程细节请查看 [CONTRIBUTING](./CONTRIBUTING_zh.md)。
 
 ## License
 
-OneCloud 使用 Apache license 2.0. 详情请看 [LICENSE](./LICENSE) 。
+Apache license 2.0，详情请看 [LICENSE](./LICENSE)。

README.md

@@ -1,55 +1,156 @@
-# Yunion OneCloud
+# Cloudpods
 
-[![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud) 
-[![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.com/yunionio/onecloud/branches) 
-[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud) 
+[![CircleCI](https://circleci.com/gh/yunionio/cloudpods.svg?style=svg)](https://circleci.com/gh/yunionio/cloudpods)
+[![Build Status](https://travis-ci.com/yunionio/cloudpods.svg?branch=master)](https://travis-ci.com/yunionio/cloudpods/branches)
+[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/cloudpods)](https://goreportcard.com/report/github.com/yunionio/cloudpods)
 
-### [README in Chinese](./README-CN.md)
+[English](./README.md) | [简体中文](./README-CN.md)
 
-## What is Yunion OneCloud?
+## What is Cloudpods?
 
-Yunion OneCloud is an open source unified-IaaS cloud platform.
+<img src="https://www.cloudpods.org/images/cloudpods_logo_green.png" alt="Cloudpods" height="100">
 
-As its name sugguests, 'Yun' means 'cloud' in Chinese and 'Yunion OneCloud' means to unify many distinct clouds into the one that behaves like an integral cloud platform.
+Cloudpods is a cloud-native open source unified multi/hybrid-cloud platform developed with Golang, i.e. Cloudpods is *a cloud on clouds*. Cloudpods is able to manage not only on-premise KVM/baremetals, but also resources from many cloud accounts across many cloud providers. It hides the differences of underlying cloud providers and exposes one set of APIs that allow programatically interacting with these many clouds.
 
-As trends show, the enterprise IT infrastructure in the future would be unavoidably heterogeneous and the public clouds should be the major infrastructure providers for many enterprises. Further, the infrastructure would most likely be prepared for the cloud-native applications running on Kubernetes. Yunion OneCloud is built to provide the cloud architecture for this scenario such that it is the middle layer between the underlying cloud infrustructures and the overlay kubernetes clusters across many clouds.
+## Who needs Cloudpods?
 
-Many may consider Yunion OneCloud as a multi-cloud management platform (MCMP). Rather, we would view it as an IaaS platform as it does not only manage the resources and services from many clouds, but also hides the differences of underlying technologies and exposes one set of APIs that allow programatically interacting with the compute/storage/networking resources across many clouds.
+* Those who need a simple solution to virtualize a few physical servers into a private cloud
+* Those who need a compact and fully automatic baremetal lift-cycle management solution
+* Those who want to turn a VMware vSphere virtualization cluster into a private cloud
+* Those who need a cohesive view of both public and private cloud in a hybrid cloud setup
+* Those who need a centric portal to access multiple acccounts from multiple public clouds
+* Those who is currently using a single cloud account, but will not lose the possibility to adopt multicloud strategy
 
-Yunion OneCloud is working on abstracting APIs for the following resources:
+## Features
 
-* Compute, including virtual machines, images, etc.
-* Storage, including disks, snapshots, object storages, etc.
-* Networking, including load balancers, VPC, virtual networks, NAT gateways, security groups, etc.
-* Accouting and billing, etc.
-* ...
+* 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
 
-over the following many cloud providers:
+### Supported cloud providers
 
-* On-premise IT resources, including kvm VM, baremetal, VMware vsphere/ESXi, etc.
-* Private clouds, including OpenStack, etc.
-* Public clouds, including Aliyun, AWS, Azure, Tencent Cloud, Huawei Cloud, etc.
+* Public Clouds:
+  * AWS
+  * Azure
+  * Google Cloud Platform
+  * Alibaba Cloud
+  * Huawei Cloud
+  * Tencent Cloud
+  * UCloud
+  * Ctyun (China Telecom)
+  * ECloud (China Mobile)
+  * JDCloud
+* Private Clouds:
+  * OpenStack
+  * ZStack
+  * AlibabaCloud Aspara
+* On-premise resources:
+  * KVM
+  * VMWare vSphere vCenter/ESXi
+  * Baremetals (IPMI, Redfish API)
+  * Object storages (Minio, Ceph, XSky)
+  * NAS (Ceph)
 
-You are welcome to install and try Yunion OneCloud. Looking forward to your feedback.
+### Supported resources
 
-## Installation
+* Servers: instances, disks, network interfaces, networks, vpcs, storages, hosts, wires, snapshots, snapshot policies, security groups, elastic IPs, SSH keypairs, images
+* Load Balancers: instances, listeners, backend groups, backends, TSL certificates, ACLs
+* Object Storage: buckets, objects
+* NAS: file_systems, access_groups, mount_targets
+* RDS: instances, accounts, backups, databases, parameters, privileges
+* Elastic Cache: instances, accounts, backups, parameters
+* DNS: DNS zones, DNS records
+* VPC: VPCs, VPC peering, inter-VPC network, NAT gateway, DNAT/SNAT rules, route tables, route entries
+
+## 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
+```
+
+#### For Debian 10
+```bash
+apt install -y git
+```
+
+### 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/).
 
-Please refers to [install & deployment](https://docs.yunion.io/docs/setup/) (currently in Chinese Only).
 
 ## Documentations
 
-- [Yunion OneCloud Documents](https://docs.yunion.io/)
+* [Cloudpods Documents](https://www.cloudpods.org/en)
 
-- [Swagger API](https://docs.yunion.cn/apiv2/)
+* [Swagger API](https://www.cloudpods.org/en/docs/swagger/)
 
-## Architecture
 
-![architecture](https://www.yunion.cn/static/frame.png)
+## Who is using Cloudpods?
+
+Please check this [issue](https://github.com/yunionio/cloudpods/issues/11427) for the user list of Cloudpods. If you are using Cloudpods, you are welcome to leave your information by responding the issue. Thank you for your support.
+
+## Contact
+
+You may contact us by:
+
+* Reddit: [r/Cloudpods](https://www.reddit.com/r/Cloudpods/)
+
+* Bilibili: [Cloudpods](https://space.bilibili.com/623431553/)
+
+* WeChat: please scan the following QRCode to contact us
+
+<img src="https://www.cloudpods.org/images/contact_me_qr_20210701.png" alt="WeChat QRCode">
+
+## Changelog
+
+See [Cloudpods Changelog](https://www.cloudpods.org/en/docs/changelog/) for details.
+
+## Roadmap
+
+See [Cloudpods Roadmap](https://www.cloudpods.org/en/docs/roadmap/) for details.
 
 ## Contribution
 
-You are welcome to contribute to the project. Please refer to [CONTRIBUTING.md](./CONTRIBUTING.md) for guidelines.
+You are welcome to do any kind of contribution to the project. Please refer to [CONTRIBUTING](./CONTRIBUTING.md) for guidelines.
 
 ## License
 
-Apache License 2.0. See [LICENSE](./LICENSE) 。
+Apache License 2.0. See [LICENSE](./LICENSE).

build/build_deb.sh

@@ -0,0 +1,76 @@
+#!/bin/bash
+
+set -e
+
+if [ -z "$ROOT_DIR" ]; then
+	pushd $(dirname $(readlink -f "$BASH_SOURCE")) > /dev/null
+	ROOT_DIR=$(cd .. && pwd)
+	popd > /dev/null
+fi
+
+SRC_BIN=$ROOT_DIR/_output/bin
+SRC_BUILD=$ROOT_DIR/build
+OUTPUT_DIR=$ROOT_DIR/_output/debs
+
+PKG=$1
+BIN_PATH=${2:-/opt/yunion/bin}
+
+if [ -z "$PKG" ]; then
+    echo "Usage: $0 <package>"
+    exit 1
+fi
+
+BIN="$SRC_BIN/$PKG"
+ROOT="$SRC_BUILD/$PKG"
+
+if [ ! -x "$BIN" ]; then
+    echo "$BIN not exists"
+    exit 1
+fi
+
+if [ ! -x "$ROOT" ]; then
+    echo "$ROOT not exists"
+    exit 1
+fi
+
+. $ROOT/vars
+
+if [ -z "$VERSION" ]; then
+    TAG=$(git describe --abbrev=0 --tags || echo 000000)
+    VERSION=${TAG/\//-}
+    VERSION=${VERSION/v/}
+fi
+RELEASE=`date +"%y%m%d%H"`
+FULL_VERSION=$VERSION-$RELEASE
+BUILDROOT=$OUTPUT_DIR/yunion-$1-$FULL_VERSION
+rm -rf $BUILDROOT
+mkdir -p $BUILDROOT/DEBIAN
+mkdir -p $BUILDROOT/$BIN_PATH
+
+cp -rf $BIN $BUILDROOT/$BIN_PATH
+cp -rf $ROOT/root/* $BUILDROOT/
+
+
+echo "Build root ${BUILDROOT}"
+
+case $(uname -m) in
+    x86_64)
+        CURRENT_ARCH=amd64
+        ;;
+    aarch64)
+        CURRENT_ARCH=arm64
+        ;;
+esac
+
+echo "Package: yunion-$1
+Version: $FULL_VERSION
+Section: base
+Priority: optional
+Architecture: $CURRENT_ARCH
+Maintainer: wanyaoqi@yunionyun.com
+Description: Yunion $1
+" > $BUILDROOT/DEBIAN/control
+chmod 0755 $BUILDROOT/DEBIAN/control
+
+
+dpkg-deb --build $BUILDROOT

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

@@ -0,0 +1,3 @@
+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/cloudid/root/opt/yunion/share/saml/sp-metadata/azure.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" ID="_1e55eaf7-5cb9-4601-b557-e322fdfb2baf" entityID="urn:federation:MicrosoftOnline">
+  <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+    <SignedInfo>
+      <CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+      <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+      <Reference URI="#_1e55eaf7-5cb9-4601-b557-e322fdfb2baf">
+        <Transforms>
+          <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+          <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+        </Transforms>
+        <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+        <DigestValue>fA33hUaj24/8F8bArDIkH6CpX0k=</DigestValue>
+      </Reference>
+    </SignedInfo>
+    <SignatureValue>p/rlVWxLRIYiHozzWUgsjmQ5ItMZ/ITeEOg/edeo50l7qU8wLM9JD55EHoLpVvxImBcCfY1CxKdq3s1o9Up1jvEcH9KjfYZea1q8hzTkQdt7F2XvxoqDFRLvVwyHHJjygaEvFRXXxml7IDgDx9ScSRhQeGUlTGhI9eAFSaGkChM/FPnmekZ3ngSwbVf4FsTLIArxMqEnV0lXNMTr5NHQ6VL5wZ/cHLNCkkBoY0qWyv2hnYiZiXa4TKjpAN+8QF5GDPv/0ExJwe+aoRAQhdBzhBUICQdQd+v3Rb5SuX++iVfmf4IPMqj8CK4uK7iYXNLCGEO8oFR2KlK/zBpHzw6yCQ==</SignatureValue>
+    <KeyInfo>
+      <X509Data>
+        <X509Certificate>MIIC/TCCAeWgAwIBAgIQF9xAVqfHt7dNSOnsMKYLDjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMTkwNjE4MDAwMDAwWhcNMjEwNjE4MDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLwL+mOk+zhgjHPFiZuDaU7coCOMkYyJyWS2B2KWYx7BMmy+SBSlFvvDHIiMXeLnv9DiUnQXtjClZXNqEo2amM/KdXfnCUlwdnqGa89TbB8kM6aBQKCh5Up7vejD+KRpPcOK7DqxWnm037zNKH+6liwRMUD/+lkBODoG1/ThuBVM0Kr1Oowfnkb4JYeF5xZk+2+ThR2dcQzdsz8dBW1GpGopdoM5G1amVhoRPBeNlYUqf0JUPE36Dx0iCmeXX00HTR2gd+/DJFVe34l/VxL4cqufmRcqWHy7axonbpt8svjAervGgueF5W/BVGcO4eVwFzFfnAz7bSaH/zbsNnQkFtAgMBAAGjITAfMB0GA1UdDgQWBBQlxmu/Hj1qB2A306p0Sz9up711AjANBgkqhkiG9w0BAQsFAAOCAQEAEhb+i+J69DvzCTfmC0Mn+uSGzBaW0ksMZNjM8/p/RFueytNo8/DY6TUb9W8l/HSVON782iGG7hIsG68RUIZ5q+/WAB9iBvKkKv5aGZ0bK/eD5boHwBwMa3udTjU68Vkai0A7naISEh22h+lQPvKiftCEzK1x9j2FoAXEMhACnpTwRrrj3SsJXCsMaOKcVw7sCmM4/4wD5I1+dfMSe85rSEzzUCDcCMEg67sBKdO2CFK1GoH21ttrz1CV+xt8Pn9a488kgsp2ZyU+yixS59CrM7onEzt1R4miXWAJAtydNHAmmbgKrTxqf67fEXFcrlFAHexi6vvINZWZPD6+J+q6xg==</X509Certificate>
+      </X509Data>
+    </KeyInfo>
+  </Signature>
+  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC/TCCAeWgAwIBAgIQF9xAVqfHt7dNSOnsMKYLDjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMTkwNjE4MDAwMDAwWhcNMjEwNjE4MDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLwL+mOk+zhgjHPFiZuDaU7coCOMkYyJyWS2B2KWYx7BMmy+SBSlFvvDHIiMXeLnv9DiUnQXtjClZXNqEo2amM/KdXfnCUlwdnqGa89TbB8kM6aBQKCh5Up7vejD+KRpPcOK7DqxWnm037zNKH+6liwRMUD/+lkBODoG1/ThuBVM0Kr1Oowfnkb4JYeF5xZk+2+ThR2dcQzdsz8dBW1GpGopdoM5G1amVhoRPBeNlYUqf0JUPE36Dx0iCmeXX00HTR2gd+/DJFVe34l/VxL4cqufmRcqWHy7axonbpt8svjAervGgueF5W/BVGcO4eVwFzFfnAz7bSaH/zbsNnQkFtAgMBAAGjITAfMB0GA1UdDgQWBBQlxmu/Hj1qB2A306p0Sz9up711AjANBgkqhkiG9w0BAQsFAAOCAQEAEhb+i+J69DvzCTfmC0Mn+uSGzBaW0ksMZNjM8/p/RFueytNo8/DY6TUb9W8l/HSVON782iGG7hIsG68RUIZ5q+/WAB9iBvKkKv5aGZ0bK/eD5boHwBwMa3udTjU68Vkai0A7naISEh22h+lQPvKiftCEzK1x9j2FoAXEMhACnpTwRrrj3SsJXCsMaOKcVw7sCmM4/4wD5I1+dfMSe85rSEzzUCDcCMEg67sBKdO2CFK1GoH21ttrz1CV+xt8Pn9a488kgsp2ZyU+yixS59CrM7onEzt1R4miXWAJAtydNHAmmbgKrTxqf67fEXFcrlFAHexi6vvINZWZPD6+J+q6xg==</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC/TCCAeWgAwIBAgIQbgDHfi3t1JNGVqwD5/7lmjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMjAxMjIxMDAwMDAwWhcNMjUxMjIxMDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFT0/0/2qQurnYa0LbJHF9YYozhEH6r9mCxVDBYbewSG4tGgrWpsewQ/96pcczGMQctMvU+h2eX38Hx/f9JAIDbuRQzQlsPhQS7DDZ6WlTXU+t8d/g2C7fpSoLs4KVdJih4xyjLUWj+BK/ijsRjBt4Riw9VbJH/DdWKyoSMbECEiE+s1RtLP/eYoMmNfxyQGqWirCNqVNBTlqzYQp4dgF0foYy4ktoxwmQOVoTcIMFYp1I4pFPI7CxuMLkfK0X7aTbM7YGphvMfJxJkjrQdyI7G5d1t4DNi3zkEbBT7FGAr6qPt3Kn9ralpqJKHdpEBA9N0vNwQo5XTYIhUbPQ16IRAgMBAAGjITAfMB0GA1UdDgQWBBRs7tPmfkksSr67KtElHjYZbeaCTjANBgkqhkiG9w0BAQsFAAOCAQEAJqwMZSjQJ36x+1sty6EeLKQLQewQwPaEC47Zut+8bXed6Q8jMZ0bfa/MM7XquEcabaMZLQuKLft44YXwXXQOfQrI2qjQr3eToJFlDT9hR0rfp9wQqttDxd6Aa6RWwDTgo5oKUQCTKLHhEy8uWzScK0eGt2d7TWTaDXjRSwNq6tM7fRhZs07tKBV3xfi9EQy/mlavAMFRBVm86NSo7AsOG1IOMq03U3ooCWAXh9PdvvHNfHhH19futAnC/HeOjwRF1Qc527aBMphYFQLdiThfmfmiE/AhQqCwZ2oE7uCJhBtR+Kb1ZGhjI35pHfsSqGiFa7Kr+5ave822PDcke89Mvg==</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC/TCCAeWgAwIBAgIQbgDHfi3t1JNGVqwD5/7lmjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMjAxMjIxMDAwMDAwWhcNMjUxMjIxMDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFT0/0/2qQurnYa0LbJHF9YYozhEH6r9mCxVDBYbewSG4tGgrWpsewQ/96pcczGMQctMvU+h2eX38Hx/f9JAIDbuRQzQlsPhQS7DDZ6WlTXU+t8d/g2C7fpSoLs4KVdJih4xyjLUWj+BK/ijsRjBt4Riw9VbJH/DdWKyoSMbECEiE+s1RtLP/eYoMmNfxyQGqWirCNqVNBTlqzYQp4dgF0foYy4ktoxwmQOVoTcIMFYp1I4pFPI7CxuMLkfK0X7aTbM7YGphvMfJxJkjrQdyI7G5d1t4DNi3zkEbBT7FGAr6qPt3Kn9ralpqJKHdpEBA9N0vNwQo5XTYIhUbPQ16IRAgMBAAGjITAfMB0GA1UdDgQWBBRs7tPmfkksSr67KtElHjYZbeaCTjANBgkqhkiG9w0BAQsFAAOCAQEAJqwMZSjQJ36x+1sty6EeLKQLQewQwPaEC47Zut+8bXed6Q8jMZ0bfa/MM7XquEcabaMZLQuKLft44YXwXXQOfQrI2qjQr3eToJFlDT9hR0rfp9wQqttDxd6Aa6RWwDTgo5oKUQCTKLHhEy8uWzScK0eGt2d7TWTaDXjRSwNq6tM7fRhZs07tKBV3xfi9EQy/mlavAMFRBVm86NSo7AsOG1IOMq03U3ooCWAXh9PdvvHNfHhH19futAnC/HeOjwRF1Qc527aBMphYFQLdiThfmfmiE/AhQqCwZ2oE7uCJhBtR+Kb1ZGhjI35pHfsSqGiFa7Kr+5ave822PDcke89Mvg==</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/login.srf"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/login.srf" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.microsoftonline.com/login.srf" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.microsoftonline.com/login.srf" index="2"/>
+  </SPSSODescriptor>
+  <Extensions>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+  </Extensions>
+</EntityDescriptor>

build/convert_rpm2deb.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+if [ -z "$ROOT_DIR" ]; then
+    ROOT_DIR=$(dirname $(dirname $(readlink -f "$BASH_SOURCE")))
+fi
+
+RPMS_DIR=$ROOT_DIR/_output/rpms
+DEBS_DIR=$ROOT_DIR/_output/debs
+
+case $(uname -m) in
+    x86_64)
+        CURRENT_ARCH=amd64
+        ;;
+    aarch64)
+        CURRENT_ARCH=arm64
+        ;;
+esac
+
+mkdir -p $DEBS_DIR && cd $DEBS_DIR
+
+find $RPMS_DIR -type f -name *.rpm -exec alien --target=$CURRENT_ARCH {} \;

build/dhcprelay/root/etc/sysconfig/yunion_dhcprelay

@@ -0,0 +1,3 @@
+INTERFACE=""
+INTERFACE_IP=""
+RELAY=""

build/dhcprelay/root/usr/lib/systemd/system/yunion-dhcprelay.service

@@ -0,0 +1,22 @@
+[Unit]
+Description=Yunion Cloud DHCP Relay Agent
+Documentation=https://docs.yunion.cn
+After=network-online.target
+Wants=network-online.target
+After=network.target
+
+[Service]
+Type=simple
+EnvironmentFile=-/etc/sysconfig/yunion_dhcprelay
+User=root
+Group=root
+ExecStart=/opt/yunion/bin/dhcprelay --interface "$INTERFACE" --ip "$IP" --relay "$RELAY"
+WorkingDirectory=/opt/yunion/bin
+KillMode=process
+Restart=always
+RestartSec=30
+LimitNOFILE=500000
+LimitNPROC=500000
+
+[Install]
+WantedBy=multi-user.target

build/dhcprelay/vars

@@ -0,0 +1,2 @@
+DESCRIPTION="Yunion Tiny DHCP Relay Server"
+SERVICE="yes"

build/docker/Dockerfile.ansibleserver

@@ -1,3 +1,7 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.0.5-2
+
+# 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
 
 ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver

build/docker/Dockerfile.ansibleserver-base

@@ -1,12 +1,15 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
 
 MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
 
+ENV TZ UTC
+
 # 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/*

build/docker/Dockerfile.apigateway

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

build/docker/Dockerfile.baremetal-agent

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

build/docker/Dockerfile.baremetal-base

@@ -1,32 +1,34 @@
-FROM frolvlad/alpine-glibc:glibc-2.28
+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/onecloud-base:v0.3-3.13.5
 
 MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
 
 RUN mkdir -p /opt/yunion/bin
 
 RUN apk update && \
-    apk add --no-cache ipmitool ethtool tzdata ca-certificates cdrkit coreutils && \
+    apk add --no-cache ipmitool ethtool tzdata ca-certificates cdrkit coreutils librados librbd && \
     rm -rf /var/cache/apk/*
 
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-
 RUN mkdir -p /opt/cloud/yunion/baremetal
 
 # udpate latest pci.ids
 RUN wget -O /opt/cloud/yunion/baremetal/pci.ids http://pci-ids.ucw.cz/v2.2/pci.ids
 
 # download baremetal-pxerom-*.x86_64.rpm and unpack rpm in current directory
-COPY ./opt/cloud/yunion/baremetal/bootia32.efi /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/bootx64.efi /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/chain.c32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/initramfs /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/isolinux.bin /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/kernel /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/ldlinux.c32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/ldlinux.e32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/ldlinux.e64 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/libcom32.c32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal
+COPY --from=build /opt/cloud/yunion/baremetal/bootia32.efi /opt/cloud/yunion/baremetal
+COPY --from=build /opt/cloud/yunion/baremetal/bootx64.efi /opt/cloud/yunion/baremetal
+COPY --from=build /opt/cloud/yunion/baremetal/chain.c32 /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/initramfs /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/isolinux.bin /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/kernel /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.c32 /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.e32 /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.e64 /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/libcom32.c32 /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal

build/docker/Dockerfile.climc

@@ -1,5 +1,7 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20200820
+FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20210901
 
 ADD ./build/climc/root/opt /opt
 
+RUN cat /opt/yunion/scripts/motd/climc.sh >> /root/.bashrc
+
 ADD ./_output/alpine-build/bin/climc ./_output/alpine-build/bin/*cli /opt/yunion/bin/

build/docker/Dockerfile.climc-base

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
@@ -6,7 +6,9 @@ ENV TZ Asia/Shanghai
 
 RUN mkdir -p /opt/yunion/bin
 
-RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim && \
+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 && \
     rm -rf /var/cache/apk/*
 
 RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

build/docker/Dockerfile.cloudevent

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

build/docker/Dockerfile.cloudid

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

build/docker/Dockerfile.cloudmon

@@ -0,0 +1,8 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
+
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+
+RUN mkdir -p /etc/yunion/data/
+
+ADD   ./_output/alpine-build/bin/cloudmon \
+      /opt/yunion/bin/

build/docker/Dockerfile.cloudnet

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

build/docker/Dockerfile.cloudproxy

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

build/docker/Dockerfile.debian-base

@@ -0,0 +1,9 @@
+# registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0
+
+FROM debian:10
+
+RUN apt update && apt install -y alien
+
+RUN apt-get clean autoclean && \
+	apt-get autoremove --yes && \
+	rm -rf /var/lib/{apt,dpkg,cache,log}/

build/docker/Dockerfile.devtool

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

build/docker/Dockerfile.esxi-agent

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 COPY ./build/esxi-agent/root/opt/ /opt/
 

build/docker/Dockerfile.file-repo

@@ -0,0 +1,21 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+
+MAINTAINER "Rain Zheng <zhengyu@yunion.com>"
+
+# openssh-client, for ansible ssh connection
+# git, ca-certificates, for fetching ansible roles
+RUN set -x \
+	&& apk update \
+	&& apk add git \
+	&& rm -rf /var/cache/apk/*
+
+# install default playbook and install pkg
+Run mkdir -p /opt/yunion/ansible-install-pkg
+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 mkdir -p /opt/yunion/playbook
+Run mkdir /opt/yunion/playbook/monitor-agent
+Run git clone https://github.com/yunionio/monitor-agent.git /opt/yunion/playbook/monitor-agent --recurse-submodules

build/docker/Dockerfile.glance

@@ -1,6 +1,8 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20200820
+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
+ENV TZ UTC
 RUN mkdir -p /opt/yunion/bin
-ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance
+ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance

build/docker/Dockerfile.host

@@ -2,8 +2,7 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.4.0
 
 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 
-ENV TZ Asia/Shanghai
+ENV TZ UTC
 
-RUN apk add librados librbd
 RUN mkdir -p /opt/yunion/bin
 ADD ./_output/alpine-build/bin/host /opt/yunion/bin/host

build/docker/Dockerfile.host-deployer

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

build/docker/Dockerfile.host-image

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

build/docker/Dockerfile.keystone

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

build/docker/Dockerfile.logger

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

build/docker/Dockerfile.monitor

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

build/docker/Dockerfile.notify

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

build/docker/Dockerfile.onecloud-base

@@ -1,13 +1,14 @@
-FROM alpine:3.11
+# TODO: use 3.14 will lead 'apk add qemu-img fail on arm64'
+FROM alpine:3.13.5
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
-ENV TZ Asia/Shanghai
+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/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

build/docker/Dockerfile.region

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

build/docker/Dockerfile.region-dns

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

build/docker/Dockerfile.s3gateway

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

build/docker/Dockerfile.scheduler

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

build/docker/Dockerfile.telegraf-raid

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

build/docker/Dockerfile.telegraf-raid-plugin

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

build/docker/Dockerfile.torrent

@@ -1,15 +1,15 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
-MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
+MAINTAINER "Zexi Li <zexi.li@icloud.com>"
+
+# HACK: use v3.14 alpine mirror to upgrade qemu-img
+RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/main > /etc/apk/repositories
+RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/community >> /etc/apk/repositories
 
 RUN apk update && \
-    apk add --no-cache tzdata ca-certificates qemu-img && \
+    apk add --no-cache qemu-img && \
     rm -rf /var/cache/apk/*
 
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-
-ENV TZ Asia/Shanghai
-
 # add executable file torrent
 # make cmd/torrent
 RUN mkdir -p /opt/yunion/bin

build/docker/Dockerfile.vpcagent

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

build/docker/Dockerfile.webconsole

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

build/docker/Dockerfile.webconsole-base

@@ -2,11 +2,9 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/kubectl:1.18.6
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
-ENV TZ Asia/Shanghai
+ENV TZ UTC
 
 RUN mkdir -p /opt/yunion/bin
 
 RUN apk add --no-cache sshpass ipmitool openssh-client tzdata ca-certificates && \
     rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

build/docker/Dockerfile.yunionconf

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

build/docker/Makefile

@@ -0,0 +1,39 @@
+REGISTRY ?= "registry.cn-beijing.aliyuncs.com/yunionio"
+DOCKER_BUILD = docker build -t $(REGISTRY)
+DOCKER_BUILDX = docker buildx build --platform linux/arm64,linux/amd64 --push -t $(REGISTRY)
+
+
+debian10-base:
+	docker buildx build --platform linux/arm64,linux/amd64 --push \
+		-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:
+	$(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION) -f ./Dockerfile.onecloud-base .
+
+ANSIBLESERVER_BASE = v1.0.5-2
+
+ansibleserver-base:
+	$(DOCKER_BUILDX)/ansibleserver-base:$(ANSIBLESERVER_BASE) -f ./Dockerfile.ansibleserver-base .
+
+CLIMC_BASE_VERSION = 20210901
+
+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:
+	$(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION) -f ./Dockerfile.webconsole-base .
+
+BAREMETAL_BASE_VERSION = v0.3.3-2
+
+baremetal-base:
+	$(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base .
+	#docker push $(REGISTRY)/baremetal-base:$(BAREMETAL_BASE_VERSION)
+
+FILE_REPO_VERSION = v0.3.3
+
+file-repo:
+	$(DOCKER_BUILDX)/file-repo:$(FILE_REPO_VERSION) -f ./Dockerfile.file-repo .

build/docker/multi-arch/Dockerfile.host

@@ -13,6 +13,5 @@ MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 
 ENV TZ Asia/Shanghai
 
-RUN apk add librados librbd
 RUN mkdir -p /opt/yunion/bin
 COPY --from=build /root/go/src/yunion.io/x/onecloud/_output/bin/host /opt/yunion/bin/host

build/docker/multi-arch/Dockerfile.host.dockerignore

@@ -0,0 +1,2 @@
+_output/alpine-build/_cache
+

build/docker/multi-arch/Dockerfile.torrent

@@ -1,24 +1,24 @@
 FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5 as build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
+
 RUN mkdir -p /root/go/src/yunion.io/x/onecloud
 COPY . /root/go/src/yunion.io/x/onecloud
+RUN cd /root/go/src/yunion.io/x/onecloud && make cmd/torrent
 
-WORKDIR /root/go/src/yunion.io/x/onecloud
-RUN make cmd/torrent
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
 
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+MAINTAINER "Zexi Li <zexi.li@icloud.com>"
 
-MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
+# HACK: use v3.14 alpine mirror to upgrade qemu-img
+RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/main > /etc/apk/repositories
+RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/community >> /etc/apk/repositories
 
 RUN apk update && \
-    apk add --no-cache tzdata ca-certificates qemu-img && \
+    apk add --no-cache qemu-img && \
     rm -rf /var/cache/apk/*
 
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-
-ENV TZ Asia/Shanghai
-
+# TAG=20210815.0
 # add executable file torrent
 # make cmd/torrent
 RUN mkdir -p /opt/yunion/bin

build/docker/multi-arch/Dockerfile.torrent.dockerignore

@@ -0,0 +1,2 @@
+_output/alpine-build/_cache
+

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

@@ -6,4 +6,4 @@
 资源数量：{{len .matches}}
 资源名称：{{.resource_name}}
 
-详情地址: {{.web_url}}/commonalerts
+详情地址: {{.web_url}}

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

@@ -92,7 +92,7 @@
   </table>
   <table class="table" style="padding-top: 6px; padding-bottom: 10px;">
     <tr>
-      <td style="padding-left: 20px; font-size: 14px;">若要查看详情信息，<a class="link" target="_blank" href="{{.web_url}}/commonalerts
+      <td style="padding-left: 20px; font-size: 14px;">若要查看详情信息，<a class="link" target="_blank" href="{{.web_url}}
 ">请登录平台进行查看</a></td>
     </tr>
   </table>

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

@@ -6,4 +6,4 @@ TriggerCondition: {{.description | unescaped}}
 ResourceCount: {{len .matches}}
 ResourceName: {{.resource_name}}
 
-WebUrl: {{.web_url}}/commonalerts
+WebUrl: {{.web_url}}

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

@@ -33,7 +33,7 @@
     font-weight: bold;
   }
   .td {
-    width: 80px;
+    width: 120px;
     padding-left: 20px;
     height: 35px;
     font-weight: 400;
@@ -92,8 +92,8 @@
   </table>
   <table class="table" style="padding-top: 6px; padding-bottom: 10px;">
     <tr>
-      <td style="padding-left: 20px; font-size: 14px;">To view details，<a class="link" target="_blank" href="{{.web_url}}/commonalerts
-">Please log in to the platform to view</a></td>
+      <td style="padding-left: 20px; font-size: 14px;">To view details，<a class="link" target="_blank" href="{{.web_url}}
+">Please login to the platform to view</a></td>
     </tr>
   </table>
   <table border="0" cellspacing="0" cellpadding="0" class="table pb-3">

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

@@ -0,0 +1,9 @@
+{{- $d := .resource_details -}}
+您在{{ $d.project }}项目的
+{{- if $d.brand -}}
+{{ $d.brand }}平台
+{{- end -}}
+{{ .resource_type_display }}{{ $d.name }}{{ .action_display }}{{.result_display}}
+{{- if eq .result "failed" -}}
+，请尽快前往控制台进行处理
+{{- end -}}

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

@@ -0,0 +1,64 @@
+{{- $d := .resource_details }}
+{{- $consoleServiceType := list "loadbalancer" "dbinstance" "elasticcache" -}}
+您在{{ $d.project }}项目的
+{{- if $d.brand -}}
+{{ $d.brand }}平台
+{{- end -}}
+{{ .resource_type_display }}{{ $d.name }}创建成功
+{{- if $d.private_dns -}}
+，内网地址为{{ $d.private_dns }}:{{ $d.private_connect_port }}
+{{- end -}}
+
+{{- if $d.public_dns -}}
+，外网地址为{{ $d.public_dns }}:{{ $d.public_connect_port }}
+{{- end -}}
+
+{{- if $d.address -}}
+，服务地址为{{ $d.address }}
+{{- end -}}
+
+{{- if $d.ips -}}
+，IP地址为{{ $d.ips }}
+{{- end -}}
+
+{{- if and $d.guest_ip_start $d.guest_ip_end -}}
+，IP范围为{{ $d.guest_ip_start }}-{{ $d.guest_ip_end }}
+{{- end -}}
+
+{{- if $d.ip_addr -}}
+，IP地址为{{ $d.ip_addr }}
+{{- end -}}
+
+{{- if $d.login_account -}}
+，初始帐号为{{ $d.login_account }}
+{{- end -}}
+
+{{- if $d.password -}}
+，初始密码为{{ $d.password }}
+{{- end -}}
+
+{{- if $d.keypair -}}
+，访问ssh密钥为{{ $d.keypair }}
+{{- end -}}
+
+{{- if $d.common_name -}}
+，证书域名为{{ $d.common_name }}
+{{- end -}}
+
+{{- if $d.not_after -}}
+，过期时间为{{ $d.not_after }}
+{{- end -}}
+
+{{- if eq .resource_type "server" -}}
+，请使用
+{{- if $d.windows -}}
+远程桌面连接器(RDC)
+{{- else -}}
+SSH
+{{- end -}}
+或前往控制台访问虚拟机。
+{{- end -}}
+
+{{- if has .resource_type $consoleServiceType -}}
+，更多信息请前往控制台查看。
+{{- end -}}

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

@@ -0,0 +1,22 @@
+{{- $d := .resource_details -}}
+您在{{ $d.project }}项目的
+{{- if $d.brand -}}
+{{ $d.brand }}平台
+{{- end -}}
+
+{{- if $d.private_dns -}}
+，内网地址为{{ $d.private_dns }}:{{ $d.private_connect_port }}
+{{- end -}}
+
+{{- if $d.public_dns -}}
+，外网地址为{{ $d.public_dns }}:{{ $d.public_connect_port }}
+{{- end -}}
+
+{{- if $d.ips -}}
+，IP地址为{{ $d.ips }}
+{{- end -}}
+
+{{- if $d.ip_addr -}}
+，IP地址为{{ $d.ip_addr }}
+{{- end -}}
+{{ .resource_type_display }}{{ $d.name }}删除成功

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

@@ -0,0 +1,14 @@
+{{- $d := .resource_details -}}
+您在{{ $d.project }}项目的
+{{- if $d.brand -}}
+{{ $d.brand }}平台
+{{- end -}}
+
+{{- if $d.private_dns -}}
+，内网地址为{{ $d.private_dns }}:{{ $d.private_connect_port }}
+{{- end -}}
+
+{{- if $d.public_dns -}}
+，外网地址为{{ $d.public_dns }}:{{ $d.public_connect_port }}的
+{{- end -}}
+{{ .resource_type_display }}{{ $d.name }}还有{{ .advance_days }}天就要到期释放，如需续期使用，请尽快前往控制台处理

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

@@ -0,0 +1,14 @@
+{{- $d := .resource_details -}}
+您在{{ $d.project }}项目的
+
+{{- if $d.ips -}}
+IP地址为{{ $d.ips }}的
+{{- end -}}
+
+{{- if $d.ip_addr -}}
+IP地址为{{ $d.ip_addr }}的
+{{- end -}}
+{{- if $d.brand -}}
+{{ $d.brand }}平台
+{{- end -}}
+{{ .resource_type_display }}{{ $d.name }}成功加入回收站

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+您在{{ $d.project }}项目的弹性伸缩组{{ $d.scaling_group }}中的{{ $d.trigger_type_display }}类型伸缩策略{{ $d.name }}满足触发条件，成功{{ $d.action_display }}{{ $d.number }}{{ $d.unit_display }}实例

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+您在{{ $d.project }}项目的定时任务执行成功

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+您在{{ $d.project }}项目的自动快照策略{{ $d.name }}为硬盘{{ $d.disk }}创建快照成功

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

@@ -0,0 +1,14 @@
+{{- $d := .resource_details -}}
+您在{{ $d.project }}项目的
+{{- if $d.brand -}}
+{{ $d.brand }}平台
+{{- end -}}
+{{ .resource_type_display }}{{ $d.name }}{{ .action_display }}成功
+{{- if $d.account -}}
+，帐号为{{ $d.account }}
+{{- end -}}
+
+{{- if $d.password -}}
+，密码为{{ $d.password }}
+{{- end -}}
+，更多信息请前往控制台进行查看

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

@@ -0,0 +1,5 @@
+{{- $d := .resource_details -}}
+Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type_display }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} has been {{ .action_display }} {{ .result_display }}
+{{- if eq .result "failed" -}}
+. And please go to the console as soon as possible to process.
+{{- end -}}

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

@@ -0,0 +1,54 @@
+{{- $d := .resource_details }}
+{{- $consoleServiceType := list "loadbalancer" "dbinstance" "elasticcache" -}}
+Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type_display }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} has been created successfully
+{{- if $d.private_dns -}}
+, the intranet address is {{ $d.private_dns }}:{{ $d.private_connect_port }}
+{{- end -}}
+
+{{- if $d.public_dns -}}
+, the internet address is {{ $d.public_dns }}:{{ $d.public_connect_port }}
+{{- end -}}
+
+{{- if $d.address -}}
+, the service address is {{ $d.address }}
+{{- end -}}
+
+{{- if $d.ips -}}
+, the IP address is {{ $d.ips }}
+{{- end -}}
+
+{{- if and $d.guest_ip_start $d.guest_ip_end -}}
+, the IP range is {{ $d.guest_ip_start }}-{{ $d.guest_ip_end }}
+{{- end -}}
+
+{{- if $d.ip_addr -}}
+, the IP address is {{ $d.ip_addr }}
+{{- end -}}
+
+{{- if $d.account -}}
+, the initial account is {{ $d.account }}
+{{- end -}}
+
+{{- if $d.password -}}
+, the initial password is {{ $d.password }}
+{{- end -}}
+
+{{- if $d.keypair -}}
+, the access ssh key is {{ $d.keypair }}
+{{- end -}}
+
+{{- if $d.common_name -}}
+, the certificate domain name is {{ $d.common_name }}
+{{- end -}}
+
+{{- if $d.not_after -}}
+, the expiration is {{ $d.not_after }}
+{{- end -}}
+
+{{- if eq .resource_type "server" -}}
+, and please use {{ if $d.windows -}} Remote Desktop Connector (RDC) {{ else -}} SSH {{ end -}} or go to the console to access the VM.
+{{- end -}}
+
+{{- if has .resource_type $consoleServiceType -}}
+. For more information, please go to the console to view
+{{- end -}}

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

@@ -0,0 +1,22 @@
+{{- $d := .resource_details -}}
+Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type_display }} {{ $d.name }} 
+{{ if $d.project -}} in project {{ $d.project }} {{ end -}} has been deleted successfully
+{{- if $d.private_dns -}}
+, the intranet address is {{ $d.private_dns }}:{{ $d.private_connect_port }}
+{{- end -}}
+
+{{- if $d.public_dns -}}
+, the external address is {{ $d.public_dns }}:{{ $d.public_connect_port }}
+{{- end -}}
+
+{{- if and $d.address_type $d.address -}}
+, the service address is {{ $d.address_type }}{{ $d.address }}
+{{- end -}}
+
+{{- if $d.ips -}}
+, the IP address is {{ $d.ips }}
+{{- end -}}
+
+{{- if $d.ip_addr -}}
+, the IP address is {{ $d.ip_addr }}
+{{- end -}}

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

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

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

@@ -0,0 +1,22 @@
+{{- $d := .resource_details -}}
+Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type_display }} {{ $d.name }} 
+{{ if $d.project -}} in project {{ $d.project }} {{ end -}} has been added to recycle bin successfully
+{{- if $d.private_dns -}}
+, the intranet address is {{ $d.private_dns }}:{{ $d.private_connect_port }}
+{{- end -}}
+
+{{- if $d.public_dns -}}
+, the external address is {{ $d.public_dns }}:{{ $d.public_connect_port }}
+{{- end -}}
+
+{{- if and $d.address_type $d.address -}}
+, the service address is {{ $d.address_type }}{{ $d.address }}
+{{- end -}}
+
+{{- if $d.ips -}}
+, the IP address is {{ $d.ips }}
+{{- end -}}
+
+{{- if $d.ip_addr -}}
+, the IP address is {{ $d.ip_addr }}
+{{- end -}}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The {{ $d.trigger_type_display }} type scaling policy {{ $d.name }} in the scaling group {{ $d.scaling_group }} of the {{ $d.project }} project satisfies the trigger conditions, and {{ $d.action_display }} {{ $d.number }}{{ $d.unit_display }} instances successfully

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The scheduled task in {{ $d.project }} successfully {{ $d.operation_display }} the {{ $d.resource_type_display }} {{ $d.resource_name }}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The snapshot policy {{ $d.name }} in the {{ $d.project }} project successfully creates a snapshot for the disk {{ $d.disk }}

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

@@ -0,0 +1,10 @@
+{{- $d := .resource_details -}}
+Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} has been {{ .action_display }} successfully
+{{- if $d.account -}}
+, the acount is {{ $d.account }}
+{{- end -}}
+
+{{- if $d.password -}}
+, the password is {{ $d.password }}
+{{- end -}}
+, and please go to the console to view more information

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

@@ -0,0 +1,5 @@
+{{- $d := .resource_details -}}
+{{- if $d.project -}}
+{{ $d.project }}项目的
+{{- end -}}
+{{ .resource_type_display }}{{ $d.name }}{{ .action_display }}{{ .result_display }}

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

@@ -0,0 +1,5 @@
+{{- $d := .resource_details -}}
+{{- if $d.project -}}
+{{ $d.project }}项目的
+{{- end -}}
+{{ .resource_type_display }}{{ $d.name }}创建成功

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

@@ -0,0 +1,3 @@
+{{- $d := .resource_details -}}
+{{ $d.project }}项目的
+{{ .resource_type_display }}{{ $d.name }}到期前{{ .advance_days }}天通知

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

@@ -0,0 +1,5 @@
+{{- $d := .resource_details -}}
+{{- if $d.project -}}
+{{ $d.project }}项目的
+{{- end -}}
+{{ .resource_type_display }}{{ $d.name }}成功加入回收站

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.project }}项目的弹性伸缩组{{ $d.scaling_group }}中的伸缩策略{{ $d.name }}满足触发

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The scheduled task in {{ $d.project }} successfully {{ $d.operation_display }} the {{ $d.resource_type_display }} {{ $d.resource_name }}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.project }}项目的自动快照策略{{ $d.name }}生效

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

@@ -0,0 +1,3 @@
+{{- $d := .resource_details -}}
+{{ $d.project }}项目的
+{{ .resource_type_display }}{{ $d.name }}{{ .action_display }}成功

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The {{ .resource_type_display }} {{ .Name }} {{ if $d.project }} in poject {{ $d.project }} {{ end -}} {{ .action_display }} {{ .result_display }}

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

@@ -0,0 +1,3 @@
+{{- $d := .resource_details -}}
+The {{ .resource_type_display }} {{ $d.name }} {{ if $d.project }} in poject {{ $d.project }} {{ end -}} created successfully
+

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ .advance_days }} days notice before {{ .resource_type }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} expiration

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The {{ .resource_type_display }} {{ .Name }} {{ if $d.project }} in poject {{ $d.project }} {{ end -}} has been added to recycle bin successfully

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The scaling policy {{ $d.name }} in the scaling group {{ $d.scaling_group }} triggered

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The scheduled task in {{ $d.project }} execute successfully

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The snapshot policy {{ $d.name }} in the {{ $d.project }} project executed

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The {{ .resource_type }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} {{ .action_display }} successfully