updated with riku's code

stevemurr · stevemurr · commit 2d7ad4899496 · 2017-09-01T09:07:24.000-07:00
diff --git a/_examples/ssh-docker/docker.go b/_examples/ssh-docker/docker.go
@@ -107,12 +107,13 @@ func dockerRun(cfg *container.Config, sess ssh.Session) (status int64, cleanup f
 			}
 		}()
 	}
-	statusChan, chanErr := docker.ContainerWait(ctx, res.ID, container.WaitConditionNotRunning)
-	if chanErr != nil {
+	resultC, errC := docker.ContainerWait(ctx, res.ID, container.WaitConditionNotRunning)
+	select {
+	case err = <-errC:
 		return
+	case result := <-resultC:
+		status = result.StatusCode
 	}
-	err = <-chanErr
-	s := <-statusChan
-	status = s.StatusCode
+	err = <-outputErr
 	return
 }

Original file line number	Diff line number	Diff line change
`@@ -107,12 +107,13 @@ func dockerRun(cfg *container.Config, sess ssh.Session) (status int64, cleanup f`
`107`	`107`	`}`
`108`	`108`	`}()`
`109`	`109`	`}`
`110`		`- statusChan, chanErr := docker.ContainerWait(ctx, res.ID, container.WaitConditionNotRunning)`
`111`		`- if chanErr != nil {`
	`110`	`+ resultC, errC := docker.ContainerWait(ctx, res.ID, container.WaitConditionNotRunning)`
	`111`	`+ select {`
	`112`	`+ case err = <-errC:`
`112`	`113`	`return`
	`114`	`+ case result := <-resultC:`
	`115`	`+ status = result.StatusCode`
`113`	`116`	`}`
`114`		`- err = <-chanErr`
`115`		`- s := <-statusChan`
`116`		`- status = s.StatusCode`
	`117`	`+ err = <-outputErr`
`117`	`118`	`return`
`118`	`119`	`}`