Vendor after merging mtrmac/image:api-changes

... and update for the API changes.

NOTE: This keeps the old dangerous tlsVerify semantics.
This commit is contained in:
Miloslav Trmač
2016-08-31 20:12:41 +02:00
parent fb5e5a79f6
commit 4055442da5
18 changed files with 185 additions and 136 deletions

View File

@@ -18,12 +18,12 @@ type Image struct {
// newImage returns a new Image interface type after setting up
// a client to the registry hosting the given image.
func newImage(ref dockerReference, certPath string, tlsVerify bool) (types.Image, error) {
s, err := newImageSource(ref, certPath, tlsVerify)
func newImage(ctx *types.SystemContext, ref dockerReference) (types.Image, error) {
s, err := newImageSource(ctx, ref, nil)
if err != nil {
return nil, err
}
return &Image{Image: image.FromSource(s, nil), src: s}, nil
return &Image{Image: image.FromSource(s), src: s}, nil
}
// SourceRefFullName returns a fully expanded name for the repository this image is in.