lol
at 17.09-beta 38 lines 1.4 kB view raw
1diff --git a/cmd/skopeo/main.go b/cmd/skopeo/main.go 2index 50e29b2..7108df5 100644 3--- a/cmd/skopeo/main.go 4+++ b/cmd/skopeo/main.go 5@@ -3,6 +3,7 @@ package main 6 import ( 7 "fmt" 8 "os" 9+ "path/filepath" 10 11 "github.com/Sirupsen/logrus" 12 "github.com/containers/image/signature" 13@@ -88,6 +89,11 @@ func getPolicyContext(c *cli.Context) (*signature.PolicyContext, error) { 14 policyPath := c.GlobalString("policy") 15 var policy *signature.Policy // This could be cached across calls, if we had an application context. 16 var err error 17+ var dir string 18+ if policyPath == "" { 19+ dir, err = filepath.Abs(filepath.Dir(os.Args[0])) 20+ policyPath = dir + "/../etc/default-policy.json" 21+ } 22 if c.GlobalBool("insecure-policy") { 23 policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}} 24 } else if policyPath == "" { 25diff --git a/vendor/github.com/containers/image/docker/docker_client.go b/vendor/github.com/containers/image/docker/docker_client.go 26index b989770..697d2ee 100644 27--- a/vendor/github.com/containers/image/docker/docker_client.go 28+++ b/vendor/github.com/containers/image/docker/docker_client.go 29@@ -154,6 +154,9 @@ func setupCertificates(dir string, tlsc *tls.Config) error { 30 if os.IsNotExist(err) { 31 return nil 32 } 33+ if os.IsPermission(err) { 34+ return nil 35+ } 36 return err 37 } 38