nixpkgs/pkgs/development/tools/skopeo/path.patch
Vincent Demeester eb1baf2f10
skopeo: 0.1.23 to 0.1.27
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-01-02 10:40:22 +01:00

25 lines
866 B
Diff

diff --git a/cmd/skopeo/main.go b/cmd/skopeo/main.go
index 50e29b2..7108df5 100644
--- a/cmd/skopeo/main.go
+++ b/cmd/skopeo/main.go
@@ -3,6 +3,7 @@ package main
import (
"fmt"
"os"
+ "path/filepath"
"github.com/Sirupsen/logrus"
"github.com/containers/image/signature"
@@ -88,6 +89,11 @@ func getPolicyContext(c *cli.Context) (*signature.PolicyContext, error) {
policyPath := c.GlobalString("policy")
var policy *signature.Policy // This could be cached across calls, if we had an application context.
var err error
+ var dir string
+ if policyPath == "" {
+ dir, err = filepath.Abs(filepath.Dir(os.Args[0]))
+ policyPath = dir + "/../etc/default-policy.json"
+ }
if c.GlobalBool("insecure-policy") {
policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}}
} else if policyPath == "" {