diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-18 10:37:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-18 10:37:37 -0400 |
| commit | 48db8d9868ecbb1523f5b4b69815d16a19afa36f (patch) | |
| tree | f1dfde65a2500c3813f91d6fa9f0566a76c483b8 /vendor/github.com/docker | |
| parent | ce04a3e17f5d5ac1d0ac29302dc6e6d98edf28eb (diff) | |
| parent | b6662eed3f27ac5466501b046db4f1608845af61 (diff) | |
| download | podman-48db8d9868ecbb1523f5b4b69815d16a19afa36f.tar.gz podman-48db8d9868ecbb1523f5b4b69815d16a19afa36f.tar.bz2 podman-48db8d9868ecbb1523f5b4b69815d16a19afa36f.zip | |
Merge pull request #10690 from rhatdan/VENDOR
Vendor in containers/common v0.40.0
Diffstat (limited to 'vendor/github.com/docker')
| -rw-r--r-- | vendor/github.com/docker/docker-credential-helpers/client/command.go | 3 | ||||
| -rw-r--r-- | vendor/github.com/docker/docker-credential-helpers/credentials/version.go | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/vendor/github.com/docker/docker-credential-helpers/client/command.go b/vendor/github.com/docker/docker-credential-helpers/client/command.go index 8da334306..0183c0639 100644 --- a/vendor/github.com/docker/docker-credential-helpers/client/command.go +++ b/vendor/github.com/docker/docker-credential-helpers/client/command.go @@ -4,7 +4,8 @@ import ( "fmt" "io" "os" - "os/exec" + + exec "golang.org/x/sys/execabs" ) // Program is an interface to execute external programs. diff --git a/vendor/github.com/docker/docker-credential-helpers/credentials/version.go b/vendor/github.com/docker/docker-credential-helpers/credentials/version.go index c2cc3e2e0..185e36796 100644 --- a/vendor/github.com/docker/docker-credential-helpers/credentials/version.go +++ b/vendor/github.com/docker/docker-credential-helpers/credentials/version.go @@ -1,4 +1,4 @@ package credentials // Version holds a string describing the current version -const Version = "0.6.3" +const Version = "0.6.4" |