docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update Godeps 

Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
Victor Vieux 2015-03-11 14:10:18 -07:00 committed by Victor Vieux
parent c969fcdae6
commit 6044354ea2
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -60,7 +60,7 @@
}, },
{ {
"ImportPath": "github.com/samalba/dockerclient", "ImportPath": "github.com/samalba/dockerclient",
"Rev": "0fdc3ca0e58365801f1212900def9c7c60bbe2c7" "Rev": "0689bcd74173c6abd6394b7ad435df46b0df26f8"
}, },
{ {
"ImportPath": "github.com/samuel/go-zookeeper/zk", "ImportPath": "github.com/samuel/go-zookeeper/zk",

13
Godeps/_workspace/src/github.com/samalba/dockerclient/dockerclient.go generated vendored
View File

@ -333,10 +333,17 @@ func (client *DockerClient) ListImages() ([]*Image, error) {
return images, nil return images, nil
} }
func (client *DockerClient) RemoveImage(name string) error { func (client *DockerClient) RemoveImage(name string) ([]*ImageDelete, error) {
uri := fmt.Sprintf("/%s/images/%s", APIVersion, name) uri := fmt.Sprintf("/%s/images/%s", APIVersion, name)
_, err := client.doRequest("DELETE", uri, nil, nil) data, err := client.doRequest("DELETE", uri, nil, nil)
return err if err != nil {
return nil, err
}
var imageDelete []*ImageDelete
if err := json.Unmarshal(data, &imageDelete); err != nil {
return nil, err
}
return imageDelete, nil
} }
func (client *DockerClient) PauseContainer(id string) error { func (client *DockerClient) PauseContainer(id string) error {

2
Godeps/_workspace/src/github.com/samalba/dockerclient/interface.go generated vendored
View File

@ -23,7 +23,7 @@ type Client interface {
PullImage(name string, auth *AuthConfig) error PullImage(name string, auth *AuthConfig) error
RemoveContainer(id string, force, volumes bool) error RemoveContainer(id string, force, volumes bool) error
ListImages() ([]*Image, error) ListImages() ([]*Image, error)
RemoveImage(name string) error RemoveImage(name string) ([]*ImageDelete, error)
PauseContainer(name string) error PauseContainer(name string) error
UnpauseContainer(name string) error UnpauseContainer(name string) error
} }

4
Godeps/_workspace/src/github.com/samalba/dockerclient/mockclient/mock.go generated vendored
View File

@ -88,9 +88,9 @@ func (client *MockClient) ListImages() ([]*dockerclient.Image, error) {
return args.Get(0).([]*dockerclient.Image), args.Error(1) return args.Get(0).([]*dockerclient.Image), args.Error(1)
} }
func (client *MockClient) RemoveImage(name string) error { func (client *MockClient) RemoveImage(name string) ([]*dockerclient.ImageDelete, error) {
args := client.Mock.Called(name) args := client.Mock.Called(name)
return args.Error(0) return args.Get(0).([]*dockerclient.ImageDelete), args.Error(1)
} }
func (client *MockClient) PauseContainer(name string) error { func (client *MockClient) PauseContainer(name string) error {

5
Godeps/_workspace/src/github.com/samalba/dockerclient/types.go generated vendored
View File

@ -166,3 +166,8 @@ type Info struct {
Name string Name string
Labels []string Labels []string
} }
type ImageDelete struct {
Deleted string
Untagged string
}