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

Merge pull request #101 from ggiamarchi/fix-interactive-ssh 

Fix bug SSH interactive mode
This commit is contained in:
Ben Firshman 2014-12-15 17:52:53 +00:00
parent 477fffb1ba 6c5da2bc0e
commit e401c4464c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
commands.go
View File

@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"os" "os"
"os/exec"
"strings" "strings"
"sync" "sync"
"text/tabwriter" "text/tabwriter"
@ -373,7 +374,12 @@ var Commands = []cli.Command{
os.Exit(1) os.Exit(1)
} }
sshCmd, err := host.Driver.GetSSHCommand(c.String("command")) var sshCmd *exec.Cmd
if c.String("command") == "" {
sshCmd, err = host.Driver.GetSSHCommand()
} else {
sshCmd, err = host.Driver.GetSSHCommand(c.String("command"))
}
if err != nil { if err != nil {
log.Errorf("%s", err) log.Errorf("%s", err)
os.Exit(1) os.Exit(1)