Added visual help for service principal usage (#1186)

* Added visual help for service principal usage

Signed-off-by: French Ben <frenchben@docker.com>

* Added real link to the upgrade template

Signed-off-by: French Ben <frenchben@docker.com>
This commit is contained in:
French Ben 2017-01-20 11:57:32 -08:00 committed by John Mulhausen
parent 0535560955
commit 5ce2c38fd8
3 changed files with 3 additions and 1 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 KiB

View File

@ -61,6 +61,8 @@ If the script fails, it's typically because your Azure user account doesn't have
When setting up the ARM template, you will be prompted for the App ID (a UUID) and the app secret. If you specified the resource group name and location parameters, please choose the option to deploy the template into an existing resource group and pass the same name and region/location that were passed above to create-sp-azure.
<img src="img/service-principal.png" />
### SSH Key
Docker for Azure uses SSH for accessing the Docker swarm once it's deployed. During setup, you will be prompted for a SSH public key. If you don't have a SSH key, you can generate one with `puttygen` or `ssh-keygen`. You only need the public key component to set up Docker for Azure. Here's how to get the public key from a .pem file:

View File

@ -22,7 +22,7 @@ New releases are announced on the [Release Notes](release-notes.md) page.
To initiate an upgrade, SSH into a manager node and issue the following command:
upgrade.sh url_to_template.json
upgrade.sh https://download.docker.com/azure/stable/Docker.tmpl
This will initiate a rolling upgrade of the Docker swarm and service state will be maintained during and after the upgrade. Appropriately scaled services should not experience downtime during an upgrade. Note that single containers started (for example) with `docker run -d` are **not** preserved during an upgrade. This is because they are not Docker Swarm services but are known only to the individual Docker engines.