Don't use go-dockerclient to en/decode inspects in the proxy
This commit is contained in:
1 parent
11b655154c
commit
32a12578f3
4 files changed
+73
-15
No files matched your search
@@ -3,7 +3,6 @@ package proxy
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/fsouza/go-dockerclient"
|
||||
. "github.com/weaveworks/weave/common"
|
||||
)
|
||||
|
||||
@@ -18,13 +17,18 @@ func (i *inspectExecInterceptor) InterceptResponse(r *http.Response) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
exec := &docker.ExecInspect{}
|
||||
exec := map[string]interface{}{}
|
||||
if err := unmarshalResponseBody(r, &exec); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := updateContainerNetworkSettings(&exec.Container); err != nil {
|
||||
Log.Warningf("Inspecting exec %s failed: %s", exec.ID, err)
|
||||
container, err := lookupObject(exec, "Container")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := updateContainerNetworkSettings(container); err != nil {
|
||||
Log.Warningf("Inspecting exec %s failed: %s", exec["Id"], err)
|
||||
}
|
||||
|
||||
return marshalResponseBody(r, exec)
|
||||
|
||||
Reference in new issue
Block a user