Fixes install docs, removes ucp-ca

This commit is contained in:
Joao Fernandes 2016-10-10 12:26:32 -07:00
parent c4972c812e
commit 115b30e38a
5 changed files with 19 additions and 36 deletions

View File

@ -65,13 +65,10 @@ backup command to learn about all the available flags.
As an example, to create a backup of a DTR node, you can use: As an example, to create a backup of a DTR node, you can use:
```bash ```bash
# Get the certificates used by UCP
$ curl https://<ucp-url>/ca > ucp-ca.pem
# Create the backup # Create the backup
$ docker run -i --rm docker/dtr backup \ $ docker run -i --rm docker/dtr backup \
--ucp-url <ucp-url> \ --ucp-url <ucp-url> \
--ucp-ca "$(cat ucp-ca.pem)" \ --ucp-insecure-tls \
--existing-replica-id <replica-id> \ --existing-replica-id <replica-id> \
--ucp-username <ucp-admin> \ --ucp-username <ucp-admin> \
--ucp-password <ucp-password> > /tmp/backup.tar --ucp-password <ucp-password> > /tmp/backup.tar
@ -80,7 +77,7 @@ $ docker run -i --rm docker/dtr backup \
Where: Where:
* `--ucp-url` is the address of UCP, * `--ucp-url` is the address of UCP,
* `--ucp-ca` is the UCP certificate authority, * `--ucp-insecure-tls` is to trust the UCP TLS certificate,
* `--existing-replica-id` is the id of the replica to backup, * `--existing-replica-id` is the id of the replica to backup,
* `--ucp-username`, and `--ucp-password` are the credentials of a UCP administrator. * `--ucp-username`, and `--ucp-password` are the credentials of a UCP administrator.
@ -117,14 +114,11 @@ As an example, to install DTR on the host and restore its
state from an existing backup: state from an existing backup:
```bash ```bash
# Get the certificates used by UCP
$ curl https://<ucp-url>/ca > ucp-ca.pem
# Install and restore configurations from an existing backup # Install and restore configurations from an existing backup
$ docker run -i --rm \ $ docker run -i --rm \
docker/dtr restore \ docker/dtr restore \
--ucp-url <ucp-url> \ --ucp-url <ucp-url> \
--ucp-ca "$(cat ucp-ca.pem)" \ --ucp-insecure-tls \
--ucp-username <ucp-admin> \ --ucp-username <ucp-admin> \
--ucp-password <ucp-password> \ --ucp-password <ucp-password> \
--dtr-load-balancer <dtr-domain-name> < /tmp/backup.tar --dtr-load-balancer <dtr-domain-name> < /tmp/backup.tar
@ -133,7 +127,7 @@ $ docker run -i --rm \
Where: Where:
* `--ucp-url` is the address of UCP, * `--ucp-url` is the address of UCP,
* `--ucp-ca` is the UCP certificate authority, * `--ucp-insecure-tls` is to trust the UCP TLS certificate,
* `--ucp-username`, and `--ucp-password` are the credentials of a UCP administrator, * `--ucp-username`, and `--ucp-password` are the credentials of a UCP administrator,
* `--dtr-load-balancer` is the domain name or ip where DTR can be reached. * `--dtr-load-balancer` is the domain name or ip where DTR can be reached.

View File

@ -78,18 +78,17 @@ To install DTR:
5. Run the following commands to install DTR. 5. Run the following commands to install DTR.
```bash ```bash
# Get the certificates used by UCP
$ curl -k https://<ucp-url>/ca > ucp-ca.pem
# Install DTR # Install DTR
$ docker run -it --rm \ $ docker run -it --rm \
docker/dtr:2.0.0-beta1 install \ docker/dtr:2.1.0-beta1 install \
--ucp-node <hostname> \ --ucp-node <hostname> \
--ucp-ca "$(cat ucp-ca.pem)" --ucp-insecure-tls
``` ```
Where the `--ucp-node` is the hostname of the node where you've previously Where the `--ucp-node` is the hostname of the node where you've previously
loaded the DTR images. 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. The install command has other flags for customizing DTR at install time.
Check the [reference documentation to learn more](../reference/install.md). Check the [reference documentation to learn more](../reference/install.md).
@ -154,12 +153,10 @@ replicas:
Then run: Then run:
```bash ```bash
# Get the certificates used by UCP
$ curl -k https://<ucp-url>/ca > ucp-ca.pem
$ docker run -it --rm \ $ docker run -it --rm \
docker/dtr join \ docker/dtr:2.1.0-beta1 join \
--ucp-ca "$(cat ucp-ca.pem)" --ucp-node <hostname> \
--ucp-insecure-tls
``` ```
4. Check that all replicas are running. 4. Check that all replicas are running.

