Merge pull request #970 from giuseppe/fix-start-attach

libpod: fix race with attach/start

1 files changed, 2 insertions, 8 deletions

diff --git a/libpod/container_api.go b/libpod/container_api.go
index 0ddccfe8e..96648ccf5 100644
--- a/libpod/container_api.go
+++ b/libpod/container_api.go
@@ -178,18 +178,12 @@ func (c *Container) StartAndAttach(ctx context.Context, streams *AttachStreams,
 
 	// Attach to the container before starting it
 	go func() {
-		if err := c.attach(streams, keys, resize); err != nil {
+		if err := c.attach(streams, keys, resize, true); err != nil {
 			attachChan <- err
 		}
 		close(attachChan)
 	}()
 
-	// Start the container
-	if err := c.start(); err != nil {
-		// TODO: interrupt the attach here if we error
-		return nil, err
-	}
-
 	return attachChan, nil
 }
 
@@ -421,7 +415,7 @@ func (c *Container) Attach(streams *AttachStreams, keys string, resize <-chan re
 		return errors.Wrapf(ErrCtrStateInvalid, "can only attach to created or running containers")
 	}
 
-	return c.attach(streams, keys, resize)
+	return c.attach(streams, keys, resize, false)
 }
 
 // Mount mounts a container's filesystem on the host