Skip to content

Commit 14e01ee

Browse files
author
tfoxnc
committed
Revert "Merge pull request docker#7050 from docker/remove"
This reverts commit 5c7e147, reversing changes made to e6ccb68.
1 parent 5c7e147 commit 14e01ee

42 files changed

Lines changed: 2664 additions & 714 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎_data/toc.yaml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,54 @@ guides:
2424
section:
2525
- title: About Docker CE
2626
path: /install/
27+
- sectiontitle: Cloud
28+
section:
29+
- sectiontitle: Docker for AWS
30+
section:
31+
- path: /docker-for-aws/why/
32+
title: Why Docker for AWS?
33+
- path: /docker-for-aws/
34+
title: Setup & prerequisites
35+
- path: /docker-for-aws/iam-permissions/
36+
title: IAM permissions
37+
- path: /docker-for-aws/scaling/
38+
title: Scaling
39+
- path: /docker-for-aws/upgrade/
40+
title: Upgrading
41+
- path: /docker-for-aws/deploy/
42+
title: Deploy your app
43+
- path: /docker-for-aws/persistent-data-volumes/
44+
title: Persistent data volumes
45+
- path: /docker-for-aws/load-balancer/
46+
title: Load balancer
47+
- path: /docker-for-aws/faqs/
48+
title: FAQs
49+
- path: /docker-for-aws/opensource/
50+
title: Open source licensing
51+
- path: /docker-for-aws/release-notes/
52+
title: Release notes
53+
- path: /docker-for-aws/archive/
54+
title: Template archive
55+
- sectiontitle: Docker for Azure
56+
section:
57+
- path: /docker-for-azure/why/
58+
title: Why Docker for Azure?
59+
- path: /docker-for-azure/
60+
title: Setup & prerequisites
61+
- path: /docker-for-azure/upgrade/
62+
title: Upgrading
63+
- path: /docker-for-azure/deploy/
64+
title: Deploy your app
65+
- path: /docker-for-azure/persistent-data-volumes/
66+
title: Persistent data volumes
67+
- path: /docker-for-azure/faqs/
68+
title: FAQs
69+
- path: /docker-for-azure/opensource/
70+
title: Open source licensing
71+
- path: /docker-for-azure/release-notes/
72+
title: Release notes
73+
- path: /docker-for-azure/archive/
74+
title: Template archive
2775
- sectiontitle: Linux
2876
section:
2977
- path: /install/linux/docker-ce/centos/
@@ -3577,6 +3625,12 @@ manuals:
35773625
- path: /docker-cloud/release-notes/
35783626
title: Docker Cloud
35793627
nosync: true
3628+
- path: /docker-for-aws/release-notes/
3629+
title: Docker for AWS
3630+
nosync: true
3631+
- path: /docker-for-azure/release-notes/
3632+
title: Docker for Azure
3633+
nosync: true
35803634
- path: /release-notes/docker-machine/
35813635
title: Docker Machine release notes
35823636
nosync: true

‎develop/dev-best-practices.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ keep image size small:
101101
pulled automatically.
102102
103103
There are limitations around sharing data amongst nodes of a swarm service.
104-
If you are running Docker EE on AWS or Azure, you can use the
104+
If you use [Docker for AWS](/docker-for-aws/persistent-data-volumes.md) or
105+
[Docker for Azure](docker-for-azure/persistent-data-volumes.md), you can use the
105106
Cloudstor plugin to share data amongst your swarm service nodes. You can also
106107
write your application data into a separate database which supports simultaneous
107108
updates.

‎docker-cloud/cloud-swarm/create-cloud-swarm-aws.md‎

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -54,44 +54,7 @@ provider.
5454

5555
![](images/aws-create-swarm-3-region.png)
5656

