mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #592 from dotcloud/refactor_commands_object-feature
* Runtime: refactor commands.go into an object, will be easier for tests
This commit is contained in:
Guillaume J. Charmes
commit
acf1d5bf0e
1 changed files with 100 additions and 109 deletions
209
commands.go
209
commands.go
|
|
@ -16,6 +16,7 @@ import (
|
|||
"net/url"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"reflect"
|
||||
"strconv"
|
||||
"strings"
|
||||
"text/tabwriter"
|
||||
|
|
@ -30,50 +31,28 @@ var (
|
|||
)
|
||||
|
||||
func ParseCommands(args ...string) error {
|
||||
|
||||
cmds := map[string]func(args ...string) error{
|
||||
"attach": CmdAttach,
|
||||
"build": CmdBuild,
|
||||
"commit": CmdCommit,
|
||||
"diff": CmdDiff,
|
||||
"export": CmdExport,
|
||||
"images": CmdImages,
|
||||
"info": CmdInfo,
|
||||
"insert": CmdInsert,
|
||||
"inspect": CmdInspect,
|
||||
"import": CmdImport,
|
||||
"history": CmdHistory,
|
||||
"kill": CmdKill,
|
||||
"login": CmdLogin,
|
||||
"logs": CmdLogs,
|
||||
"port": CmdPort,
|
||||
"ps": CmdPs,
|
||||
"pull": CmdPull,
|
||||
"push": CmdPush,
|
||||
"restart": CmdRestart,
|
||||
"rm": CmdRm,
|
||||
"rmi": CmdRmi,
|
||||
"run": CmdRun,
|
||||
"tag": CmdTag,
|
||||
"search": CmdSearch,
|
||||
"start": CmdStart,
|
||||
"stop": CmdStop,
|
||||
"version": CmdVersion,
|
||||
"wait": CmdWait,
|
||||
}
|
||||
cli := NewDockerCli("0.0.0.0", 4243)
|
||||
|
||||
if len(args) > 0 {
|
||||
cmd, exists := cmds[args[0]]
|
||||
methodName := "Cmd" + strings.ToUpper(args[0][:1]) + strings.ToLower(args[0][1:])
|
||||
method, exists := reflect.TypeOf(cli).MethodByName(methodName)
|
||||
if !exists {
|
||||
fmt.Println("Error: Command not found:", args[0])
|
||||
return cmdHelp(args...)
|
||||
return cli.CmdHelp(args...)
|
||||
}
|
||||
return cmd(args[1:]...)
|
||||
ret := method.Func.CallSlice([]reflect.Value{
|
||||
reflect.ValueOf(cli),
|
||||
reflect.ValueOf(args[1:]),
|
||||
})[0].Interface()
|
||||
if ret == nil {
|
||||
return nil
|
||||
}
|
||||
return cmdHelp(args...)
|
||||
return ret.(error)
|
||||
}
|
||||
return cli.CmdHelp(args...)
|
||||
}
|
||||
|
||||
func cmdHelp(args ...string) error {
|
||||
func (cli *DockerCli) CmdHelp(args ...string) error {
|
||||
help := "Usage: docker COMMAND [arg...]\n\nA self-sufficient runtime for linux containers.\n\nCommands:\n"
|
||||
for _, cmd := range [][]string{
|
||||
{"attach", "Attach to a running container"},
|
||||
|
|
@ -111,7 +90,7 @@ func cmdHelp(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func CmdInsert(args ...string) error {
|
||||
func (cli *DockerCli) CmdInsert(args ...string) error {
|
||||
cmd := Subcmd("insert", "IMAGE URL PATH", "Insert a file from URL in the IMAGE at PATH")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
return nil
|
||||
|
|
@ -125,20 +104,20 @@ func CmdInsert(args ...string) error {
|
|||
v.Set("url", cmd.Arg(1))
|
||||
v.Set("path", cmd.Arg(2))
|
||||
|
||||
err := hijack("POST", "/images/"+cmd.Arg(0)+"?"+v.Encode(), false)
|
||||
err := cli.hijack("POST", "/images/"+cmd.Arg(0)+"?"+v.Encode(), false)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func CmdBuild(args ...string) error {
|
||||
func (cli *DockerCli) CmdBuild(args ...string) error {
|
||||
cmd := Subcmd("build", "-", "Build an image from Dockerfile via stdin")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
err := hijack("POST", "/build", false)
|
||||
err := cli.hijack("POST", "/build", false)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -146,7 +125,7 @@ func CmdBuild(args ...string) error {
|
|||
}
|
||||
|
||||
// 'docker login': login / register a user to registry service.
|
||||
func CmdLogin(args ...string) error {
|
||||
func (cli *DockerCli) CmdLogin(args ...string) error {
|
||||
var readStringOnRawTerminal = func(stdin io.Reader, stdout io.Writer, echo bool) string {
|
||||
char := make([]byte, 1)
|
||||
buffer := make([]byte, 64)
|
||||
|
|
@ -201,7 +180,7 @@ func CmdLogin(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
body, _, err := call("GET", "/auth", nil)
|
||||
body, _, err := cli.call("GET", "/auth", nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -242,7 +221,7 @@ func CmdLogin(args ...string) error {
|
|||
out.Password = password
|
||||
out.Email = email
|
||||
|
||||
body, _, err = call("POST", "/auth", out)
|
||||
body, _, err = cli.call("POST", "/auth", out)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -260,7 +239,7 @@ func CmdLogin(args ...string) error {
|
|||
}
|
||||
|
||||
// 'docker wait': block until a container stops
|
||||
func CmdWait(args ...string) error {
|
||||
func (cli *DockerCli) CmdWait(args ...string) error {
|
||||
cmd := Subcmd("wait", "CONTAINER [CONTAINER...]", "Block until a container stops, then print its exit code.")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
return nil
|
||||
|
|
@ -270,7 +249,7 @@ func CmdWait(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
for _, name := range cmd.Args() {
|
||||
body, _, err := call("POST", "/containers/"+name+"/wait", nil)
|
||||
body, _, err := cli.call("POST", "/containers/"+name+"/wait", nil)
|
||||
if err != nil {
|
||||
fmt.Printf("%s", err)
|
||||
} else {
|
||||
|
|
@ -286,17 +265,20 @@ func CmdWait(args ...string) error {
|
|||
}
|
||||
|
||||
// 'docker version': show version information
|
||||
func CmdVersion(args ...string) error {
|
||||
func (cli *DockerCli) CmdVersion(args ...string) error {
|
||||
cmd := Subcmd("version", "", "Show the docker version information.")
|
||||
fmt.Println(len(args))
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
fmt.Println(cmd.NArg())
|
||||
if cmd.NArg() > 0 {
|
||||
cmd.Usage()
|
||||
return nil
|
||||
}
|
||||
|
||||
body, _, err := call("GET", "/version", nil)
|
||||
body, _, err := cli.call("GET", "/version", nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -320,7 +302,7 @@ func CmdVersion(args ...string) error {
|
|||
}
|
||||
|
||||
// 'docker info': display system-wide information.
|
||||
func CmdInfo(args ...string) error {
|
||||
func (cli *DockerCli) CmdInfo(args ...string) error {
|
||||
cmd := Subcmd("info", "", "Display system-wide information")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
return nil
|
||||
|
|
@ -330,7 +312,7 @@ func CmdInfo(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
body, _, err := call("GET", "/info", nil)
|
||||
body, _, err := cli.call("GET", "/info", nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -348,7 +330,7 @@ func CmdInfo(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func CmdStop(args ...string) error {
|
||||
func (cli *DockerCli) CmdStop(args ...string) error {
|
||||
cmd := Subcmd("stop", "[OPTIONS] CONTAINER [CONTAINER...]", "Stop a running container")
|
||||
nSeconds := cmd.Int("t", 10, "wait t seconds before killing the container")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
|
|
@ -363,7 +345,7 @@ func CmdStop(args ...string) error {
|
|||
v.Set("t", strconv.Itoa(*nSeconds))
|
||||
|
||||
for _, name := range cmd.Args() {
|
||||
_, _, err := call("POST", "/containers/"+name+"/stop?"+v.Encode(), nil)
|
||||
_, _, err := cli.call("POST", "/containers/"+name+"/stop?"+v.Encode(), nil)
|
||||
if err != nil {
|
||||
fmt.Printf("%s", err)
|
||||
} else {
|
||||
|
|
@ -373,7 +355,7 @@ func CmdStop(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func CmdRestart(args ...string) error {
|
||||
func (cli *DockerCli) CmdRestart(args ...string) error {
|
||||
cmd := Subcmd("restart", "[OPTIONS] CONTAINER [CONTAINER...]", "Restart a running container")
|
||||
nSeconds := cmd.Int("t", 10, "wait t seconds before killing the container")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
|
|
@ -388,7 +370,7 @@ func CmdRestart(args ...string) error {
|
|||
v.Set("t", strconv.Itoa(*nSeconds))
|
||||
|
||||
for _, name := range cmd.Args() {
|
||||
_, _, err := call("POST", "/containers/"+name+"/restart?"+v.Encode(), nil)
|
||||
_, _, err := cli.call("POST", "/containers/"+name+"/restart?"+v.Encode(), nil)
|
||||
if err != nil {
|
||||
fmt.Printf("%s", err)
|
||||
} else {
|
||||
|
|
@ -398,7 +380,7 @@ func CmdRestart(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func CmdStart(args ...string) error {
|
||||
func (cli *DockerCli) CmdStart(args ...string) error {
|
||||
cmd := Subcmd("start", "CONTAINER [CONTAINER...]", "Restart a stopped container")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
return nil
|
||||
|
|
@ -409,7 +391,7 @@ func CmdStart(args ...string) error {
|
|||
}
|
||||
|
||||
for _, name := range args {
|
||||
_, _, err := call("POST", "/containers/"+name+"/start", nil)
|
||||
_, _, err := cli.call("POST", "/containers/"+name+"/start", nil)
|
||||
if err != nil {
|
||||
fmt.Printf("%s", err)
|
||||
} else {
|
||||
|
|
@ -419,7 +401,7 @@ func CmdStart(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func CmdInspect(args ...string) error {
|
||||
func (cli *DockerCli) CmdInspect(args ...string) error {
|
||||
cmd := Subcmd("inspect", "CONTAINER|IMAGE", "Return low-level information on a container/image")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
return nil
|
||||
|
|
@ -428,9 +410,9 @@ func CmdInspect(args ...string) error {
|
|||
cmd.Usage()
|
||||
return nil
|
||||
}
|
||||
obj, _, err := call("GET", "/containers/"+cmd.Arg(0)+"/json", nil)
|
||||
obj, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil)
|
||||
if err != nil {
|
||||
obj, _, err = call("GET", "/images/"+cmd.Arg(0)+"/json", nil)
|
||||
obj, _, err = cli.call("GET", "/images/"+cmd.Arg(0)+"/json", nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -446,7 +428,7 @@ func CmdInspect(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func CmdPort(args ...string) error {
|
||||
func (cli *DockerCli) CmdPort(args ...string) error {
|
||||
cmd := Subcmd("port", "CONTAINER PRIVATE_PORT", "Lookup the public-facing port which is NAT-ed to PRIVATE_PORT")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
return nil
|
||||
|
|
@ -456,7 +438,7 @@ func CmdPort(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
body, _, err := call("GET", "/containers/"+cmd.Arg(0)+"/json", nil)
|
||||
body, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -475,7 +457,7 @@ func CmdPort(args ...string) error {
|
|||
}
|
||||
|
||||
// 'docker rmi IMAGE' removes all images with the name IMAGE
|
||||
func CmdRmi(args ...string) error {
|
||||
func (cli *DockerCli) CmdRmi(args ...string) error {
|
||||
cmd := Subcmd("rmi", "IMAGE [IMAGE...]", "Remove an image")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
return nil
|
||||
|
|
@ -486,7 +468,7 @@ func CmdRmi(args ...string) error {
|
|||
}
|
||||
|
||||
for _, name := range cmd.Args() {
|
||||
_, _, err := call("DELETE", "/images/"+name, nil)
|
||||
_, _, err := cli.call("DELETE", "/images/"+name, nil)
|
||||
if err != nil {
|
||||
fmt.Printf("%s", err)
|
||||
} else {
|
||||
|
|
@ -496,7 +478,7 @@ func CmdRmi(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func CmdHistory(args ...string) error {
|
||||
func (cli *DockerCli) CmdHistory(args ...string) error {
|
||||
cmd := Subcmd("history", "IMAGE", "Show the history of an image")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
return nil
|
||||
|
|
@ -506,7 +488,7 @@ func CmdHistory(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
body, _, err := call("GET", "/images/"+cmd.Arg(0)+"/history", nil)
|
||||
body, _, err := cli.call("GET", "/images/"+cmd.Arg(0)+"/history", nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -526,7 +508,7 @@ func CmdHistory(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func CmdRm(args ...string) error {
|
||||
func (cli *DockerCli) CmdRm(args ...string) error {
|
||||
cmd := Subcmd("rm", "[OPTIONS] CONTAINER [CONTAINER...]", "Remove a container")
|
||||
v := cmd.Bool("v", false, "Remove the volumes associated to the container")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
|
|
@ -541,7 +523,7 @@ func CmdRm(args ...string) error {
|
|||
val.Set("v", "1")
|
||||
}
|
||||
for _, name := range cmd.Args() {
|
||||
_, _, err := call("DELETE", "/containers/"+name+"?"+val.Encode(), nil)
|
||||
_, _, err := cli.call("DELETE", "/containers/"+name+"?"+val.Encode(), nil)
|
||||
if err != nil {
|
||||
fmt.Printf("%s", err)
|
||||
} else {
|
||||
|
|
@ -552,7 +534,7 @@ func CmdRm(args ...string) error {
|
|||
}
|
||||
|
||||
// 'docker kill NAME' kills a running container
|
||||
func CmdKill(args ...string) error {
|
||||
func (cli *DockerCli) CmdKill(args ...string) error {
|
||||
cmd := Subcmd("kill", "CONTAINER [CONTAINER...]", "Kill a running container")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
return nil
|
||||
|
|
@ -563,7 +545,7 @@ func CmdKill(args ...string) error {
|
|||
}
|
||||
|
||||
for _, name := range args {
|
||||
_, _, err := call("POST", "/containers/"+name+"/kill", nil)
|
||||
_, _, err := cli.call("POST", "/containers/"+name+"/kill", nil)
|
||||
if err != nil {
|
||||
fmt.Printf("%s", err)
|
||||
} else {
|
||||
|
|
@ -573,7 +555,7 @@ func CmdKill(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func CmdImport(args ...string) error {
|
||||
func (cli *DockerCli) CmdImport(args ...string) error {
|
||||
cmd := Subcmd("import", "URL|- [REPOSITORY [TAG]]", "Create a new filesystem image from the contents of a tarball")
|
||||
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
|
|
@ -589,14 +571,14 @@ func CmdImport(args ...string) error {
|
|||
v.Set("tag", tag)
|
||||
v.Set("fromSrc", src)
|
||||
|
||||
err := hijack("POST", "/images/create?"+v.Encode(), false)
|
||||
err := cli.hijack("POST", "/images/create?"+v.Encode(), false)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func CmdPush(args ...string) error {
|
||||
func (cli *DockerCli) CmdPush(args ...string) error {
|
||||
cmd := Subcmd("push", "[OPTION] NAME", "Push an image or a repository to the registry")
|
||||
registry := cmd.String("registry", "", "Registry host to push the image to")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
|
|
@ -609,7 +591,7 @@ func CmdPush(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
body, _, err := call("GET", "/auth", nil)
|
||||
body, _, err := cli.call("GET", "/auth", nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -622,11 +604,11 @@ func CmdPush(args ...string) error {
|
|||
|
||||
// If the login failed AND we're using the index, abort
|
||||
if *registry == "" && out.Username == "" {
|
||||
if err := CmdLogin(args...); err != nil {
|
||||
if err := cli.CmdLogin(args...); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
body, _, err = call("GET", "/auth", nil)
|
||||
body, _, err = cli.call("GET", "/auth", nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -646,13 +628,13 @@ func CmdPush(args ...string) error {
|
|||
|
||||
v := url.Values{}
|
||||
v.Set("registry", *registry)
|
||||
if err := hijack("POST", "/images/"+name+"/push?"+v.Encode(), false); err != nil {
|
||||
if err := cli.hijack("POST", "/images/"+name+"/push?"+v.Encode(), false); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func CmdPull(args ...string) error {
|
||||
func (cli *DockerCli) CmdPull(args ...string) error {
|
||||
cmd := Subcmd("pull", "NAME", "Pull an image or a repository from the registry")
|
||||
tag := cmd.String("t", "", "Download tagged image in repository")
|
||||
registry := cmd.String("registry", "", "Registry to download from. Necessary if image is pulled by ID")
|
||||
|
|
@ -677,14 +659,14 @@ func CmdPull(args ...string) error {
|
|||
v.Set("tag", *tag)
|
||||
v.Set("registry", *registry)
|
||||
|
||||
if err := hijack("POST", "/images/create?"+v.Encode(), false); err != nil {
|
||||
if err := cli.hijack("POST", "/images/create?"+v.Encode(), false); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func CmdImages(args ...string) error {
|
||||
func (cli *DockerCli) CmdImages(args ...string) error {
|
||||
cmd := Subcmd("images", "[OPTIONS] [NAME]", "List images")
|
||||
quiet := cmd.Bool("q", false, "only show numeric IDs")
|
||||
all := cmd.Bool("a", false, "show all images")
|
||||
|
|
@ -700,7 +682,7 @@ func CmdImages(args ...string) error {
|
|||
}
|
||||
|
||||
if *flViz {
|
||||
body, _, err := call("GET", "/images/viz", false)
|
||||
body, _, err := cli.call("GET", "/images/viz", false)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -714,7 +696,7 @@ func CmdImages(args ...string) error {
|
|||
v.Set("all", "1")
|
||||
}
|
||||
|
||||
body, _, err := call("GET", "/images/json?"+v.Encode(), nil)
|
||||
body, _, err := cli.call("GET", "/images/json?"+v.Encode(), nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -762,7 +744,7 @@ func CmdImages(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func CmdPs(args ...string) error {
|
||||
func (cli *DockerCli) CmdPs(args ...string) error {
|
||||
cmd := Subcmd("ps", "[OPTIONS]", "List containers")
|
||||
quiet := cmd.Bool("q", false, "Only display numeric IDs")
|
||||
all := cmd.Bool("a", false, "Show all containers. Only running containers are shown by default.")
|
||||
|
|
@ -792,7 +774,7 @@ func CmdPs(args ...string) error {
|
|||
v.Set("before", *before)
|
||||
}
|
||||
|
||||
body, _, err := call("GET", "/containers/ps?"+v.Encode(), nil)
|
||||
body, _, err := cli.call("GET", "/containers/ps?"+v.Encode(), nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -829,7 +811,7 @@ func CmdPs(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func CmdCommit(args ...string) error {
|
||||
func (cli *DockerCli) CmdCommit(args ...string) error {
|
||||
cmd := Subcmd("commit", "[OPTIONS] CONTAINER [REPOSITORY [TAG]]", "Create a new image from a container's changes")
|
||||
flComment := cmd.String("m", "", "Commit message")
|
||||
flAuthor := cmd.String("author", "", "Author (eg. \"John Hannibal Smith <hannibal@a-team.com>\"")
|
||||
|
|
@ -856,7 +838,7 @@ func CmdCommit(args ...string) error {
|
|||
return err
|
||||
}
|
||||
}
|
||||
body, _, err := call("POST", "/commit?"+v.Encode(), config)
|
||||
body, _, err := cli.call("POST", "/commit?"+v.Encode(), config)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -871,7 +853,7 @@ func CmdCommit(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func CmdExport(args ...string) error {
|
||||
func (cli *DockerCli) CmdExport(args ...string) error {
|
||||
cmd := Subcmd("export", "CONTAINER", "Export the contents of a filesystem as a tar archive")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
return nil
|
||||
|
|
@ -882,13 +864,13 @@ func CmdExport(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
if err := stream("GET", "/containers/"+cmd.Arg(0)+"/export"); err != nil {
|
||||
if err := cli.stream("GET", "/containers/"+cmd.Arg(0)+"/export"); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func CmdDiff(args ...string) error {
|
||||
func (cli *DockerCli) CmdDiff(args ...string) error {
|
||||
cmd := Subcmd("diff", "CONTAINER", "Inspect changes on a container's filesystem")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
return nil
|
||||
|
|
@ -898,7 +880,7 @@ func CmdDiff(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
body, _, err := call("GET", "/containers/"+cmd.Arg(0)+"/changes", nil)
|
||||
body, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/changes", nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -914,7 +896,7 @@ func CmdDiff(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func CmdLogs(args ...string) error {
|
||||
func (cli *DockerCli) CmdLogs(args ...string) error {
|
||||
cmd := Subcmd("logs", "CONTAINER", "Fetch the logs of a container")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
return nil
|
||||
|
|
@ -929,13 +911,13 @@ func CmdLogs(args ...string) error {
|
|||
v.Set("stdout", "1")
|
||||
v.Set("stderr", "1")
|
||||
|
||||
if err := hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?"+v.Encode(), false); err != nil {
|
||||
if err := cli.hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?"+v.Encode(), false); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func CmdAttach(args ...string) error {
|
||||
func (cli *DockerCli) CmdAttach(args ...string) error {
|
||||
cmd := Subcmd("attach", "CONTAINER", "Attach to a running container")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
return nil
|
||||
|
|
@ -945,7 +927,7 @@ func CmdAttach(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
body, _, err := call("GET", "/containers/"+cmd.Arg(0)+"/json", nil)
|
||||
body, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -962,13 +944,13 @@ func CmdAttach(args ...string) error {
|
|||
v.Set("stderr", "1")
|
||||
v.Set("stdin", "1")
|
||||
|
||||
if err := hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?"+v.Encode(), container.Config.Tty); err != nil {
|
||||
if err := cli.hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?"+v.Encode(), container.Config.Tty); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func CmdSearch(args ...string) error {
|
||||
func (cli *DockerCli) CmdSearch(args ...string) error {
|
||||
cmd := Subcmd("search", "NAME", "Search the docker index for images")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
return nil
|
||||
|
|
@ -980,7 +962,7 @@ func CmdSearch(args ...string) error {
|
|||
|
||||
v := url.Values{}
|
||||
v.Set("term", cmd.Arg(0))
|
||||
body, _, err := call("GET", "/images/search?"+v.Encode(), nil)
|
||||
body, _, err := cli.call("GET", "/images/search?"+v.Encode(), nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -1061,7 +1043,7 @@ func (opts PathOpts) Set(val string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func CmdTag(args ...string) error {
|
||||
func (cli *DockerCli) CmdTag(args ...string) error {
|
||||
cmd := Subcmd("tag", "[OPTIONS] IMAGE REPOSITORY [TAG]", "Tag an image into a repository")
|
||||
force := cmd.Bool("f", false, "Force")
|
||||
if err := cmd.Parse(args); err != nil {
|
||||
|
|
@ -1082,13 +1064,13 @@ func CmdTag(args ...string) error {
|
|||
v.Set("force", "1")
|
||||
}
|
||||
|
||||
if _, _, err := call("POST", "/images/"+cmd.Arg(0)+"/tag?"+v.Encode(), nil); err != nil {
|
||||
if _, _, err := cli.call("POST", "/images/"+cmd.Arg(0)+"/tag?"+v.Encode(), nil); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func CmdRun(args ...string) error {
|
||||
func (cli *DockerCli) CmdRun(args ...string) error {
|
||||
config, cmd, err := ParseRun(args, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
@ -1099,16 +1081,16 @@ func CmdRun(args ...string) error {
|
|||
}
|
||||
|
||||
//create the container
|
||||
body, statusCode, err := call("POST", "/containers/create", config)
|
||||
body, statusCode, err := cli.call("POST", "/containers/create", config)
|
||||
//if image not found try to pull it
|
||||
if statusCode == 404 {
|
||||
v := url.Values{}
|
||||
v.Set("fromImage", config.Image)
|
||||
err = hijack("POST", "/images/create?"+v.Encode(), false)
|
||||
err = cli.hijack("POST", "/images/create?"+v.Encode(), false)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
body, _, err = call("POST", "/containers/create", config)
|
||||
body, _, err = cli.call("POST", "/containers/create", config)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -1143,13 +1125,13 @@ func CmdRun(args ...string) error {
|
|||
}
|
||||
|
||||
//start the container
|
||||
_, _, err = call("POST", "/containers/"+out.Id+"/start", nil)
|
||||
_, _, err = cli.call("POST", "/containers/"+out.Id+"/start", nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if config.AttachStdin || config.AttachStdout || config.AttachStderr {
|
||||
if err := hijack("POST", "/containers/"+out.Id+"/attach?"+v.Encode(), config.Tty); err != nil {
|
||||
if err := cli.hijack("POST", "/containers/"+out.Id+"/attach?"+v.Encode(), config.Tty); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
|
@ -1159,7 +1141,7 @@ func CmdRun(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func call(method, path string, data interface{}) ([]byte, int, error) {
|
||||
func (cli *DockerCli) call(method, path string, data interface{}) ([]byte, int, error) {
|
||||
var params io.Reader
|
||||
if data != nil {
|
||||
buf, err := json.Marshal(data)
|
||||
|
|
@ -1169,7 +1151,7 @@ func call(method, path string, data interface{}) ([]byte, int, error) {
|
|||
params = bytes.NewBuffer(buf)
|
||||
}
|
||||
|
||||
req, err := http.NewRequest(method, "http://0.0.0.0:4243"+path, params)
|
||||
req, err := http.NewRequest(method, fmt.Sprintf("http://%s:%d", cli.host, cli.port)+path, params)
|
||||
if err != nil {
|
||||
return nil, -1, err
|
||||
}
|
||||
|
|
@ -1197,8 +1179,8 @@ func call(method, path string, data interface{}) ([]byte, int, error) {
|
|||
return body, resp.StatusCode, nil
|
||||
}
|
||||
|
||||
func stream(method, path string) error {
|
||||
req, err := http.NewRequest(method, "http://0.0.0.0:4243"+path, nil)
|
||||
func (cli *DockerCli) stream(method, path string) error {
|
||||
req, err := http.NewRequest(method, fmt.Sprintf("http://%s:%d%s", cli.host, cli.port, path), nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -1228,13 +1210,13 @@ func stream(method, path string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func hijack(method, path string, setRawTerminal bool) error {
|
||||
func (cli *DockerCli) hijack(method, path string, setRawTerminal bool) error {
|
||||
req, err := http.NewRequest(method, path, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
req.Header.Set("Content-Type", "plain/text")
|
||||
dial, err := net.Dial("tcp", "0.0.0.0:4243")
|
||||
dial, err := net.Dial("tcp", fmt.Sprintf("%s:%d", cli.host, cli.port))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -1287,3 +1269,12 @@ func Subcmd(name, signature, description string) *flag.FlagSet {
|
|||
}
|
||||
return flags
|
||||
}
|
||||
|
||||
func NewDockerCli(host string, port int) *DockerCli {
|
||||
return &DockerCli{host, port}
|
||||
}
|
||||
|
||||
type DockerCli struct {
|
||||
host string
|
||||
port int
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue