Merge pull request #1160 from euank/simpler-pass

config/credentials: don't run 'pass' to detect it
docker · Jul 2, 2018 · 9e36ff4 · 9e36ff4
2 parents 34ba66b + 056015c
commit 9e36ff4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 210 deletions.
diff --git a/cli/config/credentials/default_store_linux.go b/cli/config/credentials/default_store_linux.go
@@ -1,12 +1,11 @@
 package credentials
 
 import (
-	"github.com/docker/docker-credential-helpers/pass"
+	"os/exec"
 )
 
 func defaultCredentialsStore() string {
-	passStore := pass.Pass{}
-	if passStore.CheckInitialized() {
+	if _, err := exec.LookPath("pass"); err == nil {
 		return "pass"
 	}
 

diff --git a/vendor/github.com/docker/docker-credential-helpers/pass/pass_linux.go b/vendor/github.com/docker/docker-credential-helpers/pass/pass_linux.go