summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorumohnani8 <umohnani@redhat.com>2018-04-30 14:25:15 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-04-30 20:22:29 +0000
commit52ace66e76ca2854e58ded9d337a3ff1d26a9202 (patch)
treea9de8d9c5bff0f7e79eaad1010bb05d7347b39b6
parentd5d6e6859286ab9310e4a79082d50c816941f1ae (diff)
downloadpodman-52ace66e76ca2854e58ded9d337a3ff1d26a9202.tar.gz
podman-52ace66e76ca2854e58ded9d337a3ff1d26a9202.tar.bz2
podman-52ace66e76ca2854e58ded9d337a3ff1d26a9202.zip
Vendor in latest containers/image
Fixes podman pull to pull a public image even if $XDG_RUNTIME_DIR does not exist for authentication. Public images don't require credentials to access. Signed-off-by: umohnani8 <umohnani@redhat.com> Closes: #701 Approved by: rhatdan
-rw-r--r--vendor.conf4
-rw-r--r--vendor/github.com/containers/image/pkg/docker/config/config.go13
2 files changed, 12 insertions, 5 deletions
diff --git a/vendor.conf b/vendor.conf
index bf7293267..33a437adf 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -10,7 +10,7 @@ github.com/containerd/cgroups 7a5fdd8330119dc70d850260db8f3594d89d6943
github.com/containerd/continuity master
github.com/containernetworking/cni v0.4.0
github.com/containernetworking/plugins master
-github.com/containers/image e51d350816912bbd09a91f690cd394b6225c043d
+github.com/containers/image 88423e35d5f11939b0db4fb8f2939fc04adf2463
github.com/containers/storage ce923c1ed9e51c8fe58e41a86abc05be7b824f62
github.com/coreos/go-systemd v14
github.com/cri-o/ocicni master
@@ -89,6 +89,6 @@ k8s.io/utils 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e https://github.com/kuberne
github.com/mrunalp/fileutils master
github.com/varlink/go master https://github.com/varlink/go
github.com/projectatomic/buildah master https://github.com/projectatomic/buildah
-vendor/github.com/Nvveen/Gotty master
+github.com/Nvveen/Gotty master
github.com/fsouza/go-dockerclient master
github.com/openshift/imagebuilder master
diff --git a/vendor/github.com/containers/image/pkg/docker/config/config.go b/vendor/github.com/containers/image/pkg/docker/config/config.go
index 1238208fb..3edab0539 100644
--- a/vendor/github.com/containers/image/pkg/docker/config/config.go
+++ b/vendor/github.com/containers/image/pkg/docker/config/config.go
@@ -15,6 +15,7 @@ import (
"github.com/docker/docker-credential-helpers/credentials"
"github.com/docker/docker/pkg/homedir"
"github.com/pkg/errors"
+ "github.com/sirupsen/logrus"
)
type dockerAuthConfig struct {
@@ -64,11 +65,17 @@ func GetAuthentication(sys *types.SystemContext, registry string) (string, strin
}
dockerLegacyPath := filepath.Join(homedir.Get(), dockerLegacyCfg)
+ var paths []string
pathToAuth, err := getPathToAuth(sys)
- if err != nil {
- return "", "", err
+ if err == nil {
+ paths = append(paths, pathToAuth)
+ } else {
+ // Error means that the path set for XDG_RUNTIME_DIR does not exist
+ // but we don't want to completely fail in the case that the user is pulling a public image
+ // Logging the error as a warning instead and moving on to pulling the image
+ logrus.Warnf("%v: Trying to pull image in the event that it is a public image.", err)
}
- paths := [3]string{pathToAuth, filepath.Join(homedir.Get(), dockerCfg, dockerCfgFileName), dockerLegacyPath}
+ paths = append(paths, filepath.Join(homedir.Get(), dockerCfg, dockerCfgFileName), dockerLegacyPath)
for _, path := range paths {
legacyFormat := path == dockerLegacyPath