github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-04 08:26:42 +00:00
Code Issues Projects Releases Wiki Activity

cli: Unify environment variables for GCP run

Browse Source 
GCP defines some "standard" environment variables for project and
zone. Use them for 'moby run gcp'. Change the other environment
variables to follow the same pattern.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer
2017-04-15 12:36:46 -05:00
parent 6f2d7fe77d
commit b28f60b44d
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cmd/moby/gcp.go
View File

@@ -185,7 +185,8 @@ func (g GCPClient) CreateInstance(name, image, zone, machineType string, diskSiz
}
}
log.Infof("Creating instance %s from image %s", name, image)
log.Infof("Creating instance %s from image %s (type: %s in %s)", name, image, machineType, zone)
enabled := new(string)
*enabled = "1"

19
src/cmd/moby/run_gcp.go
View File

@@ -13,15 +13,16 @@ const (
defaultZone = "europe-west1-d"
defaultMachine = "g1-small"
defaultDiskSize = 1
zoneVar = "MOBY_GCP_ZONE"
machineVar = "MOBY_GCP_MACHINE"
keysVar = "MOBY_GCP_KEYS"
projectVar = "MOBY_GCP_PROJECT"
bucketVar = "MOBY_GCP_BUCKET"
familyVar = "MOBY_GCP_FAMILY"
publicVar = "MOBY_GCP_PUBLIC"
nameVar = "MOBY_GCP_IMAGE_NAME"
diskSizeVar = "MOBY_GCP_DISK_SIZE"
// Environment variables. Some are non-standard
zoneVar = "CLOUDSDK_COMPUTE_ZONE"
machineVar = "CLOUDSDK_COMPUTE_MACHINE" // non-standard
keysVar = "CLOUDSDK_COMPUTE_KEYS" // non-standard
projectVar = "CLOUDSDK_CORE_PROJECT"
bucketVar = "CLOUDSDK_IMAGE_BUCKET" // non-standard
familyVar = "CLOUDSDK_IMAGE_FAMILY" // non-standard
publicVar = "CLOUDSDK_IMAGE_PUBLIC" // non-standard
nameVar = "CLOUDSDK_IMAGE_NAME" // non-standard
diskSizeVar = "CLOUDSDK_DISK_SIZE" // non-standard
)
// Process the run arguments and execute run