diff --git a/vendor/github.com/containers/image/copy/copy.go b/vendor/github.com/containers/image/copy/copy.go index 61bfb1c12c..91d4cef62c 100644 --- a/vendor/github.com/containers/image/copy/copy.go +++ b/vendor/github.com/containers/image/copy/copy.go @@ -91,13 +91,14 @@ type Options struct { // Image copies image from srcRef to destRef, using policyContext to validate source image admissibility. func Image(ctx *types.SystemContext, policyContext *signature.PolicyContext, destRef, srcRef types.ImageReference, options *Options) error { - reportWriter := options.ReportWriter - if reportWriter == nil { - reportWriter = ioutil.Discard + reportWriter := ioutil.Discard + if options != nil && options.ReportWriter != nil { + reportWriter = options.ReportWriter } writeReport := func(f string, a ...interface{}) { fmt.Fprintf(reportWriter, f, a...) } + dest, err := destRef.NewImageDestination(ctx) if err != nil { return fmt.Errorf("Error initializing destination %s: %v", transports.ImageName(destRef), err) @@ -148,7 +149,7 @@ func Image(ctx *types.SystemContext, policyContext *signature.PolicyContext, des } if srcConfigInfo.Digest != "" { writeReport("Uploading blob %s\n", srcConfigInfo.Digest) - destConfigInfo, err := copyBlob(dest, rawSource, srcConfigInfo, false, options.ReportWriter) + destConfigInfo, err := copyBlob(dest, rawSource, srcConfigInfo, false, reportWriter) if err != nil { return err } @@ -167,7 +168,7 @@ func Image(ctx *types.SystemContext, policyContext *signature.PolicyContext, des destLayer, ok := copiedLayers[srcLayer.Digest] if !ok { writeReport("Uploading blob %s\n", srcLayer.Digest) - destLayer, err = copyBlob(dest, rawSource, srcLayer, canModifyManifest, options.ReportWriter) + destLayer, err = copyBlob(dest, rawSource, srcLayer, canModifyManifest, reportWriter) if err != nil { return err } diff --git a/vendor/github.com/containers/image/docker/docker_client.go b/vendor/github.com/containers/image/docker/docker_client.go index 549f68142b..5900b4581f 100644 --- a/vendor/github.com/containers/image/docker/docker_client.go +++ b/vendor/github.com/containers/image/docker/docker_client.go @@ -332,7 +332,7 @@ func (c *dockerClient) ping() (*pingResponse, error) { return pr, nil } pr, err := ping("https") - if err != nil && c.ctx.DockerInsecureSkipTLSVerify { + if err != nil && c.ctx != nil && c.ctx.DockerInsecureSkipTLSVerify { pr, err = ping("http") } return pr, err diff --git a/version/version.go b/version/version.go index 4c97a1f9bd..6d34b697af 100644 --- a/version/version.go +++ b/version/version.go @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "0.1.16-dev" +const Version = "0.1.17-dev"