From 48250832a3dd4b93ee7f61035b5b8176febfb55f Mon Sep 17 00:00:00 2001 From: Nathan McCauley Date: Tue, 7 Jul 2015 20:14:47 -0700 Subject: [PATCH] Add cmdline docs for signing and verification flows Signed-off-by: Nathan McCauley --- docs/reference/commandline/cli.md | 2 ++ docs/reference/commandline/create.md | 1 + docs/reference/commandline/pull.md | 1 + docs/reference/commandline/push.md | 2 ++ docs/reference/commandline/run.md | 1 + 5 files changed, 7 insertions(+) diff --git a/docs/reference/commandline/cli.md b/docs/reference/commandline/cli.md index 0f8bfedaac..b15dc1585d 100644 --- a/docs/reference/commandline/cli.md +++ b/docs/reference/commandline/cli.md @@ -49,6 +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_TMPDIR` Location for temporary Docker files. Because Docker is developed using 'Go', you can also use any environment diff --git a/docs/reference/commandline/create.md b/docs/reference/commandline/create.md index aca63d9ee6..3ba09e769f 100644 --- a/docs/reference/commandline/create.md +++ b/docs/reference/commandline/create.md @@ -61,6 +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 -u, --user="" Username or UID --ulimit=[] Ulimit options --uts="" UTS namespace to use diff --git a/docs/reference/commandline/pull.md b/docs/reference/commandline/pull.md index 8e91d7c7da..ac119db792 100644 --- a/docs/reference/commandline/pull.md +++ b/docs/reference/commandline/pull.md @@ -16,6 +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 Most of your images will be created on top of a base image from the [Docker Hub](https://hub.docker.com) registry. diff --git a/docs/reference/commandline/push.md b/docs/reference/commandline/push.md index 2860e0991d..221ee05301 100644 --- a/docs/reference/commandline/push.md +++ b/docs/reference/commandline/push.md @@ -15,5 +15,7 @@ weight=1 Push an image or a repository to the registry + --untrusted=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. diff --git a/docs/reference/commandline/run.md b/docs/reference/commandline/run.md index a7bd36ee51..955ba447e2 100644 --- a/docs/reference/commandline/run.md +++ b/docs/reference/commandline/run.md @@ -65,6 +65,7 @@ weight=1 -t, --tty=false Allocate a pseudo-TTY -u, --user="" Username or UID (format: [:]) --ulimit=[] Ulimit options + --untrusted=true Skip image verification --uts="" UTS namespace to use -v, --volume=[] Bind mount a volume --volumes-from=[] Mount volumes from the specified container(s)