Skip to content

Commit f4456c7

Browse files
kencochranekencochrane
committed
Added AMI's for beta11, and fixed comments in PR
Signed-off-by: Ken Cochrane <[email protected]>
1 parent 869d4af commit f4456c7

File tree

3 files changed

+34
-32
lines changed

3 files changed

+34
-32
lines changed

‎aws/cloudformation/docker_for_aws.json

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"AWSTemplateFormatVersion": "2010-09-09",
33

4-
"Description": "Docker for AWS 1.13.0-rc1 (alpha11)",
4+
"Description": "Docker for AWS 1.13.0-rc1 (beta11)",
55

66
"Parameters": {
77
"KeyName": {
@@ -72,7 +72,7 @@
7272
"DockerForAWS" : {
7373
"version" : {
7474
"docker": "1.13.0-rc1",
75-
"forAws": "aws-v1.13.0-rc1-alpha11"
75+
"forAws": "aws-v1.13.0-rc1-beta11"
7676
}
7777
},
7878

@@ -221,50 +221,51 @@
221221
},
222222
"AWSRegionArch2AMI": {
223223
"ap-northeast-1": {
224-
"HVM64": "ami-d1b318b0",
224+
"HVM64": "ami-d162c8b0",
225225
"HVMG2": "NOT_SUPPORTED"
226226
},
227227
"ap-northeast-2": {
228-
"HVM64": "ami-4f914621",
228+
"HVM64": "ami-6cb46302",
229229
"HVMG2": "NOT_SUPPORTED"
230230
},
231231
"ap-south-1": {
232-
"HVM64": "ami-19e79376",
232+
"HVM64": "ami-35d9ad5a",
233233
"HVMG2": "NOT_SUPPORTED"
234234
},
235235
"ap-southeast-1": {
236-
"HVM64": "ami-0e41e26d",
236+
"HVM64": "ami-63e24000",
237237
"HVMG2": "NOT_SUPPORTED"
238238
},
239239
"ap-southeast-2": {
240-
"HVM64": "ami-a2b986c1",
240+
"HVM64": "ami-c86658ab",
241241
"HVMG2": "NOT_SUPPORTED"
242242
},
243243
"eu-central-1": {
244-
"HVM64": "ami-49995c26",
244+
"HVM64": "ami-5e09cc31",
245245
"HVMG2": "NOT_SUPPORTED"
246246
},
247247
"eu-west-1": {
248-
"HVM64": "ami-029ccc71",
248+
"HVM64": "ami-09d7847a",
249249
"HVMG2": "NOT_SUPPORTED"
250250
},
251251
"sa-east-1": {
252-
"HVM64": "ami-d67ce3ba",
252+
"HVM64": "ami-422fb02e",
253253
"HVMG2": "NOT_SUPPORTED"
254254
},
255255
"us-east-1": {
256-
"HVM64": "ami-8ba48d9c",
256+
"HVM64": "ami-70def467",
257257
"HVMG2": "NOT_SUPPORTED"
258258
},
259259
"us-east-2": {
260-
"HVM64": "ami-12782277",
260+
"HVM64": "ami-24742e41",
261261
"HVMG2": "NOT_SUPPORTED"
262-
},"us-west-1": {
263-
"HVM64": "ami-6b91c40b",
262+
},
263+
"us-west-1": {
264+
"HVM64": "ami-10c59070",
264265
"HVMG2": "NOT_SUPPORTED"
265266
},
266267
"us-west-2": {
267-
"HVM64": "ami-7a5efc1a",
268+
"HVM64": "ami-847cd1e4",
268269
"HVMG2": "NOT_SUPPORTED"
269270
}
270271
}

‎aws/cloudformation/docker_for_aws_cloud.json

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"AWSTemplateFormatVersion": "2010-09-09",
33

4-
"Description": "Docker for AWS 1.13.0-rc1 (alpha11) Cloud",
4+
"Description": "Docker for AWS 1.13.0-rc1 (beta11) Cloud",
55

66
"Parameters": {
77
"KeyName": {
@@ -96,7 +96,7 @@
9696
"DockerForAWS" : {
9797
"version" : {
9898
"docker": "1.13.0-rc1",
99-
"forAws": "aws-v1.13.0-rc1-alpha11"
99+
"forAws": "aws-v1.13.0-rc1-beta11"
100100
}
101101
},
102102

@@ -245,50 +245,51 @@
245245
},
246246
"AWSRegionArch2AMI": {
247247
"ap-northeast-1": {
248-
"HVM64": "ami-d1b318b0",
248+
"HVM64": "ami-d162c8b0",
249249
"HVMG2": "NOT_SUPPORTED"
250250
},
251251
"ap-northeast-2": {
252-
"HVM64": "ami-4f914621",
252+
"HVM64": "ami-6cb46302",
253253
"HVMG2": "NOT_SUPPORTED"
254254
},
255255
"ap-south-1": {
256-
"HVM64": "ami-19e79376",
256+
"HVM64": "ami-35d9ad5a",
257257
"HVMG2": "NOT_SUPPORTED"
258258
},
259259
"ap-southeast-1": {
260-
"HVM64": "ami-0e41e26d",
260+
"HVM64": "ami-63e24000",
261261
"HVMG2": "NOT_SUPPORTED"
262262
},
263263
"ap-southeast-2": {
264-
"HVM64": "ami-a2b986c1",
264+
"HVM64": "ami-c86658ab",
265265
"HVMG2": "NOT_SUPPORTED"
266266
},
267267
"eu-central-1": {
268-
"HVM64": "ami-49995c26",
268+
"HVM64": "ami-5e09cc31",
269269
"HVMG2": "NOT_SUPPORTED"
270270
},
271271
"eu-west-1": {
272-
"HVM64": "ami-029ccc71",
272+
"HVM64": "ami-09d7847a",
273273
"HVMG2": "NOT_SUPPORTED"
274274
},
275275
"sa-east-1": {
276-
"HVM64": "ami-d67ce3ba",
276+
"HVM64": "ami-422fb02e",
277277
"HVMG2": "NOT_SUPPORTED"
278278
},
279279
"us-east-1": {
280-
"HVM64": "ami-8ba48d9c",
280+
"HVM64": "ami-70def467",
281281
"HVMG2": "NOT_SUPPORTED"
282282
},
283283
"us-east-2": {
284-
"HVM64": "ami-12782277",
284+
"HVM64": "ami-24742e41",
285285
"HVMG2": "NOT_SUPPORTED"
286-
},"us-west-1": {
287-
"HVM64": "ami-6b91c40b",
286+
},
287+
"us-west-1": {
288+
"HVM64": "ami-10c59070",
288289
"HVMG2": "NOT_SUPPORTED"
289290
},
290291
"us-west-2": {
291-
"HVM64": "ami-7a5efc1a",
292+
"HVM64": "ami-847cd1e4",
292293
"HVMG2": "NOT_SUPPORTED"
293294
}
294295
}

‎docs/content/aws/release-notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ Release date: 11/17/2016
2626

2727
- Docker Engine upgraded to Docker 1.13.0-rc1
2828
- Changes to port 2375 access. For security reasons we locked down access to port 2375 in the following ways.
29+
- You can't connect to port 2375 on managers from workers (changed)
30+
- You can't connect to port 2375 on workers from other workers (changed)
2931
- You can't connect to port 2375 on managers and workers from the public internet (no change)
3032
- You can connect to port 2375 on workers from managers (no change)
3133
- You can connect to port 2375 on managers from other managers (no change)
32-
- You can't connect to port 2375 on managers from workers (new change)
33-
- You can't connect to port 2375 on workers from other workers (new change)
3434
- Added changes to the way we manage swarm tokens to make it more secure.
3535

3636
### Important

0 commit comments

Comments
 (0)