podman-remote ps --external --pod --sort do not work.

Fixup the bindings and the handling of the --external --por and --sort
flags.

The --storage option was renamed --external, make sure we use
external up and down the stack.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

2 files changed, 24 insertions, 11 deletions

diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go
index 4c1bd6a7d..2c32f792f 100644
--- a/pkg/domain/entities/containers.go
+++ b/pkg/domain/entities/containers.go
@@ -297,8 +297,8 @@ type ContainerListOptions struct {
 	Pod       bool
 	Quiet     bool
 	Size      bool
+	External  bool
 	Sort      string
-	Storage   bool
 	Sync      bool
 	Watch     uint
 }
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 524b29553..0c61714c3 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -173,19 +173,32 @@ func (ic *ContainerEngine) ContainerRestart(ctx context.Context, namesOrIds []st
 }
 
 func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string, opts entities.RmOptions) ([]*entities.RmReport, error) {
-	ctrs, err := getContainersByContext(ic.ClientCtx, opts.All, opts.Ignore, namesOrIds)
-	if err != nil {
-		return nil, err
-	}
 	// TODO there is no endpoint for container eviction.  Need to discuss
-	reports := make([]*entities.RmReport, 0, len(ctrs))
-	options := new(containers.RemoveOptions).WithForce(opts.Force).WithVolumes(opts.Volumes)
-	for _, c := range ctrs {
+	options := new(containers.RemoveOptions).WithForce(opts.Force).WithVolumes(opts.Volumes).WithIgnore(opts.Ignore)
+
+	if opts.All {
+		ctrs, err := getContainersByContext(ic.ClientCtx, opts.All, opts.Ignore, namesOrIds)
+		if err != nil {
+			return nil, err
+		}
+		reports := make([]*entities.RmReport, 0, len(ctrs))
+		for _, c := range ctrs {
+			reports = append(reports, &entities.RmReport{
+				Id:  c.ID,
+				Err: containers.Remove(ic.ClientCtx, c.ID, options),
+			})
+		}
+		return reports, nil
+	}
+
+	reports := make([]*entities.RmReport, 0, len(namesOrIds))
+	for _, name := range namesOrIds {
 		reports = append(reports, &entities.RmReport{
-			Id:  c.ID,
-			Err: containers.Remove(ic.ClientCtx, c.ID, options),
+			Id:  name,
+			Err: containers.Remove(ic.ClientCtx, name, options),
 		})
 	}
+
 	return reports, nil
 }
 
@@ -601,7 +614,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 
 func (ic *ContainerEngine) ContainerList(ctx context.Context, opts entities.ContainerListOptions) ([]entities.ListContainer, error) {
 	options := new(containers.ListOptions).WithFilters(opts.Filters).WithAll(opts.All).WithLast(opts.Last)
-	options.WithNamespace(opts.Namespace).WithSize(opts.Size).WithSync(opts.Sync)
+	options.WithNamespace(opts.Namespace).WithSize(opts.Size).WithSync(opts.Sync).WithExternal(opts.External)
 	return containers.List(ic.ClientCtx, options)
 }