docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-22 03:22:01 +03:00
Code Activity

fixed inspect

Browse Source 
Upstream-commit: 75c0dc9526766719f6e528c48e63001596042071
Component: engine
This commit is contained in:
Victor Vieux
2013-04-24 18:50:26 +02:00
parent 71e24d7094
commit d1c7705ab6
1 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
components/engine/commands.go
View File

@@ -352,20 +352,14 @@ func CmdInspect(args []string) error {
cmd.Usage()
return nil
}
var obj interface{}
var err error
obj, err = call("GET", "/containers/"+cmd.Arg(0))
obj, err := call("GET", "/containers/"+cmd.Arg(0))
if err != nil {
obj, err = call("GET", "/images/"+cmd.Arg(0))
if err != nil {
return err
}
}
b, err := json.MarshalIndent(obj, "", " ")
if err != nil {
return err
}
fmt.Printf("%s\n", b)
fmt.Printf("%s\n", obj)
return nil
}
@@ -1004,18 +998,8 @@ func callStream(method, path string, data interface{}, isTerminal bool) error {
return err
}
clientconn := httputil.NewClientConn(dial, nil)
resp, err := clientconn.Do(req)
clientconn.Do(req)
defer clientconn.Close()
if err != nil {
return err
}
if resp.StatusCode != 200 {
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return err
}
return fmt.Errorf("error: %s", body)
}
rwc, _ := clientconn.Hijack()
defer rwc.Close()