3 files changed, 20 insertions, 3 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index ac565fdad..0b5a8b946 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -163,7 +163,15 @@ func (c *Container) createExecBundle(sessionID string) (err error) {
 
 // cleanup an exec session after its done
 func (c *Container) cleanupExecBundle(sessionID string) error {
-	return os.RemoveAll(c.execBundlePath(sessionID))
+	if err := os.RemoveAll(c.execBundlePath(sessionID)); err != nil && !os.IsNotExist(err) {
+		return err
+	}
+	// Clean up the sockets dir. Issue #3962
+	// Also ignore if it doesn't exist for some reason; hence the conditional return below
+	if err := os.RemoveAll(filepath.Join(c.ociRuntime.socketsDir, sessionID)); err != nil && !os.IsNotExist(err) {
+		return err
+	}
+	return nil
 }
 
 // the path to a containers exec session bundle
diff --git a/libpod/oci_attach_linux.go b/libpod/oci_attach_linux.go
index 22afa7416..6cada0801 100644
--- a/libpod/oci_attach_linux.go
+++ b/libpod/oci_attach_linux.go
@@ -107,8 +107,6 @@ func (c *Container) attachToExec(streams *AttachStreams, keys string, resize <-c
 
 	logrus.Debugf("Attaching to container %s exec session %s", c.ID(), sessionID)
 
-	registerResizeFunc(resize, c.execBundlePath(sessionID))
-
 	// set up the socket path, such that it is the correct length and location for exec
 	socketPath := buildSocketPath(c.execAttachSocketPath(sessionID))
 
@@ -116,6 +114,7 @@ func (c *Container) attachToExec(streams *AttachStreams, keys string, resize <-c
 	if _, err := readConmonPipeData(attachFd, ""); err != nil {
 		return err
 	}
+
 	// 2: then attach
 	conn, err := net.DialUnix("unixpacket", nil, &net.UnixAddr{Name: socketPath, Net: "unixpacket"})
 	if err != nil {
@@ -127,6 +126,10 @@ func (c *Container) attachToExec(streams *AttachStreams, keys string, resize <-c
 		}
 	}()
 
+	// Register the resize func after we've read the attach socket, as we know at this point the
+	// 'ctl' file has been created in conmon
+	registerResizeFunc(resize, c.execBundlePath(sessionID))
+
 	// start listening on stdio of the process
 	receiveStdoutError, stdinDone := setupStdioChannels(streams, conn, detachKeys)
 
diff --git a/libpod/runtime_cstorage.go b/libpod/runtime_cstorage.go
index 586db5a1e..1e84aef4b 100644
--- a/libpod/runtime_cstorage.go
+++ b/libpod/runtime_cstorage.go
@@ -1,6 +1,8 @@
 package libpod
 
 import (
+	"time"
+
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
@@ -12,6 +14,8 @@ import (
 type StorageContainer struct {
 	ID              string
 	Names           []string
+	Image           string
+	CreateTime      time.Time
 	PresentInLibpod bool
 }
 
@@ -31,6 +35,8 @@ func (r *Runtime) ListStorageContainers() ([]*StorageContainer, error) {
 		storageCtr := new(StorageContainer)
 		storageCtr.ID = ctr.ID
 		storageCtr.Names = ctr.Names
+		storageCtr.Image = ctr.ImageID
+		storageCtr.CreateTime = ctr.Created
 
 		// Look up if container is in state
 		hasCtr, err := r.state.HasContainer(ctr.ID)