Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/skopeo/copy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion cmd/skopeo/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 3 additions & 4 deletions docs/skopeo.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down