rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-05 02:56:13 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1067 from joshwget/fix-invalid-auth-panic

Browse Source 
Pass non-nil PrivilegeFunc to ImagePull
This commit is contained in:
Darren Shepherd 2016-06-29 20:09:31 -07:00 committed by GitHub
commit 93b4949cce
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trash.conf
View File

@ -17,7 +17,7 @@ github.com/docker/docker bf16bd9dcfc3c9fafb7eb7b39ae7ef7abf1ae7f1 https://github
github.com/docker/engine-api v0.3.3 github.com/docker/engine-api v0.3.3
github.com/docker/go-connections v0.2.0 github.com/docker/go-connections v0.2.0
github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3 github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3
github.com/docker/libcompose e9127328a2aa01c6229952f5721b54a854726e0d https://github.com/rancher/libcompose.git github.com/docker/libcompose 09abf78a849d3cb81a4c17b48d0b68af713a80a5 https://github.com/rancher/libcompose.git
github.com/docker/libnetwork v0.5.6 github.com/docker/libnetwork v0.5.6
github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a
github.com/docker/machine 4a8e93ac9bc2ced1c3bc4a43c03fdaa1c2749205 github.com/docker/machine 4a8e93ac9bc2ced1c3bc4a43c03fdaa1c2749205

4
vendor/github.com/docker/libcompose/docker/image.go generated vendored
View File

@ -60,7 +60,9 @@ func pullImage(ctx context.Context, client client.APIClient, service *Service, i
timeoutsRemaining := 3 timeoutsRemaining := 3
for i := 0; i < 100; i++ { for i := 0; i < 100; i++ {
responseBody, err := client.ImagePull(ctx, options, nil) responseBody, err := client.ImagePull(ctx, options, func() (string, error) {
return encodedAuth, nil
})
if err != nil { if err != nil {
logrus.Errorf("Failed to pull image %s: %v", image, err) logrus.Errorf("Failed to pull image %s: %v", image, err)
return err return err