Rename to flags and environment variables to content trust

Update help line to allow 90 characters instead of 80

The trust flag pushes out the help description column wider, requiring more room to display help messages.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
This commit is contained in:
Derek McGowan 2015-07-24 01:59:42 -07:00 committed by Tibor Vass
parent 53d11aa48e
commit 57094eec6e
5 changed files with 111 additions and 111 deletions

View File

@ -49,8 +49,8 @@ by the `docker` command line:
unsuitable for Docker.
* `DOCKER_RAMDISK` If set this will disable 'pivot_root'.
* `DOCKER_TLS_VERIFY` When set Docker uses TLS and verifies the remote.
* `DOCKER_TRUST` When set Docker uses notary to sign and verify images.
Equates to `--untrusted=false` for build, create, pull, push, run.
* `DOCKER_CONTENT_TRUST` When set Docker uses notary to sign and verify images.
Equates to `--disable-content-trust=false` for build, create, pull, push, run.
* `DOCKER_TMPDIR` Location for temporary Docker files.
Because Docker is developed using 'Go', you can also use any environment

View File

@ -61,7 +61,7 @@ Creates a new container.
--restart="no" Restart policy (no, on-failure[:max-retry], always)
--security-opt=[] Security options
-t, --tty=false Allocate a pseudo-TTY
--untrusted=true Skip image verification
--disable-content-trust=true Skip image verification
-u, --user="" Username or UID
--ulimit=[] Ulimit options
--uts="" UTS namespace to use

View File

@ -16,7 +16,7 @@ weight=1
Pull an image or a repository from the registry
-a, --all-tags=false Download all tagged images in the repository
--untrusted=true Skip image verification
--disable-content-trust=true Skip image verification
Most of your images will be created on top of a base image from the
[Docker Hub](https://hub.docker.com) registry.

View File

@ -15,7 +15,7 @@ weight=1
Push an image or a repository to the registry
--untrusted=true Skip image signing
--disable-content-trust=true Skip image signing
Use `docker push` to share your images to the [Docker Hub](https://hub.docker.com)
registry or to a self-hosted one.

View File

@ -65,7 +65,7 @@ weight=1
-t, --tty=false Allocate a pseudo-TTY
-u, --user="" Username or UID (format: <name|uid>[:<group|gid>])
--ulimit=[] Ulimit options
--untrusted=true Skip image verification
--disable-content-trust=true Skip image verification
--uts="" UTS namespace to use
-v, --volume=[] Bind mount a volume
--volumes-from=[] Mount volumes from the specified container(s)