Merge pull request #18078 from smarterclayton/fix_mirror

Automatic merge from submit-queue.

`oc image mirror` was accidentally broken during dependency updating

An upstream cherry-pick was dropped and the wrong values were passed to the manifest Get call.

@liggitt

Author: openshift-merge-robot

glide.yaml

@@ -75,6 +75,10 @@ import:
 - package: github.com/opencontainers/runc
   repo:    git@github.com:openshift/opencontainers-runc
   version: openshift-3.9
+# cli
+- package: github.com/docker/distribution
+  repo:    git@github.com:openshift/docker-distribution
+  version: release-2.6.0
 
 # ours: shared with kube, but forced by openshift
 # master

pkg/oc/cli/cmd/image/mirror/mirror.go

@@ -101,6 +101,12 @@ type pushOptions struct {
 	AttemptS3BucketCopy []string
 }
 
+// schema2ManifestOnly specifically requests a manifest list first
+var schema2ManifestOnly = distribution.WithManifestMediaTypes([]string{
+	manifestlist.MediaTypeManifestList,
+	schema2.MediaTypeManifest,
+})
+
 // NewCommandMirrorImage copies images from one location to another.
 func NewCmdMirrorImage(name string, out, errOut io.Writer) *cobra.Command {
 	o := &pushOptions{}
@@ -398,8 +404,7 @@ func (o *pushOptions) Run() error {
 		for srcDigestString, pushTargets := range src.digests {
 			// load the manifest
 			srcDigest := godigest.Digest(srcDigestString)
-			// var contentDigest godigest.Digest / client.ReturnContentDigest(&contentDigest),
-			srcManifest, err := manifests.Get(ctx, godigest.Digest(srcDigest), distribution.WithTag(manifestlist.MediaTypeManifestList), distribution.WithTag(schema2.MediaTypeManifest))
+			srcManifest, err := manifests.Get(ctx, godigest.Digest(srcDigest), schema2ManifestOnly)
 			if err != nil {
 				digestErrs = append(digestErrs, retrieverError{src: src.ref, err: fmt.Errorf("unable to retrieve source image %s manifest: %v", src.ref, err)})
 				continue