Skip to content

Commit

Permalink
Fixed wording and added log details
Browse files Browse the repository at this point in the history
Signed-off-by: French Ben <frenchben@docker.com>
  • Loading branch information
French Ben committed Jan 18, 2017
1 parent ea6566d commit de10cf4
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 13 deletions.
4 changes: 4 additions & 0 deletions docker-for-aws/faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ All of Amazons regions have at least 2 AZ's, and some have more. To make sure Do
As part of the prerequisites, you need to have an SSH key uploaded to the AWS region you are trying to deploy to.
For more information about adding an SSH key pair to your account, please refer to the [Amazon EC2 Key Pairs docs](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html)

## Where are my container logs?

All container logs are aggregated within [AWS CloudWatch](https://aws.amazon.com/cloudwatch/).

## I have a problem/bug where do I report it?

Send an email to <docker-for-iaas@docker.com> or post to the [Docker for AWS](https://github.com/docker/for-aws) GitHub repositories.
Expand Down
9 changes: 5 additions & 4 deletions docker-for-aws/iam-permissions.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ keywords: aws iam permissions
title: Docker for AWS IAM permissions
---

Here is a list of IAM permissions that are required in order to use Docker for AWS.
The following IAM permissions are required to use Docker for AWS.

If you want to deploy Docker for AWS, your account will need to have these permission, or else the stack will not
deploy correctly. It is possible to create an IAM role with these permissions, and use that role when creating the
stack, and CloudFormation will use the role's permissions instead of your own. This feature is called [AWS CloudFormation Service Role](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-servicerole.html?icmpid=docs_cfn_console)
Before you deploy Docker for AWS, your account needs these permissions for the stack to deploy correctly.
If you create and use an IAM role with these permissions for creating the stack, CloudFormation will use the role's permissions instead of your own, using the AWS CloudFormation Service Role feature.

This feature is called [AWS CloudFormation Service Role](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-servicerole.html?icmpid=docs_cfn_console)
follow the link for more information.

```
Expand Down
2 changes: 1 addition & 1 deletion docker-for-aws/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ To fully automate installs, you can use the [AWS Cloudformation API](http://docs

Docker for AWS starts with a CloudFormation template that will create everything that you need from scratch. There are only a few prerequisites that are listed above.

It first starts off by creating a new VPC along with subnets and security groups. Once the networking is set up, it will create two Auto Scaling Groups, one for the managers and one for the workers, and set the desired capacity that was selected in the CloudFormation setup form. The managers will start up first and create a Swarm manager quorum using Raft. The workers will then start up and join the swarm one by one, until all of the workers are up and running. At this point you will have x number of managers and y number of workers in your swarm, that are ready to handle your application deployments. See the [deployment](deploy.md) docs for your next steps.
The CloudFormation template first creates a new VPC along with subnets and security groups. After the networking set-up completes, two Auto Scaling Groups are created, one for the managers and one for the workers, and the configured capacity setting is applied. Managers start first and create a quorum using Raft, then the workers start and join the swarm one at a time. At this point, the swarm is comprised of X number of managers and Y number of workers, and you can deploy your applications. See the [deployment](deploy.md) docs for your next steps.

If you increase the number of instances running in your worker Auto Scaling Group (via the AWS console, or updating the CloudFormation configuration), the new nodes that will start up will automatically join the swarm.

Expand Down
6 changes: 3 additions & 3 deletions docker-for-aws/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ keywords: aws, amazon, iaas, tutorial
title: Docker for AWS Upgrades
---

Upgrades are done by applying a new version of the AWS Cloudformation template that powers Docker for Azure. Depending on changes in the next version, an upgrade involves:
To upgrade, apply a new version of the AWS Cloudformation template that powers Docker for Azure. Depending on changes in the next version, an upgrade involves:

* Changing the AMI backing manager and worker nodes (the Docker engine ships in the AMI)
* Upgrading service containers
Expand All @@ -13,11 +13,11 @@ Upgrades are done by applying a new version of the AWS Cloudformation template t
## 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
* Upgrades are only supported from one version to the next version. Skipping a version during an upgrade is not supported. Downgrades are not tested.
* 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 also posted on the [Release Notes](release-notes.md) page.
New releases are announced on [Release Notes](release-notes.md) page.

To initiate an update, use either the AWS Console of the AWS cli to initiate a stack update. Use the S3 template URL for the new release and complete the update wizard. 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.

Expand Down
4 changes: 4 additions & 0 deletions docker-for-azure/faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ Not at this time, but it is on our roadmap for future releases.

Docker for Azure should work with all supported Azure Marketplace regions.

## Where are my container logs?

All container logs are aggregated within the `xxxxlog` storage account.

## I have a problem/bug where do I report it?

Send an email to <docker-for-iaas@docker.com> or post to the [Docker for Azure](https://github.com/docker/for-azure) GitHub repositories.
Expand Down
2 changes: 1 addition & 1 deletion docker-for-azure/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ This could have led to a potential man in the middle (MITM) attack. The ssh host
- 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
- All container logs can be found in the `xxxxlog` storage account
- Each Manager can be SSH'd into by following our deploy [guide](deploy.md)
- You can connect to each manager using SSH by following our deploy [guide](deploy.md)

## 1.12.2-beta9

Expand Down
8 changes: 4 additions & 4 deletions docker-for-azure/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ keywords: azure, microsoft, iaas, tutorial
title: Docker for Azure Upgrades
---

Docker for Azure supports upgrading from one version to the next. Upgrades are done by applying a new version of the Azure ARM template that powers Docker for Azure. An upgrade of Docker for Azure involves:
Docker for Azure supports upgrading from one version to the next. To upgrade, apply a new version of the Azure ARM template that powers Docker for Azure. An upgrade of Docker for Azure involves:

* Upgrading the VHD backing the manager and worker nodes (the Docker engine ships in the VHD)
* Upgrading service containers in the manager and worker nodes
Expand All @@ -14,12 +14,12 @@ Docker for Azure supports upgrading from one version to the next. Upgrades are d
## 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
* Upgrades are only supported from one version to the next version. Skipping a version during an upgrade is not supported. Downgrades are not tested.
* Please make sure there are no nodes in the swarm in "down" status. If there are such nodes in the swarm, please remove them from the swarm using docker node rm node-id
* You can only upgrade one version at a time. Skipping a version during an upgrade is not supported. Downgrades are not tested.
* Ensure there are no nodes in the swarm in "down" status. If there are such nodes in the swarm, please remove them from the swarm using `docker node rm node-id`

## Upgrading

New releases are also posted on the [Release Notes](release-notes.md) page.
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:

Expand Down

0 comments on commit de10cf4

Please sign in to comment.