Fixed a bug with 'docker run'
This commit is contained in:
parent
5a3fe231a2
commit
bba4e36807
|
@ -597,10 +597,10 @@ func (srv *Server) CmdRun(stdin io.ReadCloser, stdout io.Writer, args ...string)
|
||||||
if err := flags.Parse(args); err != nil {
|
if err := flags.Parse(args); err != nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
name := flag.Arg(0)
|
name := flags.Arg(0)
|
||||||
var cmd[]string
|
var cmd[]string
|
||||||
if len(flag.Args()) >= 2 {
|
if len(flags.Args()) >= 2 {
|
||||||
cmd = flag.Args()[1:]
|
cmd = flags.Args()[1:]
|
||||||
}
|
}
|
||||||
// Choose a default image if needed
|
// Choose a default image if needed
|
||||||
if name == "" {
|
if name == "" {
|
||||||
|
@ -609,8 +609,9 @@ func (srv *Server) CmdRun(stdin io.ReadCloser, stdout io.Writer, args ...string)
|
||||||
// Choose a default command if needed
|
// Choose a default command if needed
|
||||||
if len(cmd) == 0 {
|
if len(cmd) == 0 {
|
||||||
*fl_stdin = true
|
*fl_stdin = true
|
||||||
*fl_tty = false
|
*fl_tty = true
|
||||||
cmd = []string{"/bin/sh"}
|
*fl_attach = true
|
||||||
|
cmd = []string{"/bin/bash", "-i"}
|
||||||
}
|
}
|
||||||
// Find the image
|
// Find the image
|
||||||
img := srv.images.Find(name)
|
img := srv.images.Find(name)
|
||||||
|
|
Loading…
Reference in New Issue