diff --git a/cmd/skopeo/copy.go b/cmd/skopeo/copy.go index 8496620a..d6e89456 100644 --- a/cmd/skopeo/copy.go +++ b/cmd/skopeo/copy.go @@ -94,7 +94,7 @@ var copyCmd = cli.Command{ }, cli.BoolTFlag{ Name: "src-tls-verify", - Usage: "require HTTPS and verify certificates when talking to the docker source registry (defaults to true)", + Usage: "require HTTPS and verify certificates when talking to the container source registry (defaults to true)", }, cli.StringFlag{ Name: "dest-cert-dir", @@ -103,7 +103,7 @@ var copyCmd = cli.Command{ }, cli.BoolTFlag{ Name: "dest-tls-verify", - Usage: "require HTTPS and verify certificates when talking to the docker destination registry (defaults to true)", + Usage: "require HTTPS and verify certificates when talking to the container destination registry (defaults to true)", }, cli.StringFlag{ Name: "dest-ostree-tmp-dir", diff --git a/cmd/skopeo/delete.go b/cmd/skopeo/delete.go index ff2d97ad..4b00cc6a 100644 --- a/cmd/skopeo/delete.go +++ b/cmd/skopeo/delete.go @@ -46,7 +46,7 @@ var deleteCmd = cli.Command{ }, cli.BoolTFlag{ Name: "tls-verify", - Usage: "require HTTPS and verify certificates when talking to docker registries (defaults to true)", + Usage: "require HTTPS and verify certificates when talking to container registries (defaults to true)", }, }, } diff --git a/cmd/skopeo/inspect.go b/cmd/skopeo/inspect.go index 46a505ef..f3b8db6a 100644 --- a/cmd/skopeo/inspect.go +++ b/cmd/skopeo/inspect.go @@ -40,7 +40,7 @@ var inspectCmd = cli.Command{ }, cli.BoolTFlag{ Name: "tls-verify", - Usage: "require HTTPS and verify certificates when talking to docker registries (defaults to true)", + Usage: "require HTTPS and verify certificates when talking to container registries (defaults to true)", }, cli.BoolFlag{ Name: "raw", diff --git a/cmd/skopeo/main.go b/cmd/skopeo/main.go index e849d3be..50e29b23 100644 --- a/cmd/skopeo/main.go +++ b/cmd/skopeo/main.go @@ -33,7 +33,7 @@ func createApp() *cli.App { }, cli.BoolTFlag{ Name: "tls-verify", - Usage: "require HTTPS and verify certificates when talking to docker registries (defaults to true)", + Usage: "require HTTPS and verify certificates when talking to container registries (defaults to true)", Hidden: true, }, cli.StringFlag{ @@ -48,7 +48,7 @@ func createApp() *cli.App { cli.StringFlag{ Name: "registries.d", Value: "", - Usage: "use registry configuration files in `DIR` (e.g. for docker signature storage)", + Usage: "use registry configuration files in `DIR` (e.g. for container signature storage)", }, } app.Before = func(c *cli.Context) error { diff --git a/docs/skopeo.1.md b/docs/skopeo.1.md index 3ab9de0f..1b762c95 100644 --- a/docs/skopeo.1.md +++ b/docs/skopeo.1.md @@ -6,7 +6,7 @@ skopeo -- Various operations with container images and container image registrie # SYNOPSIS **skopeo** [_global options_] _command_ [_command options_] # DESCRIPTION -`skopeo` is a command line utility providing various operations with container images and container image registries. For example, it is able to inspect a repository on a Docker registry and fetch image. It fetches the repository's manifest and it is able to show you a `docker inspect`-like json output about a whole repository or a tag. This tool, in contrast to `docker inspect`, helps you gather useful information about a repository or a tag without requiring you to run `docker pull` - e.g. - which tags are available for the given repository? which labels the image has? +`skopeo` is a command line utility providing various operations with container images and container image registries. For example, it is able to inspect a repository on a container registry and fetch image. It fetches the repository's manifest and it is able to show you a `docker inspect`-like json output about a whole repository or a tag. This tool, in contrast to `docker inspect`, helps you gather useful information about a repository or a tag without requiring you to run `docker pull` - e.g. - which tags are available for the given repository? which labels the image has? It also allows you to copy container images between various registries, possibly converting them as necessary, and to sign and verify images. ## IMAGE NAMES @@ -41,7 +41,7 @@ Most commands refer to container images, using a _transport_`:`_details_ format. **--insecure-policy** Adopt an insecure, permissive policy that allows anything. This obviates the need for a policy file. - **--registries.d** _dir_ use registry configuration files in _dir_ (e.g. for docker signature storage), overriding the default path. + **--registries.d** _dir_ use registry configuration files in _dir_ (e.g. for container signature storage), overriding the default path. **--help**|**-h** Show help @@ -70,20 +70,20 @@ Uses the system's trust policy to validate images, rejects images not trusted by **--src-cert-dir** _path_ Use certificates at _path_ (*.crt, *.cert, *.key) to connect to the source registry - **--src-tls-verify** _bool-value_ Require HTTPS and verify certificates when talking to docker source registry (defaults to true) + **--src-tls-verify** _bool-value_ Require HTTPS and verify certificates when talking to container source registry (defaults to true) **--dest-cert-dir** _path_ Use certificates at _path_ (*.crt, *.cert, *.key) to connect to the destination registry **--dest-ostree-tmp-dir** _path_ Directory to use for OSTree temporary files. - **--dest-tls-verify** _bool-value_ Require HTTPS and verify certificates when talking to docker destination registry (defaults to true) + **--dest-tls-verify** _bool-value_ Require HTTPS and verify certificates when talking to container destination registry (defaults to true) Existing signatures, if any, are preserved as well. ## skopeo delete **skopeo delete** _image-name_ -Mark _image-name_ for deletion. To release the allocated disk space, you need to execute the docker registry garabage collector. E.g., +Mark _image-name_ for deletion. To release the allocated disk space, you need to execute the container registry garabage collector. E.g., ```sh $ docker exec -it registry bin/registry garbage-collect /etc/docker/registry/config.yml @@ -93,7 +93,7 @@ $ docker exec -it registry bin/registry garbage-collect /etc/docker/registry/con **--cert-dir** _path_ Use certificates at _path_ (*.crt, *.cert, *.key) to connect to the registry - **--tls-verify** _bool-value_ Require HTTPS and verify certificates when talking to docker registries (defaults to true) + **--tls-verify** _bool-value_ Require HTTPS and verify certificates when talking to container registries (defaults to true) Additionally, the registry must allow deletions by setting `REGISTRY_STORAGE_DELETE_ENABLED=true` for the registry daemon. @@ -110,7 +110,7 @@ Return low-level information about _image-name_ in a registry **--cert-dir** _path_ Use certificates at _path_ (*.crt, *.cert, *.key) to connect to the registry - **--tls-verify** _bool-value_ Require HTTPS and verify certificates when talking to docker registries (defaults to true) + **--tls-verify** _bool-value_ Require HTTPS and verify certificates when talking to container registries (defaults to true) ## skopeo manifest-digest **skopeo manifest-digest** _manifest-file_