From c4ed3ff1edf383512789746419a28431bd4e256a Mon Sep 17 00:00:00 2001 From: Xiaodong Ye Date: Fri, 20 Dec 2019 10:26:13 +0800 Subject: [PATCH 1/3] Replace ocispec.MediaTypeImageManifest with manifest.MediaType Signed-off-by: Xiaodong Ye --- images/archive/importer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/archive/importer.go b/images/archive/importer.go index 5bc887130..2d046589f 100644 --- a/images/archive/importer.go +++ b/images/archive/importer.go @@ -181,7 +181,7 @@ func ImportIndex(ctx context.Context, store content.Store, reader io.Reader, opt Layers: layers, } - desc, err := writeManifest(ctx, store, manifest, ocispec.MediaTypeImageManifest) + desc, err := writeManifest(ctx, store, manifest, manifest.MediaType) if err != nil { return ocispec.Descriptor{}, errors.Wrap(err, "write docker manifest") } From 05d192929b1e9d34d74386ecc6e6472b1f496a86 Mon Sep 17 00:00:00 2001 From: Xiaodong Ye Date: Fri, 20 Dec 2019 11:38:54 +0800 Subject: [PATCH 2/3] Update checkImages to accept images.MediaTypeDockerSchema2Manifest Signed-off-by: Xiaodong Ye --- import_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/import_test.go b/import_test.go index df7ed24cc..6f5d9b6db 100644 --- a/import_test.go +++ b/import_test.go @@ -278,7 +278,8 @@ func checkImages(t *testing.T, target digest.Digest, actual []images.Image, name t.Fatalf("image(%d) unexpected name %q, expected %q", i, actual[i].Name, n) } - if actual[i].Target.MediaType != ocispec.MediaTypeImageManifest { + if actual[i].Target.MediaType != ocispec.MediaTypeImageManifest && + actual[i].Target.MediaType != images.MediaTypeDockerSchema2Manifest { t.Fatalf("image(%d) unexpected media type: %s", i, actual[i].Target.MediaType) } } From facedf8980daa7296c4b56782ee695f1dba96457 Mon Sep 17 00:00:00 2001 From: Xiaodong Ye Date: Fri, 20 Dec 2019 17:19:41 +0800 Subject: [PATCH 3/3] Remove an empty line Signed-off-by: Xiaodong Ye --- import_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/import_test.go b/import_test.go index 6f5d9b6db..6b1083004 100644 --- a/import_test.go +++ b/import_test.go @@ -283,7 +283,6 @@ func checkImages(t *testing.T, target digest.Digest, actual []images.Image, name t.Fatalf("image(%d) unexpected media type: %s", i, actual[i].Target.MediaType) } } - } func createContent(size int64, seed int64) ([]byte, digest.Digest) {