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

[Agent][Deploy] - cqsh

Browse Source
This commit is contained in:
zeaslity
2024-07-04 10:58:01 +08:00
parent 4e7422c32b
commit 1fd1cc8b29
32 changed files with 23808 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
agent-operator/image/CmiiImageOperator.go
View File

@@ -233,32 +233,8 @@ func TagFromListAndPushToCHarbor(referenceImageList []string, targetHarborHost s
// harbor.cdcyy.cn
cmiiImageFullName := imageName
if strings.HasPrefix(imageName, "cmii") {
// cmii-uav-gateway:v1.0.0 短名称的形式
cmiiImageFullName = image2.CmiiHarborPrefix + imageName
}
targetProject := "cmii"
if strings.HasPrefix(imageName, "rancher") {
// rancher/rancher:v2.5.7 rancher名称的形式
targetProject = "rancher"
}
// referenceImageList 存储的是全名称的形式
if strings.HasPrefix(imageName, image2.CmiiHarborPrefix) {
// harbor.cdcyy.cn/cmii/cmii-uav-gateway:v1.0.0 全名称的形式 需要拿到短名称
imageName = strings.TrimPrefix(imageName, image2.CmiiHarborPrefix)
} else {
// 10.250.0.10:8033/cmii/cmii-uav-gateway:v1.0.0
if strings.Contains(imageName, ":8033") {
imageName = strings.TrimLeft(imageName, ":8033")
}
}
targetImageName := targetHarborHost + "/" + targetProject + "/" + imageName
//fmt.Println(cmiiImageFullName)
//fmt.Println(targetImageName)
// convert image name
targetImageName := image2.ImageNameToTargetImageFullName(imageName, targetHarborHost)
if TagFromSourceToTarget(cmiiImageFullName, targetImageName) {
pushResult := UploadToOctopusKindHarbor(targetImageName)