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

digitalocean: enable specifying ssh user 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2015-08-11 07:01:52 -04:00
parent c1acb74d7a
commit 8299069a46
No known key found for this signature in database
GPG Key ID: A519480096146526
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/digitalocean/digitalocean.go
View File

@ -44,6 +44,12 @@ func GetCreateFlags() []cli.Flag {
Name: "digitalocean-access-token", Name: "digitalocean-access-token",
Usage: "Digital Ocean access token", Usage: "Digital Ocean access token",
}, },
cli.StringFlag{
EnvVar: "DIGITALOCEAN_SSH_USER",
Name: "digitalocean-ssh-user",
Usage: "Digital Ocean SSH username",
Value: "root",
},
cli.StringFlag{ cli.StringFlag{
EnvVar: "DIGITALOCEAN_IMAGE", EnvVar: "DIGITALOCEAN_IMAGE",
Name: "digitalocean-image", Name: "digitalocean-image",
@ -104,7 +110,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
d.SwarmMaster = flags.Bool("swarm-master") d.SwarmMaster = flags.Bool("swarm-master")
d.SwarmHost = flags.String("swarm-host") d.SwarmHost = flags.String("swarm-host")
d.SwarmDiscovery = flags.String("swarm-discovery") d.SwarmDiscovery = flags.String("swarm-discovery")
d.SSHUser = "root" d.SSHUser = flags.String("digitalocean-ssh-user")
d.SSHPort = 22 d.SSHPort = 22
if d.AccessToken == "" { if d.AccessToken == "" {