From 05e9c47dc3c164417803ec9c769043da7575d5f5 Mon Sep 17 00:00:00 2001 From: Christian Albrecht Date: Thu, 29 Jun 2017 08:47:08 +0200 Subject: [PATCH] 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. --- pkgs/development/tools/skopeo/path.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/tools/skopeo/path.patch b/pkgs/development/tools/skopeo/path.patch index 22a74ac944b..35dec5aecbf 100644 --- a/pkgs/development/tools/skopeo/path.patch +++ b/pkgs/development/tools/skopeo/path.patch @@ -22,3 +22,17 @@ index 50e29b2..7108df5 100644 if c.GlobalBool("insecure-policy") { policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}} } 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 + } +