zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Agent][Deploy] - 修改ImageSync模块 大量修改

Browse Source
This commit is contained in:
zeaslity
2024-08-21 13:52:49 +08:00
parent e26b7a7a00
commit ed6754e3d5
11 changed files with 346 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
agent-common/image/ImageNameConvert.go
View File

@@ -100,8 +100,11 @@ func ImageFullNameToGzipFileName(imageFullName string) (gzipFileName string) {
if len(first) == 3 {
// harbor.cdcyy.cn/cmii/cmii-uav-platform:5.4.0
// docker.io/ossr/srs:v5.0.1
// docker.107421.xyz/rancher/calico-cni:v3.17.2
if strings.HasPrefix(split[0], CmiiHarborPrefix) {
gzipFileName += "cmlc=cmii="
} else if strings.Contains(split[0], "rancher") {
gzipFileName += "docker=rancher="
} else {
gzipFileName += "docker=cmii="
}
@@ -111,6 +114,7 @@ func ImageFullNameToGzipFileName(imageFullName string) (gzipFileName string) {
} else if len(first) == 4 {
// harbor.cdcyy.cn/cmii/ossr/srs:v5.0.1
// harbor.cdcyy.com.cn/cmii/cmlc-ai/cmlc-ai-operator:v5.2.0-t4-no-dino
if !strings.HasPrefix(split[0], CmiiHarborPrefix) {
return imageFullName
}

23
agent-common/image/ImageNameConvert_test.go
View File

@@ -12,17 +12,18 @@ import (
)
var imageFullNameList = []string{
"bitnami/redis:6.2.6-debian-10-r0",
"simonrupf/chronyd:0.4.3",
"harbor.cdcyy.com.cn/cmii/cmii-rtsp-operator:v4.1.0",
"harbor.cdcyy.com.cn/cmii/ossrs/srs:v4.0.136",
"ossrs/srs:v4.0.136",
"mongo:5.0",
"bitnami/minio:2023.5.4",
"busybox:latest",
"busybox",
"rancher/rancher:v2.7.0",
"10.1.1.1:8033/cmii/ok:1.2",
//"bitnami/redis:6.2.6-debian-10-r0",
//"simonrupf/chronyd:0.4.3",
//"harbor.cdcyy.com.cn/cmii/cmii-rtsp-operator:v4.1.0",
//"harbor.cdcyy.com.cn/cmii/ossrs/srs:v4.0.136",
//"ossrs/srs:v4.0.136",
//"mongo:5.0",
//"bitnami/minio:2023.5.4",
//"busybox:latest",
//"busybox",
//"rancher/rancher:v2.7.0",
//"10.1.1.1:8033/cmii/ok:1.2",
"docker.107421.xyz/rancher/shell:v0.1.6",
}
func TestImageFullNameToGzipFileName(t *testing.T) {