diff --git a/cmd/skopeo/copy.go b/cmd/skopeo/copy.go index 424794e895..0254e2d06d 100644 --- a/cmd/skopeo/copy.go +++ b/cmd/skopeo/copy.go @@ -16,7 +16,7 @@ func copyHandler(context *cli.Context) error { policyContext, err := getPolicyContext(context) if err != nil { - return fmt.Errorf("Error loading verification policy: %v", err) + return fmt.Errorf("Error loading trust policy: %v", err) } defer policyContext.Destroy() diff --git a/cmd/skopeo/main.go b/cmd/skopeo/main.go index 28b2622956..0b714b3111 100644 --- a/cmd/skopeo/main.go +++ b/cmd/skopeo/main.go @@ -54,7 +54,7 @@ func createApp() *cli.App { cli.StringFlag{ Name: "policy", Value: "", - Usage: "Path to a signature verification policy file", + Usage: "Path to a trust policy file", }, } app.Before = func(c *cli.Context) error { diff --git a/docs/skopeo.1.md b/docs/skopeo.1.md index 0c9bb2aa07..9dbce05c4c 100644 --- a/docs/skopeo.1.md +++ b/docs/skopeo.1.md @@ -43,8 +43,7 @@ Most commands refer to container images, using a _transport_`:`_details_ format. **--cert-path** _path_ Use certificates at _path_ (cert.pem, key.pem) to connect to the registry - **--policy** _path-to-policy_ Path to a policy.json file to use for verifying signatures and - deciding whether an image is accepted, instead of the default policy. + **--policy** _path-to-policy_ Path to a policy.json file to use for verifying signatures and deciding whether an image is trusted, overriding the default trust policy file. **--tls-verify** _bool-value_ Verify certificates @@ -59,7 +58,7 @@ Most commands refer to container images, using a _transport_`:`_details_ format. Copy an image (manifest, filesystem layers, signatures) from one location to another. -Uses the system's signature verification policy to validate images, refuses to copy images rejected by the policy. +Uses the system's trust policy to validate images, rejects images not trusted by the policy. _source-image_ use the "image name" format described above @@ -137,7 +136,7 @@ show help for `skopeo` # FILES **/etc/containers/policy.json** - Default signature verification policy file, if **--policy** is not specified. + Default trust policy file, if **--policy** is not specified. The policy format is documented in https://github.com/containers/image/blob/master/docs/policy.json.md . # EXAMPLES