docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #110 from ehazlett/ec2-env-vars 

add env vars for amazonec2 driver
This commit is contained in:
Evan Hazlett 2014-12-22 13:03:22 -05:00
parent 62edc911fe 74328e113a
commit 5a070bd16a
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/amazonec2/amazonec2.go
View File

@ -70,51 +70,58 @@ func init() {
func GetCreateFlags() []cli.Flag {
return []cli.Flag{
cli.StringFlag{
Name: "amazonec2-access-key",
Usage: "AWS Access Key",
Value: "",
Name: "amazonec2-access-key",
Usage: "AWS Access Key",
Value: "",
EnvVar: "AWS_ACCESS_KEY_ID",
},
cli.StringFlag{
Name: "amazonec2-secret-key",
Usage: "AWS Secret Key",
Value: "",
Name: "amazonec2-secret-key",
Usage: "AWS Secret Key",
Value: "",
EnvVar: "AWS_SECRET_ACCESS_KEY",
},
cli.StringFlag{
Name: "amazonec2-ami",
Usage: "AWS machine image",
Value: defaultAMI,
Name: "amazonec2-ami",
Usage: "AWS machine image",
Value: defaultAMI,
EnvVar: "AWS_AMI",
},
cli.StringFlag{
Name: "amazonec2-region",
Usage: "AWS region",
Value: defaultRegion,
Name: "amazonec2-region",
Usage: "AWS region",
Value: defaultRegion,
EnvVar: "AWS_DEFAULT_REGION",
},
cli.StringFlag{
Name: "amazonec2-vpc-id",
Usage: "AWS VPC id",
Value: "",
EnvVar: "AMAZONEC2_VPC_ID",
EnvVar: "AWS_VPC_ID",
},
cli.StringFlag{
Name: "amazonec2-zone",
Usage: "AWS zone for instance (i.e. a,b,c,d,e)",
Value: "a",
EnvVar: "AMAZONEC2_ZONE",
EnvVar: "AWS_ZONE",
},
cli.StringFlag{
Name: "amazonec2-subnet-id",
Usage: "AWS VPC subnet id",
Value: "",
Name: "amazonec2-subnet-id",
Usage: "AWS VPC subnet id",
Value: "",
EnvVar: "AWS_SUBNET_ID",
},
cli.StringFlag{
Name: "amazonec2-instance-type",
Usage: "AWS instance type",
Value: defaultInstanceType,
Name: "amazonec2-instance-type",
Usage: "AWS instance type",
Value: defaultInstanceType,
EnvVar: "AWS_INSTANCE_TYPE",
},
cli.IntFlag{
Name: "amazonec2-root-size",
Usage: "AWS root disk size (in GB)",
Value: defaultRootSize,
Name: "amazonec2-root-size",
Usage: "AWS root disk size (in GB)",
Value: defaultRootSize,
EnvVar: "AWS_ROOT_SIZE",
},
}
}