feat: faster container stop (force stop)

anatolystansler · anatolystansler · commit cbaee81c18db · 2020-02-27T15:11:09.000Z
diff --git a/pkg/services/provision/databases/postgres/postgres.go b/pkg/services/provision/databases/postgres/postgres.go
@@ -44,7 +44,7 @@ const (
 
 // Start starts Postgres instance.
 func Start(r runners.Runner, c *resources.AppConfig) error {
-	log.Dbg("Starting Postgres...")
+	log.Dbg("Starting Postgres container...")
 
 	err := Configure(c)
 	if err != nil {
@@ -196,14 +196,9 @@ func Configure(c *resources.AppConfig) error {
 
 // Stop stops Postgres instance.
 func Stop(r runners.Runner, c *resources.AppConfig) error {
-	log.Dbg("Stopping Postgres...")
+	log.Dbg("Stopping Postgres container...")
 
-	_, err := docker.StopContainer(r, c)
-	if err != nil {
-		return errors.Wrap(err, "failed to stop container")
-	}
-
-	_, err = docker.RemoveContainer(r, c)
+	_, err := docker.RemoveContainer(r, c)
 	if err != nil {
 		return errors.Wrap(err, "failed to remove container")
 	}
diff --git a/pkg/services/provision/docker/docker.go b/pkg/services/provision/docker/docker.go
@@ -43,7 +43,7 @@ func StopContainer(r runners.Runner, c *resources.AppConfig) (string, error) {
 
 // RemoveContainer removes specified container.
 func RemoveContainer(r runners.Runner, c *resources.AppConfig) (string, error) {
-	dockerRemoveCmd := "docker container rm " + c.CloneName
+	dockerRemoveCmd := "docker container rm --force " + c.CloneName
 
 	return r.Run(dockerRemoveCmd, true)
 }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func StopContainer(r runners.Runner, c *resources.AppConfig) (string, error) {`
`43`	`43`
`44`	`44`	`// RemoveContainer removes specified container.`
`45`	`45`	`func RemoveContainer(r runners.Runner, c *resources.AppConfig) (string, error) {`
`46`		`- dockerRemoveCmd := "docker container rm " + c.CloneName`
	`46`	`+ dockerRemoveCmd := "docker container rm --force " + c.CloneName`
`47`	`47`
`48`	`48`	`return r.Run(dockerRemoveCmd, true)`
`49`	`49`	`}`