Merge pull request #1053 from jonjohnsonjr/cpuuusage

Fix resource usage in melange

internal/contextreader/contextreader.go

@@ -49,7 +49,7 @@ func (c *contextReader) init() {
 				c.n, c.err = c.r.Read(p)
 				c.done <- struct{}{}
 			case <-c.ctx.Done():
-				break
+				return
 			}
 		}
 	}()

pkg/container/docker/docker_runner.go

@@ -199,6 +199,8 @@ func (dk *docker) waitForCommand(ctx context.Context, r io.Reader) error {
 	defer stderr.Close()
 
 	// Wrap this in a contextReader so we respond to cancel.
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
 	ctxr := contextreader.New(ctx, r)
 
 	_, err := stdcopy.StdCopy(stdout, stderr, ctxr)