Update go-containerregistry to master

This commit is contained in:
Vincent Latombe 2020-03-13 09:07:48 +01:00
parent f55c34ab92
commit 4de9575cf0
No known key found for this signature in database
GPG Key ID: B530C2054A24D927
5 changed files with 11 additions and 4 deletions

3
go.mod
View File

@ -5,7 +5,6 @@ go 1.13
replace (
github.com/containerd/containerd v1.4.0-0.20191014053712-acdcf13d5eaf => github.com/containerd/containerd v0.0.0-20191014053712-acdcf13d5eaf
github.com/docker/docker v1.14.0-0.20190319215453-e7b5f7dbe98c => github.com/docker/docker v0.0.0-20190319215453-e7b5f7dbe98c
github.com/google/go-containerregistry v0.0.0-20191218175032-34fb8ff33bed => github.com/Vlatombe/go-containerregistry v0.0.0-20200312085422-51fac941f6b0 // https://github.com/google/go-containerregistry/pull/693
github.com/tonistiigi/fsutil v0.0.0-20190819224149-3d2716dd0a4d => github.com/tonistiigi/fsutil v0.0.0-20191018213012-0f039a052ca1
)
@ -25,7 +24,7 @@ require (
github.com/gliderlabs/ssh v0.2.2 // indirect
github.com/golang/mock v1.3.1
github.com/google/go-cmp v0.3.0
github.com/google/go-containerregistry v0.0.0-20191218175032-34fb8ff33bed
github.com/google/go-containerregistry v0.0.0-20200312164537-d47c18fa2769
github.com/google/go-github v17.0.0+incompatible
github.com/google/go-querystring v1.0.0 // indirect
github.com/google/martian v2.1.0+incompatible // indirect

2
go.sum
View File

@ -212,6 +212,8 @@ github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-containerregistry v0.0.0-20191218175032-34fb8ff33bed h1:0AwV9UBwwKPKrfpTYLOKr8ymevanUxrsSEkAo0uU9aA=
github.com/google/go-containerregistry v0.0.0-20191218175032-34fb8ff33bed/go.mod h1:rodaC7jYStJ2mjR8Y+5a/jCzcRPFRH74KmqSnJC88co=
github.com/google/go-containerregistry v0.0.0-20200312164537-d47c18fa2769 h1:C1YVUvcl/Ho7dsCfgaH1U+4+3dpi8Y50LrnZRlrHnfA=
github.com/google/go-containerregistry v0.0.0-20200312164537-d47c18fa2769/go.mod h1:m8YvHwSOuBCq25yrj1DaX/fIMrv6ec3CNg8jY8+5PEA=
github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=

View File

@ -280,8 +280,8 @@ func Time(img v1.Image, t time.Time) (v1.Image, error) {
// Copy basic config over
cfg.Architecture = ocf.Architecture
cfg.Author = ocf.Author
cfg.OS = ocf.OS
cfg.OSVersion = ocf.OSVersion
cfg.Config = ocf.Config
// Strip away timestamps from the config file

View File

@ -92,6 +92,12 @@ func (bt *bearerTransport) refresh() error {
if err != nil {
return err
}
if auth.RegistryToken != "" {
bt.bearer.RegistryToken = auth.RegistryToken
return nil
}
var content []byte
if auth.IdentityToken != "" {
// If the secret being stored is an identity token,

2
vendor/modules.txt vendored
View File

@ -252,7 +252,7 @@ github.com/google/go-cmp/cmp/internal/diff
github.com/google/go-cmp/cmp/internal/flags
github.com/google/go-cmp/cmp/internal/function
github.com/google/go-cmp/cmp/internal/value
# github.com/google/go-containerregistry v0.0.0-20191218175032-34fb8ff33bed => github.com/Vlatombe/go-containerregistry v0.0.0-20200312085422-51fac941f6b0
# github.com/google/go-containerregistry v0.0.0-20200312164537-d47c18fa2769
github.com/google/go-containerregistry/pkg/authn
github.com/google/go-containerregistry/pkg/authn/k8schain
github.com/google/go-containerregistry/pkg/internal/retry