From 64e4651b3fdaf14d3fc5e748325036501302d412 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Thu, 26 Mar 2020 14:29:57 +0800 Subject: [PATCH] Support replicate images with media type application/vnd.docker.distribution.manifest.v1+json Fixes #11272, support replicate images with media type application/vnd.docker.distribution.manifest.v1+json Signed-off-by: Wenkai Yin --- src/pkg/registry/client.go | 3 ++- src/replication/transfer/image/transfer.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pkg/registry/client.go b/src/pkg/registry/client.go index 4fdf52578..9f0d753c5 100644 --- a/src/pkg/registry/client.go +++ b/src/pkg/registry/client.go @@ -53,6 +53,7 @@ var ( v1.MediaTypeImageManifest, schema2.MediaTypeManifest, schema1.MediaTypeSignedManifest, + schema1.MediaTypeManifest, } ) @@ -473,7 +474,7 @@ func (c *client) Copy(srcRepo, srcRef, dstRepo, dstRef string, override bool) er // manifest or index case v1.MediaTypeImageIndex, manifestlist.MediaTypeManifestList, v1.MediaTypeImageManifest, schema2.MediaTypeManifest, - schema1.MediaTypeSignedManifest: + schema1.MediaTypeSignedManifest, schema1.MediaTypeManifest: if err = c.Copy(srcRepo, digest, dstRepo, digest, false); err != nil { return err } diff --git a/src/replication/transfer/image/transfer.go b/src/replication/transfer/image/transfer.go index 0c18ec921..6eaecafbc 100644 --- a/src/replication/transfer/image/transfer.go +++ b/src/replication/transfer/image/transfer.go @@ -230,7 +230,7 @@ func (t *transfer) copyContent(content distribution.Descriptor, srcRepo, dstRepo // the contents it contains are a few manifests/indexes case v1.MediaTypeImageIndex, manifestlist.MediaTypeManifestList, v1.MediaTypeImageManifest, schema2.MediaTypeManifest, - schema1.MediaTypeSignedManifest: + schema1.MediaTypeSignedManifest, schema1.MediaTypeManifest: // as using digest as the reference, so set the override to true directly return t.copyArtifact(srcRepo, digest, dstRepo, digest, true) // handle foreign layer