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

Merge pull request #1257 from stevvooe/content-changes

Browse Source 
content: remove Provider.Reader
This commit is contained in:
Stephen Day
2017-08-09 17:12:44 -07:00
committed by GitHub
parent f3ff1e223b 8be340e37b
commit e6ba48f25c
19 changed files with 105 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec_opts_unix.go
View File

@@ -11,6 +11,7 @@ import (
"strings"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/typeurl"
@@ -75,15 +76,14 @@ func WithImageConfig(ctx context.Context, i Image) SpecOpts {
)
switch ic.MediaType {
case v1.MediaTypeImageConfig, images.MediaTypeDockerSchema2Config:
r, err := store.Reader(ctx, ic.Digest)
p, err := content.ReadBlob(ctx, store, ic.Digest)
if err != nil {
return err
}
if err := json.NewDecoder(r).Decode(&ociimage); err != nil {
r.Close()
if err := json.Unmarshal(p, &ociimage); err != nil {
return err
}
r.Close()
config = ociimage.Config
default:
return fmt.Errorf("unknown image config media type %s", ic.MediaType)