From 97ca32a58bacafb1075da317c3e76847724fdcf4 Mon Sep 17 00:00:00 2001 From: Danielle Date: Fri, 16 Aug 2019 15:53:50 +0200 Subject: [PATCH] Merge pull request #6144 from hashicorp/b-docker-exec docker: Fix issue where an exec may never timeout --- drivers/docker/driver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/docker/driver.go b/drivers/docker/driver.go index 5664075cb15..1470147f461 100644 --- a/drivers/docker/driver.go +++ b/drivers/docker/driver.go @@ -1315,7 +1315,7 @@ func (d *Driver) ExecTaskStreaming(ctx context.Context, taskID string, opts *dri const execTerminatingTimeout = 3 * time.Second start := time.Now() var res *docker.ExecInspect - for res == nil || res.Running || time.Since(start) > execTerminatingTimeout { + for (res == nil || res.Running) && time.Since(start) <= execTerminatingTimeout { res, err = client.InspectExec(exec.ID) if err != nil { return nil, fmt.Errorf("failed to inspect exec result: %v", err)