Skip to content

Commit d1fd24b

Browse files
committed
Update docker libraries and go-container-registry
Signed-off-by: David Gageot <[email protected]>
1 parent 8278e14 commit d1fd24b

File tree

241 files changed

+4599
-5576
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+4599
-5576
lines changed

go.mod

+5-10
Original file line numberDiff line numberDiff line change
@@ -28,31 +28,28 @@ require (
2828
github.com/Azure/go-autorest/autorest/to v0.3.0 // indirect
2929
github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
3030
github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e // indirect
31-
github.com/Microsoft/go-winio v0.4.14 // indirect
3231
github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b // indirect
32+
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
3333
github.com/aws/aws-sdk-go v1.23.15 // indirect
3434
github.com/blang/semver v3.5.1+incompatible
3535
github.com/bmatcuk/doublestar v1.1.5
3636
github.com/containerd/continuity v0.0.0-20181027224239-bea7585dbfac // indirect
37-
github.com/docker/cli v0.0.0-20181026145426-51668a30f262
37+
github.com/docker/cli v0.0.0-20191011045415-5d85cdacd257
3838
github.com/docker/distribution v2.7.1+incompatible
39-
github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0
40-
github.com/docker/docker-credential-helpers v0.6.3 // indirect
39+
github.com/docker/docker v1.4.2-0.20180531152204-71cd53e4a197
4140
github.com/docker/go-connections v0.4.0
4241
github.com/docker/go-metrics v0.0.1 // indirect
43-
github.com/docker/go-units v0.3.3 // indirect
4442
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
4543
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
4644
github.com/emirpasic/gods v1.12.0 // indirect
4745
github.com/ghodss/yaml v1.0.0
4846
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
4947
github.com/golang/protobuf v1.3.2
5048
github.com/google/go-cmp v0.3.1
51-
github.com/google/go-containerregistry v0.0.0-20190905020052-226422ba1797
49+
github.com/google/go-containerregistry v0.0.0-20191010200024-a3d713f9b7f8
5250
github.com/google/go-github v17.0.0+incompatible
5351
github.com/google/go-querystring v1.0.0 // indirect
5452
github.com/google/uuid v1.1.1
55-
github.com/googleapis/gnostic v0.2.2 // indirect
5653
github.com/gorilla/context v1.1.1 // indirect
5754
github.com/gorilla/mux v1.6.2 // indirect
5855
github.com/grpc-ecosystem/grpc-gateway v1.8.6
@@ -67,7 +64,6 @@ require (
6764
github.com/mattn/go-isatty v0.0.9 // indirect
6865
github.com/mitchellh/go-homedir v1.1.0
6966
github.com/moby/buildkit v0.3.3
70-
github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect
7167
github.com/opencontainers/go-digest v1.0.0-rc1
7268
github.com/opencontainers/image-spec v1.0.1
7369
github.com/opencontainers/runc v0.1.1 // indirect
@@ -78,7 +74,7 @@ require (
7874
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
7975
github.com/sirupsen/logrus v1.4.2
8076
github.com/spf13/cobra v0.0.5
81-
github.com/spf13/pflag v1.0.3
77+
github.com/spf13/pflag v1.0.5
8278
github.com/tektoncd/pipeline v0.5.1-0.20190731183258-9d7e37e85bf8
8379
go.opencensus.io v0.22.1 // indirect
8480
go.uber.org/atomic v1.4.0 // indirect
@@ -94,7 +90,6 @@ require (
9490
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55
9591
google.golang.org/grpc v1.22.2
9692
gopkg.in/AlecAivazis/survey.v1 v1.8.7
97-
gopkg.in/inf.v0 v0.9.1 // indirect
9893
gopkg.in/russross/blackfriday.v2 v2.0.1
9994
gopkg.in/src-d/go-billy.v4 v4.3.0 // indirect
10095
gopkg.in/src-d/go-git.v4 v4.11.0

go.sum

+32-6
Large diffs are not rendered by default.

pkg/skaffold/docker/auth.go

+17-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,12 @@ func (credsHelper) GetAuthConfig(registry string) (types.AuthConfig, error) {
6868

6969
gcp.AutoConfigureGCRCredentialHelper(cf, registry)
7070

71-
return cf.GetAuthConfig(registry)
71+
auth, err := cf.GetAuthConfig(registry)
72+
if err != nil {
73+
return types.AuthConfig{}, err
74+
}
75+
76+
return types.AuthConfig(auth), nil
7277
}
7378

7479
func (credsHelper) GetAllAuthConfigs() (map[string]types.AuthConfig, error) {
@@ -77,7 +82,17 @@ func (credsHelper) GetAllAuthConfigs() (map[string]types.AuthConfig, error) {
7782
return nil, errors.Wrap(err, "docker config")
7883
}
7984

80-
return cf.GetAllCredentials()
85+
credentials, err := cf.GetAllCredentials()
86+
if err != nil {
87+
return nil, err
88+
}
89+
90+
authConfigs := make(map[string]types.AuthConfig, len(credentials))
91+
for k, auth := range credentials {
92+
authConfigs[k] = types.AuthConfig(auth)
93+
}
94+
95+
return authConfigs, nil
8196
}
8297

8398
func (l *localDaemon) encodedRegistryAuth(ctx context.Context, a AuthConfigHelper, image string) (string, error) {

vendor/github.com/Nvveen/Gotty/LICENSE

+26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Nvveen/Gotty/README

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Nvveen/Gotty/TODO

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)