57-
### Recommended VPC and subnet setup
58-
59-
#### VPC
60-
61-
* **CIDR:** 172.31.0.0/16
62-
* **DNS hostnames:** yes
63-
* **DNS resolution:** yes
64-
* **DHCP option set:** DHCP Options (Below)
65-
66-
#### Internet gateway
67-
* **VPC:** VPC (above)
68-
69-
#### DHCP option set
70-
71-
* **domain-name:** ec2.internal
72-
* **domain-name-servers:** AmazonProvidedDNS
73-
74-
#### Subnet1
75-
* **CIDR:** 172.31.16.0/20
76-
* **Auto-assign public IP:** yes
77-
* **Availability-Zone:** A
78-
79-
#### Subnet2
80-
* **CIDR:** 172.31.32.0/20
81-
* **Auto-assign public IP:** yes
82-
* **Availability-Zone:** B
83-
84-
#### Subnet3
85-
* **CIDR:** 172.31.0.0/20
86-
* **Auto-assign public IP:** yes
87-
* **Availability-Zone:** C
88-
89-
#### Route table
90-
* **Destination CIDR block:** 0.0.0.0/0
91-
* **Subnets:** Subnet1, Subnet2, Subnet3
92-
93-
##### Subnet note:
94-
If you are using the `10.0.0.0/16` CIDR in your VPC. When you create a docker network, you need to pick a subnet (using `docker network create —subnet` option) that doesn't conflict with the `10.0.0.0` network.
57+
For guidance on setting up a VPC, see [Recommended VPC and subnet setup](/docker-for-aws/faqs/#can-i-use-my-existing-vpc) in the Docker for AWS topics.
9558

9659
6. Choose how many swarm managers and swarm worker nodes to deploy.
9760

@@ -113,20 +76,21 @@ provider.
11376

11477
* Enable or disable Cloudwatch for container logging.
11578

116-
When enabled, Docker sends container logs to [Amazon Cloudwatch](https://aws.amazon.com/cloudwatch/).
79+
When enabled, Docker sends container logs to [Amazon Cloudwatch](https://aws.amazon.com/cloudwatch/), as described in the Docker for AWS topic on [Logging](/docker-for-aws/index.md#logging).
11780

11881
7. Select the instance sizes for the managers, and for the workers.
11982

12083
![](images/aws-create-swarm-6-manager-worker.png)
12184

122-
In general, the larger your swarm, the larger the instance sizes you should use.
85+
In general, the larger your swarm, the larger the instance sizes you should use. See the Docker for AWS topics for more on [resource configuration](/docker-for-aws/index.md#configuration).
12386

12487
9. Click **Create**.
12588

12689
Docker for AWS bootstraps all of the recommended infrastructure to
12790
start using Docker on AWS automatically. You don't need to worry
12891
about rolling your own instances, security groups, or load balancers
129-
when using Docker for AWS.
92+
when using Docker for AWS. (To learn more, see
93+
[Why Docker for AWS](/docker-for-aws/why.md).)
13094

13195
This takes a few minutes. When the swarm is ready, its indicator on the Swarms page shows steady green.
13296

‎docker-cloud/cloud-swarm/create-cloud-swarm-azure.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ Subscription you want to use.
8686
![](images/azure-create-swarm-6-manager-worker.png)
8787

8888
The larger your swarm, the larger the machine size you should use.
89-
To learn more about resource setup.
89+
To learn more about resource setup, see [configuration options](/docker-for-azure/index.md#configuration) in the Docker
90+
for Azure topics.
9091

9192
You can find Microsoft Azure Linux Virtual Machine pricing and options [here](https://azure.microsoft.com/en-us/pricing/details/virtual-machines/linux/).
9293

@@ -95,7 +96,7 @@ Subscription you want to use.
9596
Docker for Azure bootstraps all of the recommended infrastructure to start
9697
using Docker on Azure automatically. You don’t need to worry about rolling
9798
your own instances, security groups, or load balancers when using Docker for
98-
Azure.
99+
Azure. (To learn more, see [Why Docker for Azure](/docker-for-azure/why.md).)
99100

100101
This takes a few minutes. When the swarm is ready, its indicator on the Swarms page shows steady green.
101102

0 commit comments

Comments
 (0)