Merge branch '229-clean-up-container-volumes' into 'master'

agneum · agneum · commit 03757980135f · 2021-01-21T04:45:28.000Z
fix: clean up volumes on container destroy (#229) Closes #229 See merge request postgres-ai/database-lab!244
diff --git a/pkg/retrieval/engine/postgres/tools/cont/container.go b/pkg/retrieval/engine/postgres/tools/cont/container.go
@@ -80,7 +80,10 @@ func StopControlContainers(ctx context.Context, dockerClient *client.Client, ins
 
 		log.Msg("Removing control container:", containerName)
 
-		if err := dockerClient.ContainerRemove(ctx, controlCont.ID, types.ContainerRemoveOptions{Force: true}); err != nil {
+		if err := dockerClient.ContainerRemove(ctx, controlCont.ID, types.ContainerRemoveOptions{
+			RemoveVolumes: true,
+			Force:         true,
+		}); err != nil {
 			return err
 		}
 	}
@@ -100,7 +103,10 @@ func CleanUpControlContainers(ctx context.Context, dockerClient *client.Client,
 	for _, controlCont := range list {
 		log.Msg("Removing control container:", getControlContainerName(controlCont))
 
-		if err := dockerClient.ContainerRemove(ctx, controlCont.ID, types.ContainerRemoveOptions{Force: true}); err != nil {
+		if err := dockerClient.ContainerRemove(ctx, controlCont.ID, types.ContainerRemoveOptions{
+			RemoveVolumes: true,
+			Force:         true,
+		}); err != nil {
 			return err
 		}
 	}
diff --git a/pkg/retrieval/engine/postgres/tools/tools.go b/pkg/retrieval/engine/postgres/tools/tools.go
@@ -101,8 +101,7 @@ func DetectPGVersion(dataDir string) (float64, error) {
 }
 
 // AddVolumesToHostConfig adds volumes to container host configuration depends on process environment.
-func AddVolumesToHostConfig(ctx context.Context, dockerClient *client.Client, hostConfig *container.HostConfig,
-	dataDir string) error {
+func AddVolumesToHostConfig(ctx context.Context, docker *client.Client, hostConfig *container.HostConfig, dataDir string) error {
 	hostInfo, err := host.Info()
 	if err != nil {
 		return errors.Wrap(err, "failed to get host info")
@@ -111,7 +110,7 @@ func AddVolumesToHostConfig(ctx context.Context, dockerClient *client.Client, ho
 	log.Dbg("Virtualization system: ", hostInfo.VirtualizationSystem)
 
 	if hostInfo.VirtualizationRole == "guest" {
-		inspection, err := dockerClient.ContainerInspect(ctx, hostInfo.Hostname)
+		inspection, err := docker.ContainerInspect(ctx, hostInfo.Hostname)
 		if err != nil {
 			return err
 		}
@@ -254,7 +253,10 @@ func RemoveContainer(ctx context.Context, dockerClient *client.Client, container
 
 	log.Msg(fmt.Sprintf("Container %q has been stopped", containerID))
 
-	if err := dockerClient.ContainerRemove(ctx, containerID, types.ContainerRemoveOptions{Force: true}); err != nil {
+	if err := dockerClient.ContainerRemove(ctx, containerID, types.ContainerRemoveOptions{
+		RemoveVolumes: true,
+		Force:         true,
+	}); err != nil {
 		log.Err("Failed to remove container: ", err)
 
 		return
diff --git a/pkg/services/provision/docker/docker.go b/pkg/services/provision/docker/docker.go
@@ -141,7 +141,7 @@ func StopContainer(r runners.Runner, c *resources.AppConfig) (string, error) {
 
 // RemoveContainer removes specified container.
 func RemoveContainer(r runners.Runner, cloneName string) (string, error) {
-	dockerRemoveCmd := "docker container rm --force " + cloneName
+	dockerRemoveCmd := "docker container rm --force --volumes " + cloneName
 
 	return r.Run(dockerRemoveCmd, true)
 }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,10 @@ func StopControlContainers(ctx context.Context, dockerClient *client.Client, ins`
`80`	`80`
`81`	`81`	`log.Msg("Removing control container:", containerName)`
`82`	`82`
`83`		`- if err := dockerClient.ContainerRemove(ctx, controlCont.ID, types.ContainerRemoveOptions{Force: true}); err != nil {`
	`83`	`+ if err := dockerClient.ContainerRemove(ctx, controlCont.ID, types.ContainerRemoveOptions{`
	`84`	`+ RemoveVolumes: true,`
	`85`	`+ Force: true,`
	`86`	`+ }); err != nil {`
`84`	`87`	`return err`
`85`	`88`	`}`
`86`	`89`	`}`
`@@ -100,7 +103,10 @@ func CleanUpControlContainers(ctx context.Context, dockerClient *client.Client,`
`100`	`103`	`for _, controlCont := range list {`
`101`	`104`	`log.Msg("Removing control container:", getControlContainerName(controlCont))`
`102`	`105`
`103`		`- if err := dockerClient.ContainerRemove(ctx, controlCont.ID, types.ContainerRemoveOptions{Force: true}); err != nil {`
	`106`	`+ if err := dockerClient.ContainerRemove(ctx, controlCont.ID, types.ContainerRemoveOptions{`
	`107`	`+ RemoveVolumes: true,`
	`108`	`+ Force: true,`
	`109`	`+ }); err != nil {`
`104`	`110`	`return err`
`105`	`111`	`}`
`106`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ func StopContainer(r runners.Runner, c *resources.AppConfig) (string, error) {`
`141`	`141`
`142`	`142`	`// RemoveContainer removes specified container.`
`143`	`143`	`func RemoveContainer(r runners.Runner, cloneName string) (string, error) {`
`144`		`- dockerRemoveCmd := "docker container rm --force " + cloneName`
	`144`	`+ dockerRemoveCmd := "docker container rm --force --volumes " + cloneName`
`145`	`145`
`146`	`146`	`return r.Run(dockerRemoveCmd, true)`
`147`	`147`	`}`