From 150940a67b18dfebe57a8041efa38e53d9036d74 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Fri, 27 Feb 2015 14:17:02 -0800 Subject: [PATCH] update dockerclient Signed-off-by: Victor Vieux --- Godeps/Godeps.json | 2 +- .../github.com/samalba/dockerclient/dockerclient.go | 11 ++++++----- .../src/github.com/samalba/dockerclient/interface.go | 2 +- .../samalba/dockerclient/mockclient/mock.go | 4 ++-- cluster/node.go | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 4442f5d5c5..fbdd79993b 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -60,7 +60,7 @@ }, { "ImportPath": "github.com/samalba/dockerclient", - "Rev": "7e4366cfab2f2b44fcb493bee93a156a763d58b6" + "Rev": "0fdc3ca0e58365801f1212900def9c7c60bbe2c7" }, { "ImportPath": "github.com/samuel/go-zookeeper/zk", diff --git a/Godeps/_workspace/src/github.com/samalba/dockerclient/dockerclient.go b/Godeps/_workspace/src/github.com/samalba/dockerclient/dockerclient.go index 0bc2018a00..81e6aaeaa0 100644 --- a/Godeps/_workspace/src/github.com/samalba/dockerclient/dockerclient.go +++ b/Godeps/_workspace/src/github.com/samalba/dockerclient/dockerclient.go @@ -8,7 +8,6 @@ import ( "fmt" "io" "io/ioutil" - "log" "net/http" "net/url" "strconv" @@ -247,7 +246,6 @@ func (client *DockerClient) getEvents(cb Callback, ec chan error, args ...interf uri := fmt.Sprintf("%s/%s/events", client.URL.String(), APIVersion) resp, err := client.HTTPClient.Get(uri) if err != nil { - log.Printf("GET %s failed: %v", uri, err) ec <- err return } @@ -257,7 +255,6 @@ func (client *DockerClient) getEvents(cb Callback, ec chan error, args ...interf for atomic.LoadInt32(&client.monitorEvents) > 0 { var event *Event if err := dec.Decode(&event); err != nil { - log.Printf("Event decoding failed: %v", err) ec <- err return } @@ -308,12 +305,16 @@ func (client *DockerClient) PullImage(name string, auth *AuthConfig) error { return nil } -func (client *DockerClient) RemoveContainer(id string, force bool) error { +func (client *DockerClient) RemoveContainer(id string, force, volumes bool) error { argForce := 0 + argVolumes := 0 if force == true { argForce = 1 } - args := fmt.Sprintf("force=%d", argForce) + if volumes == true { + argVolumes = 1 + } + args := fmt.Sprintf("force=%d&v=%d", argForce, argVolumes) uri := fmt.Sprintf("/%s/containers/%s?%s", APIVersion, id, args) _, err := client.doRequest("DELETE", uri, nil, nil) return err diff --git a/Godeps/_workspace/src/github.com/samalba/dockerclient/interface.go b/Godeps/_workspace/src/github.com/samalba/dockerclient/interface.go index 6a270f15b5..bab13aa3ea 100644 --- a/Godeps/_workspace/src/github.com/samalba/dockerclient/interface.go +++ b/Godeps/_workspace/src/github.com/samalba/dockerclient/interface.go @@ -21,7 +21,7 @@ type Client interface { StopAllMonitorEvents() Version() (*Version, error) PullImage(name string, auth *AuthConfig) error - RemoveContainer(id string, force bool) error + RemoveContainer(id string, force, volumes bool) error ListImages() ([]*Image, error) RemoveImage(name string) error PauseContainer(name string) error diff --git a/Godeps/_workspace/src/github.com/samalba/dockerclient/mockclient/mock.go b/Godeps/_workspace/src/github.com/samalba/dockerclient/mockclient/mock.go index 1d4f5c32cb..4d16dcaa93 100644 --- a/Godeps/_workspace/src/github.com/samalba/dockerclient/mockclient/mock.go +++ b/Godeps/_workspace/src/github.com/samalba/dockerclient/mockclient/mock.go @@ -78,8 +78,8 @@ func (client *MockClient) PullImage(name string, auth *dockerclient.AuthConfig) return args.Error(0) } -func (client *MockClient) RemoveContainer(id string, force bool) error { - args := client.Mock.Called(id, force) +func (client *MockClient) RemoveContainer(id string, force, volumes bool) error { + args := client.Mock.Called(id, force, volumes) return args.Error(0) } diff --git a/cluster/node.go b/cluster/node.go index 590c45fee8..8f90c594c5 100644 --- a/cluster/node.go +++ b/cluster/node.go @@ -365,7 +365,7 @@ func (n *Node) Create(config *dockerclient.ContainerConfig, name string, pullIma // Destroy and remove a container from the node. func (n *Node) Destroy(container *Container, force bool) error { - if err := n.client.RemoveContainer(container.Id, force); err != nil { + if err := n.client.RemoveContainer(container.Id, force, true); err != nil { return err }