update go-containerregistry

This commit is contained in:
Nick Kubala 2018-08-01 12:50:16 -07:00
parent e59f05e32f
commit 32fd56e09f
No known key found for this signature in database
GPG Key ID: ABD5D5B952A6EAD7
5 changed files with 9 additions and 8 deletions

View File

@ -5,8 +5,5 @@ go:
- 1.10.x
go_import_path: github.com/GoogleContainerTools/kaniko
before_script:
- export DOCKER_API_VERSION=1.37
script:
- make test

4
Gopkg.lock generated
View File

@ -417,7 +417,7 @@
revision = "e89373fe6b4a7413d7acd6da1725b83ef713e6e4"
[[projects]]
digest = "1:f7bc7ff5f70d0dc7a31c12430a1f7bd66bd9afe6b3f0ff571d6ddbfbb692e417"
digest = "1:b347f4d441e737532862875ab98e47a2b631cd9d1348103e92bee722d69bf287"
name = "github.com/google/go-containerregistry"
packages = [
"pkg/authn",
@ -436,7 +436,7 @@
"pkg/v1/v1util",
]
pruneopts = "NUT"
revision = "697ee0b3d46eff19ed2b30f86230377061203f79"
revision = "5f7b0e4895413d785ff15b84d218d73e8a47866a"
[[projects]]
branch = "master"

View File

@ -49,7 +49,7 @@ required = [
[[constraint]]
name = "github.com/google/go-containerregistry"
revision = "697ee0b3d46eff19ed2b30f86230377061203f79"
revision = "5f7b0e4895413d785ff15b84d218d73e8a47866a"
[[override]]
name = "github.com/tonistiigi/fsutil"

View File

@ -79,7 +79,6 @@ var getImageSaver = func() (ImageSaver, error) {
}
cli.NegotiateAPIVersion(context.Background())
return cli, nil
// return client.NewEnvClient()
}
func saveImage(ref name.Reference) (io.ReadCloser, error) {

View File

@ -36,7 +36,12 @@ type ImageLoader interface {
// This is a variable so we can override in tests.
var GetImageLoader = func() (ImageLoader, error) {
return client.NewEnvClient()
cli, err := client.NewEnvClient()
if err != nil {
return nil, err
}
cli.NegotiateAPIVersion(context.Background())
return cli, nil
}
// WriteOptions are used to expose optional information to guide or