Update DTR install

mikewolfd · Nov 10, 2016 · e0ad427 · e0ad427
1 parent e9b670a
commit e0ad427
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 67 deletions.
diff --git a/datacenter/dtr/2.1/architecture.md b/datacenter/dtr/2.1/architecture.md
@@ -43,13 +43,14 @@ are created:
 
 DTR uses these named volumes for persisting data:
 
-| Volume name                     | Description                                                                      |
-|:--------------------------------|:---------------------------------------------------------------------------------|
-| dtr-ca-&lt;replica_id&gt;       | Root key material for the DTR root CA that issues certificates                   |
-| dtr-etcd-&lt;replica_id&gt;     | DTR configuration data                                                           |
-| dtr-notary-&lt;replica_id&gt;   | Certificate and keys for the Notary components                                   |
-| dtr-registry-&lt;replica_id&gt; | Docker images data, if DTR is configured to store images on the local filesystem |
-| dtr-rethink-&lt;replica_id&gt;  | Repository metadata                                                              |
+| Volume name                         | Description                                                                      |
+|:------------------------------------|:---------------------------------------------------------------------------------|
+| dtr-ca-&lt;replica_id&gt;           | Root key material for the DTR root CA that issues certificates                   |
+| dtr-etcd-&lt;replica_id&gt;         | DTR configuration data                                                           |
+| dtr-notary-&lt;replica_id&gt;       | Certificate and keys for the Notary components                                   |
+| dtr-registry-&lt;replica_id&gt;     | Docker images data, if DTR is configured to store images on the local filesystem |
+| dtr-rethink-&lt;replica_id&gt;      | Repository metadata                                                              |
+| dtr-nfs-registry-&lt;replica_id&gt; | Docker images data, if DTR is configured to store images on NFS                  |
 
 You can customize the volume driver used for these volumes, by creating the
 volumes before installing DTR. During the installation, DTR checks which volumes

diff --git a/datacenter/dtr/2.1/index.md b/datacenter/dtr/2.1/index.md
@@ -27,7 +27,7 @@ DTR uses the same authentication mechanism as Docker Universal Control Plane.
 It has a built-in authentication mechanism, and also integrates with LDAP
 and Active Directory. It also supports Role Based Access Control (RBAC).
 
-This allows you to implement fine-grain access control policies, on who has
+This allows you to implement fine-grain access control policies on who has
 access to your Docker images.
 
 ![](images/overview-2.png)

diff --git a/datacenter/dtr/2.1/install/index.md b/datacenter/dtr/2.1/install/index.md
@@ -29,73 +29,42 @@ Make sure all the nodes you plan on installing DTR are being managed by UCP.
 To install DTR you use the `docker/dtr` image. This image has commands to
 install, configure, and backup DTR.
 
-To install DTR:
+Run the following command to install DTR:
 
-1.  Get the DTR package.
+```bash
+# Pull the latest version of DTR
+$ docker pull docker/dtr
 
-    ```bash
-    $ wget https://packages.docker.com/caas/ucp-2.0.0-beta3_dtr-2.1.0-beta3.tar.gz -O docker-datacenter.tar.gz
-    ```
-
-2.  Transfer the package to the nodes.
+# Install DTR
+$ docker run -it --rm \
+  docker/dtr install \
+  --ucp-node <ucp-node-name> \
+  --ucp-insecure-tls
+```
 
-    Now that you have the DTR package in your machine, you can transfer it to the
-    nodes that you want to install DTR. For each node run:
-
-    ```bash
-    $ scp docker-datacenter.tag.gz <user>@<host>:/tmp
-    ```
-
-3.  Load the images.
-
-    Once the package is on the nodes where you want to install DTR, you can use
-    the `docker load` command, to load the images from the .tar file. Log
-    into each node where you plan on installing DTR and run:
-
-    ```bash
-    $ docker load < /tmp/docker-datacenter.tar.gz
-    ```
+Where the `--ucp-node` is the hostname of the UCP node where you want to deploy
+DTR. `--ucp-insecure-tls` tells the installer to trust the certificates used
+by UCP.
 
-4.  Download a UCP client bundle.
+The install command has other flags for customizing DTR at install time.
+Check the [reference documentation to learn more](../reference/install.md).
 
-    Having a UCP client bundle allows you to run Docker commands on a swarm
-    being managed by UCP.
-    [Download a UCP client bundle](https://docs.docker.com/ucp/access-ucp/cli-based-access/)
-    and set up your CLI client to use it.
 
-5.  Run the following commands to install DTR.
+## Step 4. Check that DTR is running
 
-    ```bash
-
-    # Install DTR
-    $ docker run -it --rm \
-      docker/dtr:2.1.0-beta3 install \
-      --ucp-node <hostname> \
-      --ucp-insecure-tls
-    ```
-
-    Where the `--ucp-node` is the hostname of the node where you've previously
-    loaded the DTR images, and `--ucp-insecure-tls` tells the installer to
-    trust the certificates used by UCP.
-    The install command has other flags for customizing DTR at install time.
-    Check the [reference documentation to learn more](../reference/install.md).
-
-
-6. Check that DTR is running.
-
-    In your browser, navigate to the the Docker **Universal Control Plane**
-    web UI, and navigate to the **Applications** screen. DTR should be listed
-    as an application.
+In your browser, navigate to the the Docker **Universal Control Plane**
+web UI, and navigate to the **Applications** screen. DTR should be listed
+as an application.
 
-    ![](../images/install-dtr-1.png)
+![](../images/install-dtr-1.png)
 
-    You can also access the **DTR web UI**, to make sure it is working. In your
-    browser, navigate to the address were you installed DTR.
+You can also access the **DTR web UI**, to make sure it is working. In your
+browser, navigate to the address were you installed DTR.
 
-    ![](../images/install-dtr-2.png)
+![](../images/install-dtr-2.png)
 
 
-## Step 4. Configure DTR
+## Step 5. Configure DTR
 
 After installing DTR, you should configure:
 
@@ -107,13 +76,13 @@ After installing DTR, you should configure:
 
   ![](../images/install-dtr-3.png)
 
-## Step 5. Test pushing and pulling
+## Step 6. Test pushing and pulling
 
 Now that you have a working installation of DTR, you should test that you can
 push and pull images to it.
 [Learn how to push and pull images](../repos-and-images/index.md).
 
-## Step 6. Join replicas to the cluster
+## Step 7. Join replicas to the cluster
 
 This step is optional.
 
@@ -143,7 +112,7 @@ replicas:
     ```bash
     $ docker run -it --rm \
       docker/dtr:2.1.0-beta3 join \
-      --ucp-node <hostname> \
+      --ucp-node <ucp-node-name> \
       --ucp-insecure-tls
     ```
 

diff --git a/datacenter/dtr/2.1/install/install-offline.md b/datacenter/dtr/2.1/install/install-offline.md
@@ -20,7 +20,7 @@ copy that package to the nodes where you’ll install DTR.
     Docker Datacenter components:
 
     ```bash
-    $ wget https://packages.docker.com/caas/ucp-2.0.0-beta3_dtr-2.1.0-beta3.tar.gz -O docker-datacenter.tar.gz
+    $ wget https://packages.docker.com/caas/ucp-2.0.0_dtr-2.1.0.tar.gz -O docker-datacenter.tar.gz
     ```
 
 2.  Transfer the package to the offline nodes.