when destroy container, should remove it also (#530) (#532)

Author: metrue

container_runtimes/docker/http/api.go

@@ -488,7 +488,7 @@ func (api *API) StartContainer(ctx context.Context, name string, image string, b
 			return errors.Wrap(err, "could not get logs of container "+createRes.ID)
 		}
 
-		if err := api.RemoveContainer(createRes.ID); err != nil {
+		if err := api.RemoveContainer(ctx, createRes.ID); err != nil {
 			msg := fmt.Sprintf("remove container %s failed, and container started with logs: %s", createRes.ID, string(logs))
 			return errors.Wrap(err, msg)
 		}
@@ -527,7 +527,7 @@ func (api *API) logs(id string) ([]byte, error) {
 }
 
 // RemoveContainer remove a container
-func (api *API) RemoveContainer(id string) error {
+func (api *API) RemoveContainer(ctx context.Context, id string) error {
 	query := url.Values{}
 	query.Set("v", "true")
 	path := fmt.Sprintf("/containers/%s?%s", id, query.Encode())

container_runtimes/docker/sdk/docker.go

@@ -244,6 +244,11 @@ func (d *Docker) Version(ctx context.Context) (string, error) {
 	return ping.APIVersion, nil
 }
 
+// RemoveContainer remove container
+func (d *Docker) RemoveContainer(ctx context.Context, id string) error {
+	panic("no implemented yet")
+}
+
 var (
 	_ containerruntimes.ContainerRuntime = &Docker{}
 )

container_runtimes/mocks/runtime.go

@@ -14,6 +14,7 @@ type ContainerRuntime interface {
 	TagImage(ctx context.Context, name string, tag string) error
 	StartContainer(ctx context.Context, name string, image string, bindings []types.PortBinding) error
 	StopContainer(ctx context.Context, name string) error
+	RemoveContainer(ctx context.Context, name string) error
 	InspectContainer(ctx context.Context, name string, container interface{}) error
 	ListContainer(ctx context.Context, filter string) ([]types.Service, error)
 	Version(ctx context.Context) (string, error)

container_runtimes/runtimes.go

@@ -56,7 +56,10 @@ func (d *Driver) Destroy(ctx context.Context, name string) (err error) {
 	defer func() {
 		spinner.Stop("destroying "+name, err)
 	}()
-	return d.dockerClient.StopContainer(ctx, name)
+	if err := d.dockerClient.StopContainer(ctx, name); err != nil {
+		return err
+	}
+	return d.dockerClient.RemoveContainer(ctx, name)
 }
 
 // GetStatus get a service status

driver/docker/docker.go

@@ -55,6 +55,7 @@ func TestDriverDestroy(t *testing.T) {
 	ctx := context.Background()
 	name := "name"
 	dockerClient.EXPECT().StopContainer(ctx, name).Return(nil)
+	dockerClient.EXPECT().RemoveContainer(ctx, name).Return(nil)
 	if err := n.Destroy(ctx, name); err != nil {
 		t.Fatal(err)
 	}

driver/docker/docker_test.go

@@ -19,7 +19,7 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 )
 
-const version = "0.9.41"
+const version = "0.9.42"
 
 func init() {
 	go checkForUpdate()

fx.go

@@ -6,15 +6,13 @@ require (
 	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
 	github.com/Microsoft/go-winio v0.4.14 // indirect
 	github.com/apex/log v1.1.4
-	github.com/briandowns/spinner v1.11.1
 	github.com/cheggaaa/pb/v3 v3.0.4
 	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/docker v0.0.0-20190313072916-46036c230805
 	github.com/docker/go-connections v0.4.0
 	github.com/docker/go-units v0.3.3 // indirect
 	github.com/dsnet/compress v0.0.1 // indirect
 	github.com/gin-gonic/gin v1.6.3
-	github.com/gobuffalo/envy v1.8.1 // indirect
 	github.com/gobuffalo/packd v1.0.0
 	github.com/gobuffalo/packr/v2 v2.8.0
 	github.com/golang/mock v1.4.3
@@ -38,9 +36,7 @@ require (
 	github.com/pierrec/lz4 v0.0.0-20190222153722-062282ea0dcf // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.6.3
 	github.com/stretchr/testify v1.5.1
-	github.com/ugorji/go v1.1.7 // indirect
 	github.com/urfave/cli v1.22.4
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	golang.org/x/crypto v0.0.0-20191219195013-becbf705a915 // indirect