4 files changed, 47 insertions, 10 deletions
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go
index 5c33467a7..bff93cc9e 100644
--- a/pkg/adapter/containers.go
+++ b/pkg/adapter/containers.go
@@ -437,7 +437,7 @@ func (r *LocalRuntime) Run(ctx context.Context, c *cliconfig.RunValues, exitCode
 	}
 
 	if c.IsSet("rm") {
-		if err := r.Runtime.RemoveContainer(ctx, ctr, false, false); err != nil {
+		if err := r.Runtime.RemoveContainer(ctx, ctr, false, true); err != nil {
 			logrus.Errorf("Error removing container %s: %v", ctr.ID(), err)
 		}
 	}
@@ -1053,7 +1053,7 @@ func (r *LocalRuntime) CleanupContainers(ctx context.Context, cli *cliconfig.Cle
 
 // Only used when cleaning up containers
 func removeContainer(ctx context.Context, ctr *libpod.Container, runtime *LocalRuntime) error {
-	if err := runtime.RemoveContainer(ctx, ctr, false, false); err != nil {
+	if err := runtime.RemoveContainer(ctx, ctr, false, true); err != nil {
 		return errors.Wrapf(err, "failed to cleanup and remove container %v", ctr.ID())
 	}
 	return nil
diff --git a/pkg/adapter/containers_remote.go b/pkg/adapter/containers_remote.go
index f7cb28b0c..f4e83a975 100644
--- a/pkg/adapter/containers_remote.go
+++ b/pkg/adapter/containers_remote.go
@@ -1092,6 +1092,7 @@ func configureVarlinkAttachStdio(reader *bufio.Reader, writer *bufio.Writer, std
 	// These are the special writers that encode input from the client.
 	varlinkStdinWriter := virtwriter.NewVirtWriteCloser(writer, virtwriter.ToStdin)
 	varlinkResizeWriter := virtwriter.NewVirtWriteCloser(writer, virtwriter.TerminalResize)
+	varlinkHangupWriter := virtwriter.NewVirtWriteCloser(writer, virtwriter.HangUpFromClient)
 
 	go func() {
 		// Read from the wire and direct to stdout or stderr
@@ -1117,7 +1118,6 @@ func configureVarlinkAttachStdio(reader *bufio.Reader, writer *bufio.Writer, std
 			}
 		}
 	}()
-
 	if stdin != nil {
 		// Takes stdinput and sends it over the wire after being encoded
 		go func() {
@@ -1126,7 +1126,12 @@ func configureVarlinkAttachStdio(reader *bufio.Reader, writer *bufio.Writer, std
 				sendGenericError(ecChan)
 				errChan <- err
 			}
-
+			_, err := varlinkHangupWriter.Write([]byte("EOF"))
+			if err != nil {
+				logrus.Errorf("unable to notify server to hangup: %q", err)
+			}
+			err = varlinkStdinWriter.Close()
+			errChan <- err
 		}()
 	}
 	return errChan
diff --git a/pkg/adapter/runtime.go b/pkg/adapter/runtime.go
index 0706d4b6a..84d43c337 100644
--- a/pkg/adapter/runtime.go
+++ b/pkg/adapter/runtime.go
@@ -186,7 +186,12 @@ func (r *LocalRuntime) CreateVolume(ctx context.Context, c *cliconfig.VolumeCrea
 	}
 
 	if len(opts) != 0 {
-		options = append(options, libpod.WithVolumeOptions(opts))
+		// We need to process -o for uid, gid
+		parsedOptions, err := shared.ParseVolumeOptions(opts)
+		if err != nil {
+			return "", err
+		}
+		options = append(options, parsedOptions...)
 	}
 	newVolume, err := r.NewVolume(ctx, options...)
 	if err != nil {
diff --git a/pkg/adapter/runtime_remote.go b/pkg/adapter/runtime_remote.go
index 3b808a2ee..870e86896 100644
--- a/pkg/adapter/runtime_remote.go
+++ b/pkg/adapter/runtime_remote.go
@@ -659,12 +659,39 @@ func (r *LocalRuntime) Push(ctx context.Context, srcName, destination, manifestM
 }
 
 // InspectVolumes returns a slice of volumes based on an arg list or --all
-func (r *LocalRuntime) InspectVolumes(ctx context.Context, c *cliconfig.VolumeInspectValues) ([]*Volume, error) {
-	reply, err := iopodman.GetVolumes().Call(r.Conn, c.InputArgs, c.All)
-	if err != nil {
-		return nil, err
+func (r *LocalRuntime) InspectVolumes(ctx context.Context, c *cliconfig.VolumeInspectValues) ([]*libpod.InspectVolumeData, error) {
+	var (
+		inspectData []*libpod.InspectVolumeData
+		volumes     []string
+	)
+
+	if c.All {
+		allVolumes, err := r.Volumes(ctx)
+		if err != nil {
+			return nil, err
+		}
+		for _, vol := range allVolumes {
+			volumes = append(volumes, vol.Name())
+		}
+	} else {
+		for _, arg := range c.InputArgs {
+			volumes = append(volumes, arg)
+		}
 	}
-	return varlinkVolumeToVolume(r, reply), nil
+
+	for _, vol := range volumes {
+		jsonString, err := iopodman.InspectVolume().Call(r.Conn, vol)
+		if err != nil {
+			return nil, err
+		}
+		inspectJSON := new(libpod.InspectVolumeData)
+		if err := json.Unmarshal([]byte(jsonString), inspectJSON); err != nil {
+			return nil, errors.Wrapf(err, "error unmarshalling inspect JSON for volume %s", vol)
+		}
+		inspectData = append(inspectData, inspectJSON)
+	}
+
+	return inspectData, nil
 }
 
 // Volumes returns a slice of adapter.volumes based on information about libpod