Another attempt to fix dockerdeploy getting stuck during node removal.

Author: brett19

deployment/dockerdeploy/controller.go

@@ -711,17 +711,22 @@ func (c *Controller) RemoveNode(ctx context.Context, containerID string) error {
 	err := c.DockerCli.ContainerStop(ctx, containerID, container.StopOptions{
 		Timeout: ptr.To(0),
 	})
+
 	if err != nil {
 		return errors.Wrap(err, "failed to stop container")
 	}
 
 	logger.Debug("removing container")
 
 	// we try to call remove to force it to be removed
-	c.DockerCli.ContainerRemove(ctx, containerID, container.RemoveOptions{
+	err = c.DockerCli.ContainerRemove(ctx, containerID, container.RemoveOptions{
 		Force: true,
 	})
 
+	if err != nil {
+		return errors.Wrap(err, "failed to remove container")
+	}
+
 	logger.Debug("waiting for container to disappear")
 
 	// We call this to 'wait' for the removal to finish...