Skip to content

Commit 1b9fdcf

Browse files
kencochranemavenugo
kencochrane
authored and
mavenugo
committed
Added experimental flag to daemon.json file (docker-archive#448)
* Added experimental flag to daemon.json file Signed-off-by: Ken Cochrane <[email protected]> * updated AMI's and version
1 parent b631fa0 commit 1b9fdcf

File tree

2 files changed

+36
-38
lines changed

2 files changed

+36
-38
lines changed

‎aws/cloudformation/docker_for_aws.json

Lines changed: 18 additions & 19 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 Beta 10 (docker 1.12.3)",
4+
"Description": "Docker for AWS 1.13.0-rc1 (alpha11)",
55

66
"Parameters": {
77
"KeyName": {
@@ -71,8 +71,8 @@
7171

7272
"DockerForAWS" : {
7373
"version" : {
74-
"docker": "1.12.3",
75-
"forAws": "aws-v1.12.3-beta10"
74+
"docker": "1.13.0-rc1",
75+
"forAws": "aws-v1.13.0-rc1-alpha11"
7676
}
7777
},
7878

@@ -221,51 +221,50 @@
221221
},
222222
"AWSRegionArch2AMI": {
223223
"ap-northeast-1": {
224-
"HVM64": "ami-d3d271b2",
224+
"HVM64": "ami-d1b318b0",
225225
"HVMG2": "NOT_SUPPORTED"
226226
},
227227
"ap-northeast-2": {
228-
"HVM64": "ami-5e31e530",
228+
"HVM64": "ami-4f914621",
229229
"HVMG2": "NOT_SUPPORTED"
230230
},
231231
"ap-south-1": {
232-
"HVM64": "ami-d24b3fbd",
232+
"HVM64": "ami-19e79376",
233233
"HVMG2": "NOT_SUPPORTED"
234234
},
235235
"ap-southeast-1": {
236-
"HVM64": "ami-7a60c119",
236+
"HVM64": "ami-0e41e26d",
237237
"HVMG2": "NOT_SUPPORTED"
238238
},
239239
"ap-southeast-2": {
240-
"HVM64": "ami-869aa7e5",
240+
"HVM64": "ami-a2b986c1",
241241
"HVMG2": "NOT_SUPPORTED"
242242
},
243243
"eu-central-1": {
244-
"HVM64": "ami-922ed6fd",
244+
"HVM64": "ami-49995c26",
245245
"HVMG2": "NOT_SUPPORTED"
246246
},
247247
"eu-west-1": {
248-
"HVM64": "ami-6af5bd19",
248+
"HVM64": "ami-029ccc71",
249249
"HVMG2": "NOT_SUPPORTED"
250250
},
251251
"sa-east-1": {
252-
"HVM64": "ami-3cc35f50",
252+
"HVM64": "ami-d67ce3ba",
253253
"HVMG2": "NOT_SUPPORTED"
254254
},
255255
"us-east-1": {
256-
"HVM64": "ami-24ffa133",
256+
"HVM64": "ami-8ba48d9c",
257257
"HVMG2": "NOT_SUPPORTED"
258258
},
259259
"us-east-2": {
260-
"HVM64": "ami-d95a00bc",
260+
"HVM64": "ami-12782277",
261261
"HVMG2": "NOT_SUPPORTED"
262-
},
263-
"us-west-1": {
264-
"HVM64": "ami-9ab0fbfa",
262+
},"us-west-1": {
263+
"HVM64": "ami-6b91c40b",
265264
"HVMG2": "NOT_SUPPORTED"
266265
},
267266
"us-west-2": {
268-
"HVM64": "ami-6d22850d",
267+
"HVM64": "ami-7a5efc1a",
269268
"HVMG2": "NOT_SUPPORTED"
270269
}
271270
}
@@ -548,7 +547,7 @@
548547
"echo \"localhost: ", {"Ref": "ExternalLoadBalancer"}, "\" >> /var/lib/docker/swarm/elb.config\n",
549548
"echo \"default: ", {"Ref": "ExternalLoadBalancer"}, "\" >> /var/lib/docker/swarm/elb.config\n",
550549
"export DOCKER_FOR_IAAS_VERSION='", { "Fn::FindInMap" : [ "DockerForAWS", "version", "forAws" ] }, "'\n",
551-
"echo '{\"log-driver\": \"awslogs\",\"log-opts\": {\"awslogs-group\":\"",
550+
"echo '{\"experimental\": true, \"log-driver\": \"awslogs\",\"log-opts\": {\"awslogs-group\":\"",
552551
{ "Fn::Join": [ "-", [ { "Ref": "AWS::StackName"}, "lg" ] ] },
553552
"\" }}' > /etc/docker/daemon.json \n",
554553
"chown -R docker /home/docker/\n",
@@ -686,7 +685,7 @@
686685
"", [
687686
"#!/bin/sh\n",
688687
"export DOCKER_FOR_IAAS_VERSION='", { "Fn::FindInMap" : [ "DockerForAWS", "version", "forAws" ] }, "'\n",
689-
"echo '{\"log-driver\": \"awslogs\",\"log-opts\": {\"awslogs-group\":\"",
688+
"echo '{\"experimental\": true, \"log-driver\": \"awslogs\",\"log-opts\": {\"awslogs-group\":\"",
690689
{ "Fn::Join": [ "-", [ { "Ref": "AWS::StackName"}, "lg" ] ] },
691690
"\" }}' > /etc/docker/daemon.json \n",
692691
"chown -R docker /home/docker/\n",

‎aws/cloudformation/docker_for_aws_cloud.json

Lines changed: 18 additions & 19 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 Beta 10 (docker 1.12.3) Cloud",
4+
"Description": "Docker for AWS 1.13.0-rc1 (alpha11) Cloud",
55

66
"Parameters": {
77
"KeyName": {
@@ -95,8 +95,8 @@
9595

9696
"DockerForAWS" : {
9797
"version" : {
98-
"docker": "1.12.3",
99-
"forAws": "aws-v1.12.3-beta10"
98+
"docker": "1.13.0-rc1",
99+
"forAws": "aws-v1.13.0-rc1-alpha11"
100100
}
101101
},
102102

@@ -245,51 +245,50 @@
245245
},
246246
"AWSRegionArch2AMI": {
247247
"ap-northeast-1": {
248-
"HVM64": "ami-d3d271b2",
248+
"HVM64": "ami-d1b318b0",
249249
"HVMG2": "NOT_SUPPORTED"
250250
},
251251
"ap-northeast-2": {
252-
"HVM64": "ami-5e31e530",
252+
"HVM64": "ami-4f914621",
253253
"HVMG2": "NOT_SUPPORTED"
254254
},
255255
"ap-south-1": {
256-
"HVM64": "ami-d24b3fbd",
256+
"HVM64": "ami-19e79376",
257257
"HVMG2": "NOT_SUPPORTED"
258258
},
259259
"ap-southeast-1": {
260-
"HVM64": "ami-7a60c119",
260+
"HVM64": "ami-0e41e26d",
261261
"HVMG2": "NOT_SUPPORTED"
262262
},
263263
"ap-southeast-2": {
264-
"HVM64": "ami-869aa7e5",
264+
"HVM64": "ami-a2b986c1",
265265
"HVMG2": "NOT_SUPPORTED"
266266
},
267267
"eu-central-1": {
268-
"HVM64": "ami-922ed6fd",
268+
"HVM64": "ami-49995c26",
269269
"HVMG2": "NOT_SUPPORTED"
270270
},
271271
"eu-west-1": {
272-
"HVM64": "ami-6af5bd19",
272+
"HVM64": "ami-029ccc71",
273273
"HVMG2": "NOT_SUPPORTED"
274274
},
275275
"sa-east-1": {
276-
"HVM64": "ami-3cc35f50",
276+
"HVM64": "ami-d67ce3ba",
277277
"HVMG2": "NOT_SUPPORTED"
278278
},
279279
"us-east-1": {
280-
"HVM64": "ami-24ffa133",
280+
"HVM64": "ami-8ba48d9c",
281281
"HVMG2": "NOT_SUPPORTED"
282282
},
283283
"us-east-2": {
284-
"HVM64": "ami-d95a00bc",
284+
"HVM64": "ami-12782277",
285285
"HVMG2": "NOT_SUPPORTED"
286-
},
287-
"us-west-1": {
288-
"HVM64": "ami-9ab0fbfa",
286+
},"us-west-1": {
287+
"HVM64": "ami-6b91c40b",
289288
"HVMG2": "NOT_SUPPORTED"
290289
},
291290
"us-west-2": {
292-
"HVM64": "ami-6d22850d",
291+
"HVM64": "ami-7a5efc1a",
293292
"HVMG2": "NOT_SUPPORTED"
294293
}
295294
}
@@ -573,7 +572,7 @@
573572
"echo \"localhost: ", {"Ref": "ExternalLoadBalancer"}, "\" >> /var/lib/docker/swarm/elb.config\n",
574573
"echo \"default: ", {"Ref": "ExternalLoadBalancer"}, "\" >> /var/lib/docker/swarm/elb.config\n",
575574
"export DOCKER_FOR_IAAS_VERSION='", { "Fn::FindInMap" : [ "DockerForAWS", "version", "forAws" ] }, "'\n",
576-
"echo '{\"log-driver\": \"awslogs\",\"log-opts\": {\"awslogs-group\":\"",
575+
"echo '{\"experimental\": true, \"log-driver\": \"awslogs\",\"log-opts\": {\"awslogs-group\":\"",
577576
{ "Fn::Join": [ "-", [ { "Ref": "AWS::StackName"}, "lg" ] ] },
578577
"\" }}' > /etc/docker/daemon.json \n",
579578
"chown -R docker /home/docker/\n",
@@ -722,7 +721,7 @@
722721
"", [
723722
"#!/bin/sh\n",
724723
"export DOCKER_FOR_IAAS_VERSION='", { "Fn::FindInMap" : [ "DockerForAWS", "version", "forAws" ] }, "'\n",
725-
"echo '{\"log-driver\": \"awslogs\",\"log-opts\": {\"awslogs-group\":\"",
724+
"echo '{\"experimental\": true, \"log-driver\": \"awslogs\",\"log-opts\": {\"awslogs-group\":\"",
726725
{ "Fn::Join": [ "-", [ { "Ref": "AWS::StackName"}, "lg" ] ] },
727726
"\" }}' > /etc/docker/daemon.json \n",
728727
"chown -R docker /home/docker/\n",

0 commit comments

Comments
 (0)