From ae9f0299c59bdc6c32f8998c5fff67a54b7d4df0 Mon Sep 17 00:00:00 2001 From: Joao Fernandes Date: Thu, 26 Jan 2017 15:39:26 -0800 Subject: [PATCH] Update images for beta2 --- _config.yml | 2 ++ datacenter/dtr/2.2/guides/install/index.md | 6 +++--- datacenter/dtr/2.2/guides/install/scale-your-deployment.md | 4 ++-- datacenter/dtr/2.2/guides/install/uninstall.md | 2 +- datacenter/dtr/2.2/guides/install/upgrade.md | 4 ++-- datacenter/ucp/2.1/guides/configure/backup-and-recover.md | 6 +++--- datacenter/ucp/2.1/guides/install/index.md | 4 ++-- datacenter/ucp/2.1/guides/install/uninstall.md | 2 +- datacenter/ucp/2.1/guides/install/upgrade.md | 4 ++-- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/_config.yml b/_config.yml index 5cb38ba75f..d68335523b 100644 --- a/_config.yml +++ b/_config.yml @@ -99,6 +99,7 @@ defaults: values: ucp_version: "2.1" dtr_version: "2.2" + docker_image: "docker/dtr:2.2.0-beta2" - scope: path: "datacenter/dtr/2.1" @@ -118,6 +119,7 @@ defaults: values: ucp_version: "2.1" dtr_version: "2.2" + docker_image: "docker/ucp:2.1.0-beta2" - scope: path: "datacenter/ucp/2.0" diff --git a/datacenter/dtr/2.2/guides/install/index.md b/datacenter/dtr/2.2/guides/install/index.md index 3bf7426886..0f9e289376 100644 --- a/datacenter/dtr/2.2/guides/install/index.md +++ b/datacenter/dtr/2.2/guides/install/index.md @@ -36,11 +36,11 @@ Run the following command to install DTR: ```none # Pull the latest version of DTR -$ docker pull docker/dtr:2.2.0-beta1 +$ docker pull {{ page.docker_image }} # Install DTR $ docker run -it --rm \ - docker/dtr:2.2.0-beta1 install \ + {{ page.docker_image }} install \ --ucp-node \ --ucp-insecure-tls ``` @@ -110,7 +110,7 @@ To add replicas to a DTR cluster, use the `docker/dtr join` command: ```none docker run -it --rm \ - docker/dtr:2.2.0-beta1 join \ + {{ page.docker_image }} join \ --ucp-node \ --ucp-insecure-tls ``` diff --git a/datacenter/dtr/2.2/guides/install/scale-your-deployment.md b/datacenter/dtr/2.2/guides/install/scale-your-deployment.md index 84b46a2819..88ff1b4155 100644 --- a/datacenter/dtr/2.2/guides/install/scale-your-deployment.md +++ b/datacenter/dtr/2.2/guides/install/scale-your-deployment.md @@ -26,7 +26,7 @@ To add replicas to an existing DTR deployment: ```none docker run -it --rm \ - docker/dtr:2.2.0-beta1 join \ + {{ page.docker_image }} join \ --ucp-node \ --ucp-insecure-tls ``` @@ -46,7 +46,7 @@ To remove a DTR replica from your deployment: ```none docker run -it --rm \ - docker/dtr:2.2.0-beta1 remove \ + {{ page.docker_image }} remove \ --ucp-insecure-tls ``` diff --git a/datacenter/dtr/2.2/guides/install/uninstall.md b/datacenter/dtr/2.2/guides/install/uninstall.md index 6cfef80a47..d492428eb8 100644 --- a/datacenter/dtr/2.2/guides/install/uninstall.md +++ b/datacenter/dtr/2.2/guides/install/uninstall.md @@ -19,7 +19,7 @@ When your DTR deployment is down to a single replica, you can use the ```none docker run -it --rm \ - docker/dtr:2.2.0-beta1 destroy \ + {{ page.docker_image }} destroy \ --ucp-insecure-tls ``` diff --git a/datacenter/dtr/2.2/guides/install/upgrade.md b/datacenter/dtr/2.2/guides/install/upgrade.md index 3c84def410..a72e85ea3b 100644 --- a/datacenter/dtr/2.2/guides/install/upgrade.md +++ b/datacenter/dtr/2.2/guides/install/upgrade.md @@ -25,7 +25,7 @@ To upgrade DTR, **login with ssh** into a node that's part of the UCP cluster. Then pull the latest version of DTR: ```none -$ docker pull docker/dtr:2.2.0-beta1 +$ docker pull {{ page.docker_image }} ``` If the node you're upgrading doesn't have access to the internet, you can @@ -36,7 +36,7 @@ Once you have the latest images on the node, run the upgrade command: ```none $ docker run -it --rm \ - docker/dtr:2.2.0-beta1 upgrade \ + {{ page.docker_image }} upgrade \ --ucp-insecure-tls ``` diff --git a/datacenter/ucp/2.1/guides/configure/backup-and-recover.md b/datacenter/ucp/2.1/guides/configure/backup-and-recover.md index 68d400cdc4..2b8b9473f1 100644 --- a/datacenter/ucp/2.1/guides/configure/backup-and-recover.md +++ b/datacenter/ucp/2.1/guides/configure/backup-and-recover.md @@ -40,7 +40,7 @@ The example below shows how to create a backup of a UCP controller node: # Create a backup, encrypt it, and store it on /tmp/backup.tar $ docker run --rm -i --name ucp \ -v /var/run/docker.sock:/var/run/docker.sock \ - docker/ucp backup --interactive \ + {{ page.docker_image }} backup --interactive \ --passphrase "secret" > /tmp/backup.tar # Decrypt the backup and list its contents @@ -55,7 +55,7 @@ backup: ```bash $ docker run --rm -i --name ucp \ -v /var/run/docker.sock:/var/run/docker.sock \ - docker/ucp restore < backup.tar + {{ page.docker_image }} restore < backup.tar ``` The restore command may also be invoked in interactive mode: @@ -64,7 +64,7 @@ The restore command may also be invoked in interactive mode: $ docker run --rm -i --name ucp \ -v /var/run/docker.sock:/var/run/docker.sock \ -v /path/to/backup.tar:/config/backup.tar \ - docker/ucp restore -i + {{ page.docker_image }} restore -i ``` ## Restore your cluster diff --git a/datacenter/ucp/2.1/guides/install/index.md b/datacenter/ucp/2.1/guides/install/index.md index ef40ba43a6..a054b18379 100644 --- a/datacenter/ucp/2.1/guides/install/index.md +++ b/datacenter/ucp/2.1/guides/install/index.md @@ -61,12 +61,12 @@ To install UCP: ```none # Pull the latest version of UCP - $ docker pull docker/ucp:2.1.0-beta1 + $ docker pull {{ page.docker_image }} # Install UCP $ docker run --rm -it --name ucp \ -v /var/run/docker.sock:/var/run/docker.sock \ - docker/ucp:2.1.0-beta1 install \ + {{ page.docker_image }} install \ --host-address \ --interactive ``` diff --git a/datacenter/ucp/2.1/guides/install/uninstall.md b/datacenter/ucp/2.1/guides/install/uninstall.md index a1ef1e2ce0..409aacd6c0 100644 --- a/datacenter/ucp/2.1/guides/install/uninstall.md +++ b/datacenter/ucp/2.1/guides/install/uninstall.md @@ -25,7 +25,7 @@ To uninstall UCP, log in into a manager node using ssh, and run: $ docker run --rm -it \ -v /var/run/docker.sock:/var/run/docker.sock \ --name ucp \ - docker/ucp uninstall-ucp --interactive + {{ page.docker_image }} uninstall-ucp --interactive ``` This runs the uninstall command in interactive mode, so that you are prompted diff --git a/datacenter/ucp/2.1/guides/install/upgrade.md b/datacenter/ucp/2.1/guides/install/upgrade.md index fdd11c0898..e189edebf1 100644 --- a/datacenter/ucp/2.1/guides/install/upgrade.md +++ b/datacenter/ucp/2.1/guides/install/upgrade.md @@ -54,12 +54,12 @@ To upgrade from the CLI, log into a UCP manager node using ssh, and run: ``` # Get the latest version of UCP -$ docker pull docker/ucp:2.1.0-beta1 +$ docker pull {{ page.docker_image }} $ docker run --rm -it \ --name ucp \ -v /var/run/docker.sock:/var/run/docker.sock \ - docker/ucp:2.1.0-beta1 \ + {{ page.docker_image }} \ upgrade --interactive ```