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

Merge pull request #6204 from crosbymichael/no-structs 

Remove the API container struct and use env
This commit is contained in:
Victor Vieux 2014-06-04 16:40:20 -07:00
parent 048833c246 91757eaeb3
commit aa05170a82
3 changed files with 73 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
api/client/commands.go
View File

@ -562,10 +562,14 @@ func (cli *DockerCli) forwardAllSignals(cid string) chan os.Signal {
func (cli *DockerCli) CmdStart(args ...string) error { func (cli *DockerCli) CmdStart(args ...string) error {
var ( var (
cErr chan error
tty bool
cmd = cli.Subcmd("start", "CONTAINER [CONTAINER...]", "Restart a stopped container") cmd = cli.Subcmd("start", "CONTAINER [CONTAINER...]", "Restart a stopped container")
attach = cmd.Bool([]string{"a", "-attach"}, false, "Attach container's stdout/stderr and forward all signals to the process") attach = cmd.Bool([]string{"a", "-attach"}, false, "Attach container's stdout/stderr and forward all signals to the process")
openStdin = cmd.Bool([]string{"i", "-interactive"}, false, "Attach container's stdin") openStdin = cmd.Bool([]string{"i", "-interactive"}, false, "Attach container's stdin")
) )
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {
return nil return nil
} }
@ -574,29 +578,24 @@ func (cli *DockerCli) CmdStart(args ...string) error {
return nil return nil
} }
var (
cErr chan error
tty bool
)
if *attach || *openStdin { if *attach || *openStdin {
if cmd.NArg() > 1 { if cmd.NArg() > 1 {
return fmt.Errorf("You cannot start and attach multiple containers at once.") return fmt.Errorf("You cannot start and attach multiple containers at once.")
} }
body, _, err := readBody(cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil, false)) steam, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil, false)
if err != nil { if err != nil {
return err return err
} }
container := &api.Container{} env := engine.Env{}
err = json.Unmarshal(body, container) if err := env.Decode(steam); err != nil {
if err != nil {
return err return err
} }
config := env.GetSubEnv("Config")
tty = config.GetBool("Tty")
tty = container.Config.Tty if !tty {
if !container.Config.Tty {
sigc := cli.forwardAllSignals(cmd.Arg(0)) sigc := cli.forwardAllSignals(cmd.Arg(0))
defer signal.StopCatch(sigc) defer signal.StopCatch(sigc)
} }
@ -605,15 +604,17 @@ func (cli *DockerCli) CmdStart(args ...string) error {
v := url.Values{} v := url.Values{}
v.Set("stream", "1") v.Set("stream", "1")
if *openStdin && container.Config.OpenStdin {
if *openStdin && config.GetBool("OpenStdin") {
v.Set("stdin", "1") v.Set("stdin", "1")
in = cli.in in = cli.in
} }
v.Set("stdout", "1") v.Set("stdout", "1")
v.Set("stderr", "1") v.Set("stderr", "1")
cErr = utils.Go(func() error { cErr = utils.Go(func() error {
return cli.hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?"+v.Encode(), container.Config.Tty, in, cli.out, cli.err, nil) return cli.hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?"+v.Encode(), tty, in, cli.out, cli.err, nil)
}) })
} }
@ -822,34 +823,38 @@ func (cli *DockerCli) CmdPort(args ...string) error {
} }
var ( var (
port = cmd.Arg(1) port = cmd.Arg(1)
proto = "tcp" proto = "tcp"
parts = strings.SplitN(port, "/", 2) parts = strings.SplitN(port, "/", 2)
container api.Container
) )
if len(parts) == 2 && len(parts[1]) != 0 { if len(parts) == 2 && len(parts[1]) != 0 {
port = parts[0] port = parts[0]
proto = parts[1] proto = parts[1]
} }
body, _, err := readBody(cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil, false))
steam, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil, false)
if err != nil { if err != nil {
return err return err
} }
err = json.Unmarshal(body, &container) env := engine.Env{}
if err != nil { if err := env.Decode(steam); err != nil {
return err
}
ports := nat.PortMap{}
if err := env.GetSubEnv("NetworkSettings").GetJson("Ports", &ports); err != nil {
return err return err
} }
if frontends, exists := container.NetworkSettings.Ports[nat.Port(port+"/"+proto)]; exists && frontends != nil { if frontends, exists := ports[nat.Port(port+"/"+proto)]; exists && frontends != nil {
for _, frontend := range frontends { for _, frontend := range frontends {
fmt.Fprintf(cli.out, "%s:%s\n", frontend.HostIp, frontend.HostPort) fmt.Fprintf(cli.out, "%s:%s\n", frontend.HostIp, frontend.HostPort)
} }
} else { return nil
return fmt.Errorf("Error: No public port '%s' published for %s", cmd.Arg(1), cmd.Arg(0))
} }
return nil
return fmt.Errorf("Error: No public port '%s' published for %s", cmd.Arg(1), cmd.Arg(0))
} }
// 'docker rmi IMAGE' removes all images with the name IMAGE // 'docker rmi IMAGE' removes all images with the name IMAGE
@ -1667,72 +1672,84 @@ func (cli *DockerCli) CmdDiff(args ...string) error {
} }
func (cli *DockerCli) CmdLogs(args ...string) error { func (cli *DockerCli) CmdLogs(args ...string) error {
cmd := cli.Subcmd("logs", "CONTAINER", "Fetch the logs of a container") var (
follow := cmd.Bool([]string{"f", "-follow"}, false, "Follow log output") cmd = cli.Subcmd("logs", "CONTAINER", "Fetch the logs of a container")
times := cmd.Bool([]string{"t", "-timestamps"}, false, "Show timestamps") follow = cmd.Bool([]string{"f", "-follow"}, false, "Follow log output")
times = cmd.Bool([]string{"t", "-timestamps"}, false, "Show timestamps")
)
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {
return nil return nil
} }
if cmd.NArg() != 1 { if cmd.NArg() != 1 {
cmd.Usage() cmd.Usage()
return nil return nil
} }
name := cmd.Arg(0) name := cmd.Arg(0)
body, _, err := readBody(cli.call("GET", "/containers/"+name+"/json", nil, false))
steam, _, err := cli.call("GET", "/containers/"+name+"/json", nil, false)
if err != nil { if err != nil {
return err return err
} }
container := &api.Container{} env := engine.Env{}
err = json.Unmarshal(body, container) if err := env.Decode(steam); err != nil {
if err != nil {
return err return err
} }
v := url.Values{} v := url.Values{}
v.Set("stdout", "1") v.Set("stdout", "1")
v.Set("stderr", "1") v.Set("stderr", "1")
if *times { if *times {
v.Set("timestamps", "1") v.Set("timestamps", "1")
} }
if *follow && container.State.Running {
if *follow {
v.Set("follow", "1") v.Set("follow", "1")
} }
if err := cli.streamHelper("GET", "/containers/"+name+"/logs?"+v.Encode(), container.Config.Tty, nil, cli.out, cli.err, nil); err != nil { return cli.streamHelper("GET", "/containers/"+name+"/logs?"+v.Encode(), env.GetSubEnv("Config").GetBool("Tty"), nil, cli.out, cli.err, nil)
return err
}
return nil
} }
func (cli *DockerCli) CmdAttach(args ...string) error { func (cli *DockerCli) CmdAttach(args ...string) error {
cmd := cli.Subcmd("attach", "[OPTIONS] CONTAINER", "Attach to a running container") var (
noStdin := cmd.Bool([]string{"#nostdin", "-no-stdin"}, false, "Do not attach stdin") cmd = cli.Subcmd("attach", "[OPTIONS] CONTAINER", "Attach to a running container")
proxy := cmd.Bool([]string{"#sig-proxy", "-sig-proxy"}, true, "Proxify all received signal to the process (even in non-tty mode)") noStdin = cmd.Bool([]string{"#nostdin", "-no-stdin"}, false, "Do not attach stdin")
proxy = cmd.Bool([]string{"#sig-proxy", "-sig-proxy"}, true, "Proxify all received signal to the process (even in non-tty mode)")
)
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {
return nil return nil
} }
if cmd.NArg() != 1 { if cmd.NArg() != 1 {
cmd.Usage() cmd.Usage()
return nil return nil
} }
name := cmd.Arg(0) name := cmd.Arg(0)
body, _, err := readBody(cli.call("GET", "/containers/"+name+"/json", nil, false))
stream, _, err := cli.call("GET", "/containers/"+name+"/json", nil, false)
if err != nil { if err != nil {
return err return err
} }
container := &api.Container{} env := engine.Env{}
err = json.Unmarshal(body, container) if err := env.Decode(stream); err != nil {
if err != nil {
return err return err
} }
if !container.State.Running { if !env.GetSubEnv("State").GetBool("Running") {
return fmt.Errorf("You cannot attach to a stopped container, start it first") return fmt.Errorf("You cannot attach to a stopped container, start it first")
} }
if container.Config.Tty && cli.isTerminal { var (
config = env.GetSubEnv("Config")
tty = config.GetBool("Tty")
)
if tty && cli.isTerminal {
if err := cli.monitorTtySize(cmd.Arg(0)); err != nil { if err := cli.monitorTtySize(cmd.Arg(0)); err != nil {
utils.Debugf("Error monitoring TTY size: %s", err) utils.Debugf("Error monitoring TTY size: %s", err)
} }
@ -1742,19 +1759,20 @@ func (cli *DockerCli) CmdAttach(args ...string) error {
v := url.Values{} v := url.Values{}
v.Set("stream", "1") v.Set("stream", "1")
if !*noStdin && container.Config.OpenStdin { if !*noStdin && config.GetBool("OpenStdin") {
v.Set("stdin", "1") v.Set("stdin", "1")
in = cli.in in = cli.in
} }
v.Set("stdout", "1") v.Set("stdout", "1")
v.Set("stderr", "1") v.Set("stderr", "1")
if *proxy && !container.Config.Tty { if *proxy && !tty {
sigc := cli.forwardAllSignals(cmd.Arg(0)) sigc := cli.forwardAllSignals(cmd.Arg(0))
defer signal.StopCatch(sigc) defer signal.StopCatch(sigc)
} }
if err := cli.hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?"+v.Encode(), container.Config.Tty, in, cli.out, cli.err, nil); err != nil { if err := cli.hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?"+v.Encode(), tty, in, cli.out, cli.err, nil); err != nil {
return err return err
} }

11
api/client/utils.go
View File

@ -200,7 +200,7 @@ func waitForExit(cli *DockerCli, containerId string) (int, error) {
// getExitCode perform an inspect on the container. It returns // getExitCode perform an inspect on the container. It returns
// the running state and the exit code. // the running state and the exit code.
func getExitCode(cli *DockerCli, containerId string) (bool, int, error) { func getExitCode(cli *DockerCli, containerId string) (bool, int, error) {
body, _, err := readBody(cli.call("GET", "/containers/"+containerId+"/json", nil, false)) steam, _, err := cli.call("GET", "/containers/"+containerId+"/json", nil, false)
if err != nil { if err != nil {
// If we can't connect, then the daemon probably died. // If we can't connect, then the daemon probably died.
if err != ErrConnectionRefused { if err != ErrConnectionRefused {
@ -208,11 +208,14 @@ func getExitCode(cli *DockerCli, containerId string) (bool, int, error) {
} }
return false, -1, nil return false, -1, nil
} }
c := &api.Container{}
if err := json.Unmarshal(body, c); err != nil { var result engine.Env
if err := result.Decode(steam); err != nil {
return false, -1, err return false, -1, err
} }
return c.State.Running, c.State.ExitCode, nil
state := result.GetSubEnv("State")
return state.GetBool("Running"), state.GetInt("ExitCode"), nil
} }
func (cli *DockerCli) monitorTtySize(id string) error { func (cli *DockerCli) monitorTtySize(id string) error {

18
api/container.go
View File

@ -1,18 +0,0 @@
package api
import (
"github.com/dotcloud/docker/nat"
"github.com/dotcloud/docker/runconfig"
)
type Container struct {
Config runconfig.Config
HostConfig runconfig.HostConfig
State struct {
Running bool
ExitCode int
}
NetworkSettings struct {
Ports nat.PortMap
}
}