docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added latest docs from Editions AWS & Azure (#887) 

* Added Docker for AWS and Azure and moved navigation

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

* Fixed image links

Signed-off-by: French Ben <frenchben@docker.com>
This commit is contained in:
French Ben 2016-12-19 15:07:55 -08:00 committed by Misty Stanley-Jones
parent 988d920d36
commit ca4f132800
7 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker-for-aws/index.md
View File

@ -82,6 +82,7 @@ Go to the [Release Notes](release-notes.md) page, and click on the "launch stack
You can also invoke the Docker for AWS CloudFormation template from the AWS CLI:
Here is an example of how to use the CLI. Make sure you populate all of the parameters and their values:
```bash
$ aws cloudformation create-stack --stack-name teststack --template-url <templateurl> --parameters ParameterKey=KeyName,ParameterValue=<keyname> ParameterKey=InstanceType,ParameterValue=t2.micro ParameterKey=ManagerInstanceType,ParameterValue=t2.micro ParameterKey=ClusterSize,ParameterValue=1 --capabilities CAPABILITY_IAM
```

10
docker-for-azure/index.md
View File

@ -38,8 +38,10 @@ To set up Docker for Azure, a [Service Principal](https://azure.microsoft.com/en
Ensure the latest version of `docker4x/create-sp-azure` has been downloaded to your local environment: `docker pull docker4x/create-sp-azure:latest`
Then run the sp-azure script with the following arguments:
```
docker run -ti docker4x/create-sp-azure sp-name rg-name rg-region
```bash
$ docker run -ti docker4x/create-sp-azure sp-name rg-name rg-region
...
Your access credentials =============================
AD App ID: <app-id>
@ -66,9 +68,11 @@ Docker for Azure uses SSH for accessing the Docker swarm once it's deployed. Dur
ssh-keygen -y -f my-key.pem
### Installing with the CLI
You can also invoke the Docker for Azure template from the Azure CLI:
Here is an example of how to use the CLI. Make sure you populate all of the parameters and their values:
```
```bash
$ azure group create --name DockerGroup --location centralus --deployment-name docker.template --template-file <templateurl>
```

3
docker-for-azure/release-notes.md
View File

@ -7,7 +7,7 @@ title: Docker for Azure Release Notes
## 1.13.0-1
Release date: 1/18/2017
<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fdownload.docker.com%2Fazure%2Fstable%2FDocker.tmpl" data-rel="Stable-1" target="_blank" id="azure-deploy">![Docker for Azure](http://azuredeploy.net/deploybutton.png)</a>
<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fdownload.docker.com%2Fazure%2Fstable%2FDocker.tmpl" data-rel="Stable-1" target="_blank" class="_" id="azure-deploy">![Docker for Azure](http://azuredeploy.net/deploybutton.png)</a>
### New
@ -28,7 +28,6 @@ Release date: 12/09/2016
- The Docker daemon no longer listens on port 2375
- Added a `swarm-exec` to execute a docker command across all of the swarm nodes. See [Executing Docker commands in all swarm nodes](deploy.md#execute-docker-commands-in-all-swarm-nodes) for more details.
## 1.12.3-beta10
Release date: 11/08/2016

1
docker-for-azure/upgrade.md
View File

@ -10,7 +10,6 @@ Docker for Azure supports upgrading from one version to the next. To upgrade, ap
* Upgrading service containers in the manager and worker nodes
* Changing any other resources in the Azure Resource Group that hosts Docker for Azure
## Prerequisites
* We recommend only attempting upgrades of swarms with at least 3 managers. A 1-manager swarm may not be able to maintain quorum during the upgrade