View File

@ -24,7 +24,7 @@ To see what options are available in the uninstall command, check the
[uninstall command reference](../reference/remove.md), or run: [uninstall command reference](../reference/remove.md), or run:
```bash ```bash
$ docker run --rm -it docker/dtr remove --help $ docker run -it --rm docker/dtr:2.1.0-beta1 remove --help
``` ```
To remove a replica safely, you must tell the bootstrapper about one healthy replica To remove a replica safely, you must tell the bootstrapper about one healthy replica
@ -38,10 +38,10 @@ The following example illustrates how use the remove command interactively to
remove a DTR replica from a cluster with multiple replicas: remove a DTR replica from a cluster with multiple replicas:
```bash ```bash
# Get the certificates used by UCP
$ curl https://$UCP_HOST/ca > ucp-ca.pem
$ docker run --rm -it docker/dtr remove --ucp-ca "$(cat ucp-ca.pem)" $ docker run -it --rm \
docker/dtr:2.1.0-beta1 remove \
--ucp-insecure-tls
existing-replica-id (ID of an existing replica in a cluster): 7ae3cb044b70 existing-replica-id (ID of an existing replica in a cluster): 7ae3cb044b70
replica-id (Specify the replica Id. Must be unique per replica, leave blank for random): a701a510126c replica-id (Specify the replica Id. Must be unique per replica, leave blank for random): a701a510126c

View File

@ -51,12 +51,9 @@ To upgrade DTR you use the `docker/dtr upgrade` command.
The upgrade command upgrades all DTR replicas that are part of your cluster: The upgrade command upgrades all DTR replicas that are part of your cluster:
```bash ```bash
# Get the certificates used by UCP
$ curl -k https://<ucp-url>/ca > ucp-ca.pem
$ docker run -it --rm \ $ docker run -it --rm \
docker/dtr upgrade \ docker/dtr upgrade \
--ucp-cat "$(cat ucp-ca.pem)" --ucp-insecure-tls
``` ```
By default the upgrade command runs in interactive mode and prompts you for By default the upgrade command runs in interactive mode and prompts you for

View File

@ -76,15 +76,13 @@ To start the migration:
Then run the migrate command: Then run the migrate command:
```bash ```bash
# Get the certificates used by UCP
$ curl https://$UCP_HOST/ca > ucpca.crt
# Migrate configurations, accounts, and repository metadata # Migrate configurations, accounts, and repository metadata
docker run -it --rm \ docker run -it --rm \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
docker/dtr migrate \ docker/dtr migrate \
--ucp-url $UCP_HOST --ucp-ca "$(cat ucpca.crt)" \ --ucp-url $UCP_HOST \
--dtr-external-url $DTR_HOST \ --dtr-external-url $DTR_HOST \
--ucp-insecure-tls \
--dtr-ca "$(cat dtrca.crt)" --dtr-ca "$(cat dtrca.crt)"
``` ```
@ -167,16 +165,13 @@ replicas:
Then run: Then run:
```bash ```bash
# Get the certificates used by UCP
$ curl -k https://$UCP_HOST/ca > ucp-ca.pem
$ docker run -it --rm \ $ docker run -it --rm \
docker/dtr join \ docker/dtr join \
--ucp-url $UCP_URL \ --ucp-url $UCP_URL \
--ucp-node $UCP_NODE \ --ucp-node $UCP_NODE \
--existing-replica-id $REPLICA_TO_JOIN \ --existing-replica-id $REPLICA_TO_JOIN \
--ucp-username $USER --ucp-password $PASSWORD \ --ucp-username $USER --ucp-password $PASSWORD \
--ucp-ca "$(cat ucp-ca.pem)" --ucp-insecure-tls
``` ```
Where: Where: