Merge pull request #514 from vania-pooh/master

Stopping video container when service startup timed out (fixes #504)
aerokube · Jul 31, 2018 · 48f63ff · 48f63ff
2 parents 70c7afa + 00428fe
commit 48f63ff
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/service/docker.go b/service/docker.go
@@ -135,6 +135,9 @@ func (d *Docker) StartWithCancel() (*StartedService, error) {
 	serviceStartTime := time.Now()
 	err = wait(u.String(), d.StartupTimeout)
 	if err != nil {
+		if videoContainerId != "" {
+			stopVideoContainer(ctx, cl, requestId, videoContainerId)
+		}
 		removeContainer(ctx, cl, requestId, browserContainerId)
 		return nil, fmt.Errorf("wait: %v", err)
 	}