github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #3904 from yeahdongcn/manifest

Browse Source 
Replace ocispec.MediaTypeImageManifest with manifest.MediaType
This commit is contained in:
Derek McGowan 2019-12-27 22:03:13 -08:00 committed by GitHub
commit f823c37708
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
images/archive/importer.go
View File

@ -181,7 +181,7 @@ func ImportIndex(ctx context.Context, store content.Store, reader io.Reader, opt
Layers: layers, Layers: layers,
} }
desc, err := writeManifest(ctx, store, manifest, ocispec.MediaTypeImageManifest) desc, err := writeManifest(ctx, store, manifest, manifest.MediaType)
if err != nil { if err != nil {
return ocispec.Descriptor{}, errors.Wrap(err, "write docker manifest") return ocispec.Descriptor{}, errors.Wrap(err, "write docker manifest")
} }

4
import_test.go
View File

@ -278,11 +278,11 @@ 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) 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) t.Fatalf("image(%d) unexpected media type: %s", i, actual[i].Target.MediaType)
} }
} }
} }
func createContent(size int64, seed int64) ([]byte, digest.Digest) { func createContent(size int64, seed int64) ([]byte, digest.Digest) {