Skip to content

Commit 9786f8f

Browse files
committed
Another attempt to fix dockerdeploy getting stuck during node removal.
1 parent 072571c commit 9786f8f

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

deployment/dockerdeploy/controller.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,9 +718,12 @@ func (c *Controller) RemoveNode(ctx context.Context, containerID string) error {
718718
logger.Debug("removing container")
719719

720720
// we try to call remove to force it to be removed
721-
c.DockerCli.ContainerRemove(ctx, containerID, container.RemoveOptions{
721+
err = c.DockerCli.ContainerRemove(ctx, containerID, container.RemoveOptions{
722722
Force: true,
723723
})
724+
if err != nil {
725+
return errors.Wrap(err, "failed to remove container")
726+
}
724727

725728
logger.Debug("waiting for container to disappear")
726729

0 commit comments

Comments
 (0)