Remove docker references whereever possible

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2017-06-16 10:50:46 -04:00
parent d5e34c1b5e
commit ad33537769
5 changed files with 13 additions and 13 deletions

View File

@ -94,7 +94,7 @@ var copyCmd = cli.Command{
}, },
cli.BoolTFlag{ cli.BoolTFlag{
Name: "src-tls-verify", 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{ cli.StringFlag{
Name: "dest-cert-dir", Name: "dest-cert-dir",
@ -103,7 +103,7 @@ var copyCmd = cli.Command{
}, },
cli.BoolTFlag{ cli.BoolTFlag{
Name: "dest-tls-verify", 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{ cli.StringFlag{
Name: "dest-ostree-tmp-dir", Name: "dest-ostree-tmp-dir",

View File

@ -46,7 +46,7 @@ var deleteCmd = cli.Command{
}, },
cli.BoolTFlag{ cli.BoolTFlag{
Name: "tls-verify", 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)",
}, },
}, },
} }

View File

@ -40,7 +40,7 @@ var inspectCmd = cli.Command{
}, },
cli.BoolTFlag{ cli.BoolTFlag{
Name: "tls-verify", 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{ cli.BoolFlag{
Name: "raw", Name: "raw",

View File

@ -33,7 +33,7 @@ func createApp() *cli.App {
}, },
cli.BoolTFlag{ cli.BoolTFlag{
Name: "tls-verify", 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, Hidden: true,
}, },
cli.StringFlag{ cli.StringFlag{
@ -48,7 +48,7 @@ func createApp() *cli.App {
cli.StringFlag{ cli.StringFlag{
Name: "registries.d", Name: "registries.d",
Value: "", 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 { app.Before = func(c *cli.Context) error {

View File

@ -6,7 +6,7 @@ skopeo -- Various operations with container images and container image registrie
# SYNOPSIS # SYNOPSIS
**skopeo** [_global options_] _command_ [_command options_] **skopeo** [_global options_] _command_ [_command options_]
# DESCRIPTION # 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. It also allows you to copy container images between various registries, possibly converting them as necessary, and to sign and verify images.
## IMAGE NAMES ## 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. **--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 **--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-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-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-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. Existing signatures, if any, are preserved as well.
## skopeo delete ## skopeo delete
**skopeo delete** _image-name_ **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 ```sh
$ docker exec -it registry bin/registry garbage-collect /etc/docker/registry/config.yml $ 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 **--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. 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 **--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
**skopeo manifest-digest** _manifest-file_ **skopeo manifest-digest** _manifest-file_