github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Add support for setting different name on GCP

Browse Source 
Previously name and image were always the same so running two hosts
from one image was not possible!

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2018-06-06 16:22:20 -07:00
parent c9db3f0625
commit 42397f7f1d
No known key found for this signature in database
GPG Key ID: 609102888A2EE3F9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cmd/linuxkit/run_gcp.go
View File

@ -29,13 +29,14 @@ func runGcp(args []string) {
flags := flag.NewFlagSet("gcp", flag.ExitOnError) flags := flag.NewFlagSet("gcp", flag.ExitOnError)
invoked := filepath.Base(os.Args[0]) invoked := filepath.Base(os.Args[0])
flags.Usage = func() { flags.Usage = func() {
fmt.Printf("USAGE: %s run gcp [options] [name]\n\n", invoked) fmt.Printf("USAGE: %s run gcp [options] [image]\n\n", invoked)
fmt.Printf("'name' specifies either the name of an already uploaded\n") fmt.Printf("'image' specifies either the name of an already uploaded\n")
fmt.Printf("GCP image or the full path to a image file which will be\n") fmt.Printf("GCP image or the full path to a image file which will be\n")
fmt.Printf("uploaded before it is run.\n\n") fmt.Printf("uploaded before it is run.\n\n")
fmt.Printf("Options:\n\n") fmt.Printf("Options:\n\n")
flags.PrintDefaults() flags.PrintDefaults()
} }
name := flags.String("name", "", "Machine name")
zoneFlag := flags.String("zone", defaultZone, "GCP Zone") zoneFlag := flags.String("zone", defaultZone, "GCP Zone")
machineFlag := flags.String("machine", defaultMachine, "GCP Machine Type") machineFlag := flags.String("machine", defaultMachine, "GCP Machine Type")
keysFlag := flags.String("keys", "", "Path to Service Account JSON key file") keysFlag := flags.String("keys", "", "Path to Service Account JSON key file")
@ -63,7 +64,10 @@ func runGcp(args []string) {
flags.Usage() flags.Usage()
os.Exit(1) os.Exit(1)
} }
name := remArgs[0] image := remArgs[0]
if *name == "" {
*name = image
}
if *dataPath != "" { if *dataPath != "" {
dataB, err := ioutil.ReadFile(*dataPath) dataB, err := ioutil.ReadFile(*dataPath)
@ -83,16 +87,16 @@ func runGcp(args []string) {
log.Fatalf("Unable to connect to GCP") log.Fatalf("Unable to connect to GCP")
} }
if err = client.CreateInstance(name, name, zone, machine, disks, data, *nestedVirt, true); err != nil { if err = client.CreateInstance(*name, image, zone, machine, disks, data, *nestedVirt, true); err != nil {
log.Fatal(err) log.Fatal(err)
} }
if err = client.ConnectToInstanceSerialPort(name, zone); err != nil { if err = client.ConnectToInstanceSerialPort(*name, zone); err != nil {
log.Fatal(err) log.Fatal(err)
} }
if !*skipCleanup { if !*skipCleanup {
if err = client.DeleteInstance(name, zone, true); err != nil { if err = client.DeleteInstance(*name, zone, true); err != nil {
log.Fatal(err) log.Fatal(err)
} }
} }