STRLCPY/SeaMoon

feat: upload more registry support (#70)
DVK committed with GitHub 2 months ago

44c941d6

1 parent e7e93bbd

■ ■ ■ ■ ■ ■ ■

.github/workflows/package.yaml

		skipped 8 lines
9	9		name: package-docker
10	10		runs-on: ubuntu-20.04
11	11		if: startsWith(github.ref, 'refs/tags/')
	12	+	strategy:
	13	+	matrix:
	14	+	include:
	15	+	- registry: docker.io
	16	+	repo: dvkunion/seamoon
	17	+	username: ${{ secrets.DOCKERHUB_USERNAME }}
	18	+	password: ${{ secrets.DOCKERHUB_TOKEN }}
	19	+	- registry: [
	20	+	registry.cn-hangzhou.aliyuncs.com,
	21	+	registry.cn-shanghai.aliyuncs.com,
	22	+	registry.cn-qingdao.aliyuncs.com,
	23	+	registry.cn-beijing.aliyuncs.com,
	24	+	registry.cn-zhangjiakou.aliyuncs.com,
	25	+	registry.cn-huhehaote.aliyuncs.com,
	26	+	registry.cn-shenzhen.aliyuncs.com,
	27	+	registry.cn-chengdu.aliyuncs.com,
	28	+	registry.cn-hongkong.aliyuncs.com,
	29	+	registry.ap-northeast-1.aliyuncs.com,
	30	+	registry.ap-southeast-1.aliyuncs.com,
	31	+	registry.ap-southeast-2.aliyuncs.com/seammon/seamoon",
	32	+	registry.ap-southeast-3.aliyuncs.com,
	33	+	registry.ap-southeast-5.aliyuncs.com,
	34	+	registry.ap-south-1.aliyuncs.com,
	35	+	registry.eu-central-1.aliyuncs.com,
	36	+	registry.eu-west-1.aliyuncs.com,
	37	+	registry.us-west-1.aliyuncs.com,
	38	+	registry.us-east-1.aliyuncs.com,
	39	+	]
	40	+	repo: seamoon/seamoon
	41	+	username: ${{ secrets.ALIYUN_USERNAME }}
	42	+	password: ${{ secrets.ALIYUN_PASSWORD }}
	43	+	- registry: [
	44	+	hkccr.ccs.tencentyun.com,
	45	+	inccr.ccs.tencentyun.com,
	46	+	sgccr.ccs.tencentyun.com,
	47	+	thccr.ccs.tencentyun.com,
	48	+	krccr.ccs.tencentyun.com,
	49	+	jpccr.ccs.tencentyun.com,
	50	+	deccr.ccs.tencentyun.com,
	51	+	useccr.ccs.tencentyun.com,
	52	+	uswccr.ccs.tencentyun.com,
	53	+	]
	54	+	repo: seamoon/seamoon
	55	+	username: ${{ secrets.TENCENT_USERNAME }}
	56	+	password: ${{ secrets.TENCENT_PASSWORD }}
	57	+	- registry: [
	58	+	ccr.ccs.tencentyun.com,
	59	+	]
	60	+	repo: dvkunion/seamoon
	61	+	username: ${{ secrets.TENCENT_USERNAME }}
	62	+	password: ${{ secrets.TENCENT_PASSWORD }}
12	63		steps:
13	64		- uses: actions/checkout@v4
14	65		- uses: docker/setup-qemu-action@v3
15	66		- uses: docker/setup-buildx-action@v3
16	67		- uses: docker/login-action@v3
	68	+	name: login ${{ matrix.registry }}
17	69		with:
18		-	username: ${{ secrets.DOCKERHUB_USERNAME }}
19		-	password: ${{ secrets.DOCKERHUB_TOKEN }}
	70	+	registry: ${{ matrix.registry }}
	71	+	username: ${{ matrix.username }}
	72	+	password: ${{ matrix.password }}
20	73		- uses: docker/build-push-action@v5
21	74		with:
22	75		push: true
		skipped 2 lines
25	78		linux/arm64
26	79		linux/386
27	80		tags: \|
28		-	dvkunion/seamoon:latest
29		-	dvkunion/seamoon:${{github.ref_name}}
	81	+	${{ matrix.registry }}/${{ matrix.repo }}:latest
	82	+	${{ matrix.registry }}/${{ matrix.repo }}:${{github.ref_name}}
30	83		build-args: \|
31	84		VERSION=${{github.ref_name}}
32	85		context: ./

■ ■ ■ ■ ■ ■

pkg/sdk/aliyun/aliyun_sdk.go

		skipped 15 lines
16	16
17	17		"github.com/DVKunion/SeaMoon/pkg/api/enum"
18	18		"github.com/DVKunion/SeaMoon/pkg/api/models"
	19	+	"github.com/DVKunion/SeaMoon/pkg/system/consts"
19	20		"github.com/DVKunion/SeaMoon/pkg/system/xlog"
20	21		)
21	22
		skipped 93 lines
