From b7a2d85316314112809e8e2f6abf84bb10428f38 Mon Sep 17 00:00:00 2001 From: Aaron Lehmann Date: Thu, 9 Feb 2017 16:30:46 -0800 Subject: [PATCH] reference: Handle combination of tag and digest in AddReference With the switchover to the unified reference package, AddReference no longer does the right thing when passed a reference that has both a digest and a tag. It would put both the digest in the tag in the reference stored in the repositories.json file, which isn't the right format, and would mean that neither "docker run" nor docker services could locate the image. This meant that a simple "docker service create" command like "docker service create --name foo busybox top" would create a service that immediately went into a restart loop, because it couldn't use the image that had been pulled. Fix AddReference to strip out the tag when both a tag and digest are specified. We do this because we don't necessarily want to overwrite the tag - when both a digest and tag are specified, the tag is only advisory. Signed-off-by: Aaron Lehmann --- reference/store.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/reference/store.go b/reference/store.go index 844ebf5319..5a0aec593d 100644 --- a/reference/store.go +++ b/reference/store.go @@ -107,6 +107,20 @@ func (store *store) AddDigest(ref reference.Canonical, id digest.Digest, force b } func (store *store) addReference(ref reference.Named, id digest.Digest, force bool) error { + // If the reference includes a digest and a tag, we must store only the + // digest. + canonical, isCanonical := ref.(reference.Canonical) + _, isNamedTagged := ref.(reference.NamedTagged) + + if isCanonical && isNamedTagged { + trimmed, err := reference.WithDigest(reference.TrimNamed(canonical), canonical.Digest()) + if err != nil { + // should never happen + return err + } + ref = trimmed + } + refName := reference.FamiliarName(ref) refStr := reference.FamiliarString(ref)