1 files changed, 24 insertions, 7 deletions

diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index a77b18ce1..4c3389418 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -217,12 +217,23 @@ func (ic *ContainerEngine) ContainerKill(ctx context.Context, namesOrIds []strin
 }
 func (ic *ContainerEngine) ContainerRestart(ctx context.Context, namesOrIds []string, options entities.RestartOptions) ([]*entities.RestartReport, error) {
 	var (
+		ctrs    []*libpod.Container
+		err     error
 		reports []*entities.RestartReport
 	)
-	ctrs, err := getContainersByContext(options.All, options.Latest, namesOrIds, ic.Libpod)
-	if err != nil {
-		return nil, err
+
+	if options.Running {
+		ctrs, err = ic.Libpod.GetRunningContainers()
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		ctrs, err = getContainersByContext(options.All, options.Latest, namesOrIds, ic.Libpod)
+		if err != nil {
+			return nil, err
+		}
 	}
+
 	for _, con := range ctrs {
 		timeout := con.StopTimeout()
 		if options.Timeout != nil {
@@ -481,7 +492,7 @@ func (ic *ContainerEngine) ContainerCreate(ctx context.Context, s *specgen.SpecG
 	if err := generate.CompleteSpec(ctx, ic.Libpod, s); err != nil {
 		return nil, err
 	}
-	ctr, err := generate.MakeContainer(ic.Libpod, s)
+	ctr, err := generate.MakeContainer(ctx, ic.Libpod, s)
 	if err != nil {
 		return nil, err
 	}
@@ -669,7 +680,7 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
 	if err := generate.CompleteSpec(ctx, ic.Libpod, opts.Spec); err != nil {
 		return nil, err
 	}
-	ctr, err := generate.MakeContainer(ic.Libpod, opts.Spec)
+	ctr, err := generate.MakeContainer(ctx, ic.Libpod, opts.Spec)
 	if err != nil {
 		return nil, err
 	}
@@ -837,7 +848,13 @@ func (ic *ContainerEngine) ContainerInit(ctx context.Context, namesOrIds []strin
 	}
 	for _, ctr := range ctrs {
 		report := entities.ContainerInitReport{Id: ctr.ID()}
-		report.Err = ctr.Init(ctx)
+		err := ctr.Init(ctx)
+
+		// If we're initializing all containers, ignore invalid state errors
+		if options.All && errors.Cause(err) == define.ErrCtrStateInvalid {
+			err = nil
+		}
+		report.Err = err
 		reports = append(reports, &report)
 	}
 	return reports, nil
@@ -932,7 +949,7 @@ func (ic *ContainerEngine) Config(_ context.Context) (*config.Config, error) {
 
 func (ic *ContainerEngine) ContainerPort(ctx context.Context, nameOrId string, options entities.ContainerPortOptions) ([]*entities.ContainerPortReport, error) {
 	var reports []*entities.ContainerPortReport
-	ctrs, err := getContainersByContext(options.All, false, []string{nameOrId}, ic.Libpod)
+	ctrs, err := getContainersByContext(options.All, options.Latest, []string{nameOrId}, ic.Libpod)
 	if err != nil {
 		return nil, err
 	}