inventory: sort the images based on the sorted tags and not in the hash

lib/container/set.go

@@ -31,6 +31,7 @@ func (a Set) Minus(b Set) Set {
 	for k := range b {
 		delete(c, k)
 	}
+
 	return c
 }
 
@@ -43,6 +44,7 @@ func (a Set) Union(b Set) Set {
 	for k, v := range b {
 		c[k] = v
 	}
+
 	return c
 }
 
@@ -55,5 +57,6 @@ func (a Set) Intersection(b Set) Set {
 			c[k] = v
 		}
 	}
+
 	return c
 }

lib/dockerregistry/grow_manifest.go

@@ -293,20 +293,23 @@ func Union(a, b RegInvImage) RegInvImage {
 		// injection.
 		if a[imageName] == nil {
 			a[imageName] = digestTags
+
 			continue
 		}
 		for digest, tags := range digestTags {
 			// If a has the image but not this digest, inject just this digest
 			// and all associated tags.
 			if a[imageName][digest] == nil {
 				a[imageName][digest] = tags
+
 				continue
 			}
 			// If c has the digest already, try to inject those tags in b that
 			// are not already in a.
 			tagSlice := TagSlice{}
 			for tag := range tags.Union(a[imageName][digest]) {
 				if tag == "latest" {
+
 					continue
 				}
 				tagSlice = append(tagSlice, tag)

lib/dockerregistry/inventory.go

@@ -1771,8 +1771,9 @@ func (rii *RegInvImage) ToSorted() []ImageWithDigestSlice {
 				tags: tags,
 			})
 		}
+		// sort the digest beased on the first tag which was sorted above
 		sort.Slice(digests, func(i, j int) bool {
-			return digests[i].hash < digests[j].hash
+			return digests[i].tags[0] < digests[j].tags[0]
 		})
 
 		images = append(images, ImageWithDigestSlice{
@@ -2665,6 +2666,7 @@ func (payload GCRPubSubPayload) matchImage(
 	for _, tag := range tags {
 		if payload.Tag == tag {
 			m.TagMatch = true
+
 			break
 		}
 	}