kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

fixed inspect

Browse source
This commit is contained in:
Victor Vieux 2013-04-24 18:50:26 +02:00
parent c7bbe7ca79
commit 75c0dc9526
1 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
commands.go
View file

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