mirror of https://github.com/docker/docs.git
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:
parent
988d920d36
commit
ca4f132800
|
@ -87,6 +87,6 @@ By default when you SSH into a manager, you will be logged in as the regular use
|
|||
For example to ping one of the nodes, after finding its IP via the Azure/AWS portal (e.g. 10.0.0.4), you could run:
|
||||
```
|
||||
$ sudo ping 10.0.0.4
|
||||
```
|
||||
```
|
||||
|
||||
Note that access to Docker for AWS and Azure happens through a shell container that itself runs on Docker.
|
||||
Note that access to Docker for AWS and Azure happens through a shell container that itself runs on Docker.
|
||||
|
|
|
@ -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
|
||||
```
|
||||
|
|
|
@ -14,7 +14,7 @@ To upgrade, apply a new version of the AWS Cloudformation template that powers D
|
|||
|
||||
* 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
|
||||
* You can only upgrade one version at a time. Skipping a version during an upgrade is not supported. Downgrades are not tested.
|
||||
|
||||
|
||||
## Upgrading
|
||||
|
||||
New releases are announced on [Release Notes](release-notes.md) page.
|
||||
|
|
|
@ -47,6 +47,6 @@ By default when you SSH into a manager, you will be logged in as the regular use
|
|||
For example to ping one of the nodes, after finding its IP via the Azure/AWS portal (e.g. 10.0.0.4), you could run:
|
||||
```
|
||||
$ sudo ping 10.0.0.4
|
||||
```
|
||||
```
|
||||
|
||||
Note that access to Docker for AWS and Azure happens through a shell container that itself runs on Docker.
|
||||
Note that access to Docker for AWS and Azure happens through a shell container that itself runs on Docker.
|
||||
|
|
|
@ -38,13 +38,15 @@ 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
|
||||
...
|
||||
Your access credentials =============================
|
||||
AD App ID: <app-id>
|
||||
AD App Secret: <secret>
|
||||
AD Tenant ID: <tenant-id>
|
||||
|
||||
```bash
|
||||
$ docker run -ti docker4x/create-sp-azure sp-name rg-name rg-region
|
||||
|
||||
...
|
||||
Your access credentials =============================
|
||||
AD App ID: <app-id>
|
||||
AD App Secret: <secret>
|
||||
AD Tenant ID: <tenant-id>
|
||||
```
|
||||
|
||||
If you have multiple Azure subscriptions, make sure you're creating the Service Principal with subscription ID that you shared with Docker when signing up for the beta.
|
||||
|
@ -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>
|
||||
```
|
||||
|
|
|
@ -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"></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"></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
|
||||
|
@ -36,7 +35,7 @@ Release date: 11/08/2016
|
|||
### New
|
||||
|
||||
- Docker Engine upgraded to Docker 1.12.3
|
||||
- Fixed the shell container that runs on the managers, to remove a ssh host key that was accidentally added to the image.
|
||||
- Fixed the shell container that runs on the managers, to remove a ssh host key that was accidentally added to the image.
|
||||
This could have led to a potential man in the middle (MITM) attack. The ssh host key is now generated on host startup, so that each host has its own key.
|
||||
- The SSH ELB for SSH'ing into the managers has been removed because it is no longer possible to SSH into the managers without getting a security warning
|
||||
- Multiple managers can be deployed
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue