From ca4f132800056024b65503475e14ca9f52f00708 Mon Sep 17 00:00:00 2001 From: French Ben Date: Mon, 19 Dec 2016 15:07:55 -0800 Subject: [PATCH] Added latest docs from Editions AWS & Azure (#887) * Added Docker for AWS and Azure and moved navigation Signed-off-by: French Ben * Fixed image links Signed-off-by: French Ben --- docker-for-aws/faqs.md | 4 ++-- docker-for-aws/index.md | 1 + docker-for-aws/upgrade.md | 2 +- docker-for-azure/faqs.md | 4 ++-- docker-for-azure/index.md | 20 ++++++++++++-------- docker-for-azure/release-notes.md | 5 ++--- docker-for-azure/upgrade.md | 1 - 7 files changed, 20 insertions(+), 17 deletions(-) diff --git a/docker-for-aws/faqs.md b/docker-for-aws/faqs.md index 25f20cfcf8..d3e662bfb6 100644 --- a/docker-for-aws/faqs.md +++ b/docker-for-aws/faqs.md @@ -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. \ No newline at end of file +Note that access to Docker for AWS and Azure happens through a shell container that itself runs on Docker. diff --git a/docker-for-aws/index.md b/docker-for-aws/index.md index 152d6c1f19..6e1631e641 100644 --- a/docker-for-aws/index.md +++ b/docker-for-aws/index.md @@ -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 --parameters ParameterKey=KeyName,ParameterValue= ParameterKey=InstanceType,ParameterValue=t2.micro ParameterKey=ManagerInstanceType,ParameterValue=t2.micro ParameterKey=ClusterSize,ParameterValue=1 --capabilities CAPABILITY_IAM ``` diff --git a/docker-for-aws/upgrade.md b/docker-for-aws/upgrade.md index aa48893d8f..a372dbbd92 100644 --- a/docker-for-aws/upgrade.md +++ b/docker-for-aws/upgrade.md @@ -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. diff --git a/docker-for-azure/faqs.md b/docker-for-azure/faqs.md index 8bdac42324..8ff759a2bf 100644 --- a/docker-for-azure/faqs.md +++ b/docker-for-azure/faqs.md @@ -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. \ No newline at end of file +Note that access to Docker for AWS and Azure happens through a shell container that itself runs on Docker. diff --git a/docker-for-azure/index.md b/docker-for-azure/index.md index 7d46501ba2..f1adaba528 100644 --- a/docker-for-azure/index.md +++ b/docker-for-azure/index.md @@ -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: - AD App Secret: - AD Tenant ID: + +```bash +$ docker run -ti docker4x/create-sp-azure sp-name rg-name rg-region + +... +Your access credentials ============================= +AD App ID: +AD App Secret: +AD 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 ``` diff --git a/docker-for-azure/release-notes.md b/docker-for-azure/release-notes.md index 8c24cdd7f1..9890739776 100644 --- a/docker-for-azure/release-notes.md +++ b/docker-for-azure/release-notes.md @@ -7,7 +7,7 @@ title: Docker for Azure Release Notes ## 1.13.0-1 Release date: 1/18/2017 -![Docker for Azure](http://azuredeploy.net/deploybutton.png) +![Docker for Azure](http://azuredeploy.net/deploybutton.png) ### 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 diff --git a/docker-for-azure/upgrade.md b/docker-for-azure/upgrade.md index a6ed6af21a..1cb1c32433 100644 --- a/docker-for-azure/upgrade.md +++ b/docker-for-azure/upgrade.md @@ -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