mirror of
https://github.com/containrrr/watchtower.git
synced 2024-12-12 09:04:17 +02:00
clean up scope builder and remove fmt print
This commit is contained in:
parent
cf6a71de81
commit
89119515af
@ -153,26 +153,25 @@ func GetAuthURL(challenge string, img string) (*url.URL, error) {
|
||||
// GetScopeFromImageName normalizes an image name for use as scope during auth and head requests
|
||||
func GetScopeFromImageName(img, svc string) string {
|
||||
parts := strings.Split(img, "/")
|
||||
scopeImage := ""
|
||||
|
||||
if len(parts) > 2 {
|
||||
if strings.Contains(svc, "docker.io") {
|
||||
fmt.Printf("Identified dockerhub image")
|
||||
scopeImage = fmt.Sprintf("%s/%s", parts[1], strings.Join(parts[2:], "/"))
|
||||
} else {
|
||||
scopeImage = strings.Join(parts, "/")
|
||||
return fmt.Sprintf("%s/%s", parts[1], strings.Join(parts[2:], "/"))
|
||||
}
|
||||
} else if len(parts) == 2 {
|
||||
return strings.Join(parts, "/")
|
||||
}
|
||||
|
||||
if len(parts) == 2 {
|
||||
if strings.Contains(parts[0], "docker.io") {
|
||||
scopeImage = fmt.Sprintf("library/%s", parts[1])
|
||||
} else {
|
||||
scopeImage = strings.Replace(img, svc+"/", "", 1)
|
||||
return fmt.Sprintf("library/%s", parts[1])
|
||||
}
|
||||
} else if strings.Contains(svc, "docker.io") {
|
||||
scopeImage = fmt.Sprintf("library/%s", parts[0])
|
||||
} else {
|
||||
scopeImage = img
|
||||
return strings.Replace(img, svc+"/", "", 1)
|
||||
}
|
||||
return scopeImage
|
||||
|
||||
if strings.Contains(svc, "docker.io") {
|
||||
return fmt.Sprintf("library/%s", parts[0])
|
||||
}
|
||||
return img
|
||||
}
|
||||
|
||||
// GetChallengeURL creates a URL object based on the image info
|
||||
|
Loading…
Reference in New Issue
Block a user