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

image.go: fix duplicated import

Browse Source 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2017-06-29 06:15:36 +00:00
parent 55861c1a00
commit 696e383d21
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
image.go
View File

@ -7,7 +7,6 @@ import (
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/rootfs" "github.com/containerd/containerd/rootfs"
"github.com/opencontainers/image-spec/specs-go/v1"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -52,7 +51,7 @@ func (i *image) getLayers(ctx context.Context) ([]rootfs.Layer, error) {
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "failed to read manifest blob") return nil, errors.Wrapf(err, "failed to read manifest blob")
} }
var manifest v1.Manifest var manifest ocispec.Manifest
if err := json.Unmarshal(p, &manifest); err != nil { if err := json.Unmarshal(p, &manifest); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal manifest") return nil, errors.Wrap(err, "failed to unmarshal manifest")
} }
@ -65,9 +64,9 @@ func (i *image) getLayers(ctx context.Context) ([]rootfs.Layer, error) {
} }
layers := make([]rootfs.Layer, len(diffIDs)) layers := make([]rootfs.Layer, len(diffIDs))
for i := range diffIDs { for i := range diffIDs {
layers[i].Diff = v1.Descriptor{ layers[i].Diff = ocispec.Descriptor{
// TODO: derive media type from compressed type // TODO: derive media type from compressed type
MediaType: v1.MediaTypeImageLayer, MediaType: ocispec.MediaTypeImageLayer,
Digest: diffIDs[i], Digest: diffIDs[i],
} }
layers[i].Blob = manifest.Layers[i] layers[i].Blob = manifest.Layers[i]