github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-28 23:57:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #219 from runcom/bump-containers-image-1

Browse Source 
Bump v0.1.16
This commit is contained in:
Antonio Murdaca 2016-09-27 21:25:21 +02:00 committed by GitHub
commit 507d09876d
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vendor/github.com/containers/image/copy/copy.go generated vendored
View File

@ -91,13 +91,14 @@ type Options struct {
// Image copies image from srcRef to destRef, using policyContext to validate source image admissibility. // 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 { func Image(ctx *types.SystemContext, policyContext *signature.PolicyContext, destRef, srcRef types.ImageReference, options *Options) error {
reportWriter := options.ReportWriter reportWriter := ioutil.Discard
if reportWriter == nil { if options != nil && options.ReportWriter != nil {
reportWriter = ioutil.Discard reportWriter = options.ReportWriter
} }
writeReport := func(f string, a ...interface{}) { writeReport := func(f string, a ...interface{}) {
fmt.Fprintf(reportWriter, f, a...) fmt.Fprintf(reportWriter, f, a...)
} }
dest, err := destRef.NewImageDestination(ctx) dest, err := destRef.NewImageDestination(ctx)
if err != nil { if err != nil {
return fmt.Errorf("Error initializing destination %s: %v", transports.ImageName(destRef), err) 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 != "" { if srcConfigInfo.Digest != "" {
writeReport("Uploading blob %s\n", 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 { if err != nil {
return err return err
} }
@ -167,7 +168,7 @@ func Image(ctx *types.SystemContext, policyContext *signature.PolicyContext, des
destLayer, ok := copiedLayers[srcLayer.Digest] destLayer, ok := copiedLayers[srcLayer.Digest]
if !ok { if !ok {
writeReport("Uploading blob %s\n", srcLayer.Digest) 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 { if err != nil {
return err return err
} }

2
vendor/github.com/containers/image/docker/docker_client.go generated vendored
View File

@ -332,7 +332,7 @@ func (c *dockerClient) ping() (*pingResponse, error) {
return pr, nil return pr, nil
} }
pr, err := ping("https") pr, err := ping("https")
if err != nil && c.ctx.DockerInsecureSkipTLSVerify { if err != nil && c.ctx != nil && c.ctx.DockerInsecureSkipTLSVerify {
pr, err = ping("http") pr, err = ping("http")
} }
return pr, err return pr, err

2
version/version.go
View File

@ -1,4 +1,4 @@
package version package version
// Version is the version of the build. // Version is the version of the build.
const Version = "0.1.16-dev" const Version = "0.1.17-dev"