Andreas/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2025-09-22 05:40:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix manifest tag index in manifest.go (#731)

Browse source 
Co-authored-by: Simon Aronsson <simme@arcticbit.se>
This commit is contained in:
nils måsén 2021-01-02 14:32:05 +01:00 • committed by GitHub
parent 2fb1f5f7ee
commit 3bbe1bd109
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pkg/registry/manifest/manifest.go
View file

@ -20,7 +20,7 @@ func BuildManifestURL(container types.Container) (string, error) {
} }
host, err := helpers.NormalizeRegistry(normalizedName.String()) host, err := helpers.NormalizeRegistry(normalizedName.String())
img, tag := extractImageAndTag(strings.TrimPrefix(container.ImageName(), host+"/")) img, tag := ExtractImageAndTag(strings.TrimPrefix(container.ImageName(), host+"/"))
logrus.WithFields(logrus.Fields{ logrus.WithFields(logrus.Fields{
"image": img, "image": img,
@ -45,15 +45,16 @@ func BuildManifestURL(container types.Container) (string, error) {
return url.String(), nil return url.String(), nil
} }
func extractImageAndTag(imageName string) (string, string) { // ExtractImageAndTag from a concatenated string
func ExtractImageAndTag(imageName string) (string, string) {
var img string var img string
var tag string var tag string
if strings.Contains(imageName, ":") { if strings.Contains(imageName, ":") {
parts := strings.Split(imageName, ":") parts := strings.Split(imageName, ":")
if len(parts) > 2 { if len(parts) > 2 {
img = fmt.Sprintf("%s%s", parts[0], parts[1]) img = parts[0]
tag = parts[3] tag = strings.Join(parts[1:], ":")
} else { } else {
img = parts[0] img = parts[0]
tag = parts[1] tag = parts[1]

9
pkg/registry/manifest/manifest_test.go
View file

@ -61,6 +61,15 @@ var _ = Describe("the manifest module", func() {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(res).To(Equal(expected)) Expect(res).To(Equal(expected))
}) })
It("should combine the tag name and digest pinning into one digest, given multiple colons", func() {
in := "containrrr/watchtower:latest@sha256:daf7034c5c89775afe3008393ae033529913548243b84926931d7c84398ecda7"
image, tag := "containrrr/watchtower", "latest@sha256:daf7034c5c89775afe3008393ae033529913548243b84926931d7c84398ecda7"
imageOut, tagOut := manifest.ExtractImageAndTag(in)
Expect(imageOut).To(Equal(image))
Expect(tagOut).To(Equal(tag))
})
}) })
}) })