skopeo: 0.1.18 -> 0.1.22 fix certs.d permission error
the dependency docker_client.go tries to read /etc/docker/certs.d/ and fails if this is not readable. the original code silently ignores this directory if it is not present so path.patch adds the logic to ignore it in case of a permission error.
This commit is contained in:
parent
08ccf9e059
commit
05e9c47dc3
@ -22,3 +22,17 @@ index 50e29b2..7108df5 100644
|
|||||||
if c.GlobalBool("insecure-policy") {
|
if c.GlobalBool("insecure-policy") {
|
||||||
policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}}
|
policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}}
|
||||||
} else if policyPath == "" {
|
} else if policyPath == "" {
|
||||||
|
diff --git a/vendor/github.com/containers/image/docker/docker_client.go b/vendor/github.com/containers/image/docker/docker_client.go
|
||||||
|
index b989770..697d2ee 100644
|
||||||
|
--- a/vendor/github.com/containers/image/docker/docker_client.go
|
||||||
|
+++ b/vendor/github.com/containers/image/docker/docker_client.go
|
||||||
|
@@ -154,6 +154,9 @@ func setupCertificates(dir string, tlsc *tls.Config) error {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
+ if os.IsPermission(err) {
|
||||||
|
+ return nil
|
||||||
|
+ }
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user