115	116		WithInstanceType("e1"). // 性能实例
116	117		WithTimeout(300).
117	118		WithCustomContainerConfig(fc.NewCustomContainerConfig().
118		-	WithImage("registry.cn-hongkong.aliyuncs.com/seamoon/seamoon:dev").
	119	+	WithImage(fmt.Sprintf("%s:%s", registryEndPoint[tun.Config.Region], consts.Version)).
119	120		WithCommand("[\"./seamoon\"]").
120	121		WithArgs("[\"server\"]"))); err != nil {
121	122		return "", err
		skipped 108 lines

■ ■ ■ ■ ■ ■ ■

pkg/sdk/aliyun/maps.go

1	1		package aliyun
2	2
3		-	var BillingMap = map[string]string{
	3	+	var billingMap = map[string]string{
4	4		"cn-qingdao": "business.aliyuncs.com",
5	5		"cn-beijing": "business.aliyuncs.com",
6	6		"cn-zhangjiakou": "business.aliyuncs.com",
		skipped 22 lines
29	29		"eu-west-1": "business.ap-southeast-1.aliyuncs.com",
30	30		}
31	31
	32	+	var registryEndPoint = map[string]string{
	33	+	"cn-hangzhou": "registry.cn-hangzhou.aliyuncs.com/seamoon/seamoon",
	34	+	"cn-shanghai": "registry.cn-shanghai.aliyuncs.com/seamoon/seamoon",
	35	+	"cn-qingdao": "registry.cn-qingdao.aliyuncs.com/seamoon/seamoon",
	36	+	"cn-beijing": "registry.cn-beijing.aliyuncs.com/seamoon/seamoon",
	37	+	"cn-zhangjiakou": "registry.cn-zhangjiakou.aliyuncs.com/seamoon/seamoon",
	38	+	"cn-huhehaote": "registry.cn-huhehaote.aliyuncs.com/seamoon/seamoon",
	39	+	"cn-shenzhen": "registry.cn-shenzhen.aliyuncs.com/seamoon/seamoon",
	40	+	"cn-chengdu": "registry.cn-chengdu.aliyuncs.com/seamoon/seamoon",
	41	+	"cn-hongkong": "registry.cn-hongkong.aliyuncs.com/seamoon/seamoon",
	42	+	"ap-northeast-1": "registry.ap-northeast-1.aliyuncs.com/seamoon/seamoon",
	43	+	//"ap-northeast-2": "registry.ap-northeast-2.aliyuncs.com/seamoon/seamoon",
	44	+	"ap-southeast-1": "registry.ap-southeast-1.aliyuncs.com/seamoon/seamoon",
	45	+	"ap-southeast-2": "registry.ap-southeast-2.aliyuncs.com/seammon/seamoon",
	46	+	"ap-southeast-3": "registry.ap-southeast-3.aliyuncs.com/seamoon/seamoon",
	47	+	"ap-southeast-5": "registry.ap-southeast-5.aliyuncs.com/seamoon/seamoon",
	48	+	//"ap-southeast-7": "泰国(曼谷)",
	49	+	"ap-south-1": "registry.ap-south-1.aliyuncs.com/seamoon/seamoon",
	50	+	"eu-central-1": "registry.eu-central-1.aliyuncs.com/seamoon/seamoon",
	51	+	"eu-west-1": "registry.eu-west-1.aliyuncs.com/seamoon/seamoon",
	52	+	"us-west-1": "registry.us-west-1.aliyuncs.com/seamoon/seamoon",
	53	+	"us-east-1": "registry.us-east-1.aliyuncs.com/seamoon/seamoon",
	54	+	}
	55	+

■ ■ ■ ■ ■ ■

pkg/sdk/tencent/maps.go

1	1		package tencent
2	2
3		-	var RegistryEndPoint = map[string]string{
4		-	"ap-beijing": "华北(北京)",
5		-	"ap-chengdu": "西南(成都)",
6		-	"ap-guangzhou": "华南(广州)",
7		-	"ap-shanghai": "华东(上海)",
8		-	"ap-nanjing": "华东(南京)",
9		-	"ap-hongkong": "hkccr.ccs.tencentyun.com/seamoon/seamoon",
10		-	"ap-mumbai": "sgccr.ccs.tencentyun.com/seamoon/seamoon",
11		-	"ap-singapore": "sgccr.ccs.tencentyun.com/seamoon/seamoon",
12		-	"ap-bangkok": "亚太东南(曼谷)",
13		-	"ap-seoul": "亚太东北(首尔)",
14		-	"ap-tokyo": "亚太东北(东京)",
15		-	"eu-frankfurt": "欧洲(法兰克福)",
16		-	"na-ashburn": "美国东部(弗吉尼亚)",
17		-	"na-toronto": "北美(多伦多)",
18		-	"na-siliconvalley": "美国西部(硅谷)",
	3	+	var registryEndPoint = map[string]string{
	4	+	"ap-beijing": "ccr.ccs.tencentyun.com/dvkunion/seamoon",
	5	+	"ap-chengdu": "ccr.ccs.tencentyun.com/dvkunion/seamoon",
	6	+	"ap-guangzhou": "ccr.ccs.tencentyun.com/dvkunion/seamoon",
	7	+	"ap-shanghai": "ccr.ccs.tencentyun.com/dvkunion/seamoon",
	8	+	"ap-nanjing": "ccr.ccs.tencentyun.com/dvkunion/seamoon",
	9	+	"ap-hongkong": "hkccr.ccs.tencentyun.com/seamoon/seamoon",
	10	+	"ap-mumbai": "inccr.ccs.tencentyun.com/seamoon/seamoon",
	11	+	"ap-singapore": "sgccr.ccs.tencentyun.com/seamoon/seamoon",
	12	+	"ap-bangkok": "thccr.ccs.tencentyun.com/seamoon/seamoon",
	13	+	"ap-seoul": "krccr.ccs.tencentyun.com/seamoon/seamoon",
	14	+	"ap-tokyo": "jpccr.ccs.tencentyun.com/seamoon/seamoon",
	15	+	"eu-frankfurt": "deccr.ccs.tencentyun.com/seamoon/seamoon",
	16	+	"na-ashburn": "useccr.ccs.tencentyun.com/seamoon/seamoon",
	17	+	//"na-toronto": "北美(多伦多)",
	18	+	"na-siliconvalley": "uswccr.ccs.tencentyun.com/seamoon/seamoon",
19	19		}
20	20

feat: upload more registry support (#70)