From 3ff65105dc6d8e71ca9ace3ddb6a7c11c3c0c995 Mon Sep 17 00:00:00 2001 From: Erik Hollensbe Date: Sat, 18 Feb 2017 15:45:58 -0800 Subject: [PATCH] manifest: remove ManifestList type Signed-off-by: Erik Hollensbe --- manifest/manifest.go | 2 +- manifest/manifest_test.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/manifest/manifest.go b/manifest/manifest.go index 430331f0a3..88e46ae01e 100644 --- a/manifest/manifest.go +++ b/manifest/manifest.go @@ -54,7 +54,7 @@ func GuessMIMEType(manifest []byte) string { } switch meta.MediaType { - case DockerV2Schema2MediaType, DockerV2ListMediaType, imgspecv1.MediaTypeImageManifest, imgspecv1.MediaTypeImageManifestList: // A recognized type. + case DockerV2Schema2MediaType, DockerV2ListMediaType, imgspecv1.MediaTypeImageManifest: // A recognized type. return meta.MediaType } // this is the only way the function can return DockerV2Schema1MediaType, and recognizing that is essential for stripping the JWS signatures = computing the correct manifest digest. diff --git a/manifest/manifest_test.go b/manifest/manifest_test.go index 78da71a292..42bed34723 100644 --- a/manifest/manifest_test.go +++ b/manifest/manifest_test.go @@ -22,7 +22,6 @@ func TestGuessMIMEType(t *testing.T) { mimeType string }{ {"ociv1.manifest.json", imgspecv1.MediaTypeImageManifest}, - {"ociv1list.manifest.json", imgspecv1.MediaTypeImageManifestList}, {"v2s2.manifest.json", DockerV2Schema2MediaType}, {"v2list.manifest.json", DockerV2ListMediaType}, {"v2s1.manifest.json", DockerV2Schema1SignedMediaType},