diff --git a/high-availability/backups-and-disaster-recovery.md b/high-availability/backups-and-disaster-recovery.md index 4868b9f9e0..909318b129 100644 --- a/high-availability/backups-and-disaster-recovery.md +++ b/high-availability/backups-and-disaster-recovery.md @@ -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: ```bash -# Get the certificates used by UCP -$ curl https:///ca > ucp-ca.pem - # Create the backup $ docker run -i --rm docker/dtr backup \ --ucp-url \ - --ucp-ca "$(cat ucp-ca.pem)" \ + --ucp-insecure-tls \ --existing-replica-id \ --ucp-username \ --ucp-password > /tmp/backup.tar @@ -80,7 +77,7 @@ $ docker run -i --rm docker/dtr backup \ Where: * `--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, * `--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: ```bash -# Get the certificates used by UCP -$ curl https:///ca > ucp-ca.pem - # Install and restore configurations from an existing backup $ docker run -i --rm \ docker/dtr restore \ --ucp-url \ - --ucp-ca "$(cat ucp-ca.pem)" \ + --ucp-insecure-tls \ --ucp-username \ --ucp-password \ --dtr-load-balancer < /tmp/backup.tar @@ -133,7 +127,7 @@ $ docker run -i --rm \ Where: * `--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, * `--dtr-load-balancer` is the domain name or ip where DTR can be reached. diff --git a/install/index.md b/install/index.md index 106d036939..59663f54c9 100644 --- a/install/index.md +++ b/install/index.md @@ -78,18 +78,17 @@ To install DTR: 5. Run the following commands to install DTR. ```bash - # Get the certificates used by UCP - $ curl -k https:///ca > ucp-ca.pem # Install DTR $ docker run -it --rm \ - docker/dtr:2.0.0-beta1 install \ + docker/dtr:2.1.0-beta1 install \ --ucp-node \ - --ucp-ca "$(cat ucp-ca.pem)" + --ucp-insecure-tls ``` 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. Check the [reference documentation to learn more](../reference/install.md). @@ -154,12 +153,10 @@ replicas: Then run: ```bash - # Get the certificates used by UCP - $ curl -k https:///ca > ucp-ca.pem - $ docker run -it --rm \ - docker/dtr join \ - --ucp-ca "$(cat ucp-ca.pem)" + docker/dtr:2.1.0-beta1 join \ + --ucp-node \ + --ucp-insecure-tls ``` 4. Check that all replicas are running. diff --git a/install/uninstall.md b/install/uninstall.md index 6defcd4e63..9f18bb84d6 100644 --- a/install/uninstall.md +++ b/install/uninstall.md @@ -24,7 +24,7 @@ To see what options are available in the uninstall command, check the [uninstall command reference](../reference/remove.md), or run: ```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 @@ -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: ```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 replica-id (Specify the replica Id. Must be unique per replica, leave blank for random): a701a510126c diff --git a/install/upgrade/index.md b/install/upgrade/index.md index a9789dff10..dcd4c3c480 100644 --- a/install/upgrade/index.md +++ b/install/upgrade/index.md @@ -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: ```bash - # Get the certificates used by UCP - $ curl -k https:///ca > ucp-ca.pem - $ docker run -it --rm \ 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 diff --git a/install/upgrade/upgrade-major.md b/install/upgrade/upgrade-major.md index 7713c73c1e..cf10459489 100644 --- a/install/upgrade/upgrade-major.md +++ b/install/upgrade/upgrade-major.md @@ -76,15 +76,13 @@ To start the migration: Then run the migrate command: ```bash - # Get the certificates used by UCP - $ curl https://$UCP_HOST/ca > ucpca.crt - # Migrate configurations, accounts, and repository metadata docker run -it --rm \ -v /var/run/docker.sock:/var/run/docker.sock \ docker/dtr migrate \ - --ucp-url $UCP_HOST --ucp-ca "$(cat ucpca.crt)" \ + --ucp-url $UCP_HOST \ --dtr-external-url $DTR_HOST \ + --ucp-insecure-tls \ --dtr-ca "$(cat dtrca.crt)" ``` @@ -167,16 +165,13 @@ replicas: Then run: ```bash - # Get the certificates used by UCP - $ curl -k https://$UCP_HOST/ca > ucp-ca.pem - $ docker run -it --rm \ docker/dtr join \ --ucp-url $UCP_URL \ --ucp-node $UCP_NODE \ --existing-replica-id $REPLICA_TO_JOIN \ --ucp-username $USER --ucp-password $PASSWORD \ - --ucp-ca "$(cat ucp-ca.pem)" + --ucp-insecure-tls ``` Where: