1. docker
  2. Commit e869e8aa3d0671394f83d0b6ea7d90cb310e5b61
Browse code

more notary documentation

Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>

Viktor Stanchev authored on 2015/10/27 08:54:47
Showing 3 changed files
docs/reference/commandline/cli.md
History View file @ e869e8a
... ... 
@@ -48,6 +48,8 @@ by the `docker` command line:
48 48 
 * `DOCKER_TLS_VERIFY` When set Docker uses TLS and verifies the remote.
49 49 
 * `DOCKER_CONTENT_TRUST` When set Docker uses notary to sign and verify images.
50 50 
   Equates to `--disable-content-trust=false` for build, create, pull, push, run.
51 
+* `DOCKER_CONTENT_TRUST_SERVER` The URL of the Notary server to use. This defaults
52 
+  to the same URL as the registry.
51 53 
 * `DOCKER_TMPDIR` Location for temporary Docker files.
52 54
53 55 
 Because Docker is developed using 'Go', you can also use any environment
... ... 
@@ -109,6 +111,15 @@ Following is a sample `config.json` file:
109 109 
       "psFormat": "table {{.ID}}\\t{{.Image}}\\t{{.Command}}\\t{{.Labels}}"
110 110 
     }
111 111
112 
+### Notary
113 
+
114 
+If using your own notary server and a self-signed certificate or an internal
115 
+Certificate Authority, you need to place the certificate at
116 
+`tls/<registry_url>/ca.crt` in your docker config directory.
117 
+
118 
+Alternatively you can trust the certificate globally by adding it to your system's
119 
+list of root Certificate Authorities.
120 
+
112 121 
 ## Help
113 122
114 123 
 To list the help on any command just execute the command, followed by the
docs/security/trust/content_trust.md
History View file @ e869e8a
... ... 
@@ -31,7 +31,10 @@ Docker registries. These signatures allow client-side verification of the
31 31 
 integrity and publisher of specific image tags.
32 32
33 33 
 Currently, content trust is disabled by default. You must enabled it by setting
34 
-the `DOCKER_CONTENT_TRUST` environment variable.
34 
+the `DOCKER_CONTENT_TRUST` environment variable. Refer to the
35 
+[environment variables](../../reference/commandline/cli.md#environment-variables)
36 
+and [Notary](../../reference/commandline/cli.md#notary) configuration
37 
+for the docker client for more options.
35 38
36 39 
 Once content trust is enabled, image publishers can sign their images. Image consumers can
37 40 
 ensure that the images they use are signed. publishers and consumers can be
docs/security/trust/deploying_notary.md
History View file @ e869e8a
38 41 
new file mode 100644
... ... 
@@ -0,0 +1,34 @@
0 
+<!--[metadata]>
1 
+title = "Deploying Notary"
2 
+description = "Deploying Notary"
3 
+keywords = ["trust, security, notary, deployment"]
4 
+[menu.main]
5 
+parent= "smn_content_trust"
6 
+<![end-metadata]-->
7 
+
8 
+# Deploying Notary Server with Compose
9 
+
10 
+The easiest way to deploy Notary Server is by using Docker Compose. To follow the procedure on this page, you must have already [installed Docker Compose](../../../compose/install.md).
11 
+
12 
+1. Clone the Notary repository
13 
+
14 
+        git clone git@github.com:docker/notary.git
15 
+
16 
+2. Build and start Notary Server with the sample certificates.
17 
+
18 
+        docker-compose up -d
19 
+
20 
+
21 
+    For more detailed documentation about how to deploy Notary Server see https://github.com/docker/notary.
22 
+3. Make sure that your Docker or Notary client trusts Notary Server's certificate before you try to interact with the Notary server.
23 
+
24 
+See the instructions for [Docker](../../reference/commandline/cli.md#notary) or
25 
+for [Notary](https://github.com/docker/notary#using-notary) depending on which one you are using.
26 
+
27 
+## If you want to use Notary in production
28 
+
29 
+Please check back here for instructions after Notary Server has an official
30 
+stable release. To get a head start on deploying Notary in production see
31 
+https://github.com/docker/notary.