1 files changed, 99 insertions, 0 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index ccbe6d4fd..a3a0a8202 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -4,9 +4,11 @@ package abi
 
 import (
 	"context"
+	"fmt"
 	"io/ioutil"
 	"strconv"
 	"strings"
+	"sync"
 
 	"github.com/containers/buildah"
 	"github.com/containers/image/v5/manifest"
@@ -14,6 +16,7 @@ import (
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/libpod/events"
 	"github.com/containers/libpod/libpod/image"
+	"github.com/containers/libpod/libpod/logs"
 	"github.com/containers/libpod/pkg/checkpoint"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/domain/infra/abi/terminal"
@@ -709,3 +712,99 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
 	}
 	return &report, nil
 }
+
+func (ic *ContainerEngine) ContainerLogs(ctx context.Context, containers []string, options entities.ContainerLogsOptions) error {
+	if options.Writer == nil {
+		return errors.New("no io.Writer set for container logs")
+	}
+
+	var wg sync.WaitGroup
+
+	ctrs, err := getContainersByContext(false, options.Latest, containers, ic.Libpod)
+	if err != nil {
+		return err
+	}
+
+	logOpts := &logs.LogOptions{
+		Multi:      len(ctrs) > 1,
+		Details:    options.Details,
+		Follow:     options.Follow,
+		Since:      options.Since,
+		Tail:       options.Tail,
+		Timestamps: options.Timestamps,
+		UseName:    options.Names,
+		WaitGroup:  &wg,
+	}
+
+	chSize := len(ctrs) * int(options.Tail)
+	if chSize <= 0 {
+		chSize = 1
+	}
+	logChannel := make(chan *logs.LogLine, chSize)
+
+	if err := ic.Libpod.Log(ctrs, logOpts, logChannel); err != nil {
+		return err
+	}
+
+	go func() {
+		wg.Wait()
+		close(logChannel)
+	}()
+
+	for line := range logChannel {
+		fmt.Fprintln(options.Writer, line.String(logOpts))
+	}
+
+	return nil
+}
+
+func (ic *ContainerEngine) ContainerCleanup(ctx context.Context, namesOrIds []string, options entities.ContainerCleanupOptions) ([]*entities.ContainerCleanupReport, error) {
+	var reports []*entities.ContainerCleanupReport
+	ctrs, err := getContainersByContext(options.All, options.Latest, namesOrIds, ic.Libpod)
+	if err != nil {
+		return nil, err
+	}
+	for _, ctr := range ctrs {
+		var err error
+		report := entities.ContainerCleanupReport{Id: ctr.ID()}
+		if options.Remove {
+			err = ic.Libpod.RemoveContainer(ctx, ctr, false, true)
+			if err != nil {
+				report.RmErr = errors.Wrapf(err, "failed to cleanup and remove container %v", ctr.ID())
+			}
+		} else {
+			err := ctr.Cleanup(ctx)
+			if err != nil {
+				report.CleanErr = errors.Wrapf(err, "failed to cleanup container %v", ctr.ID())
+			}
+		}
+
+		if options.RemoveImage {
+			_, imageName := ctr.Image()
+			ctrImage, err := ic.Libpod.ImageRuntime().NewFromLocal(imageName)
+			if err != nil {
+				report.RmiErr = err
+				reports = append(reports, &report)
+				continue
+			}
+			_, err = ic.Libpod.RemoveImage(ctx, ctrImage, false)
+			report.RmiErr = err
+		}
+		reports = append(reports, &report)
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) ContainerInit(ctx context.Context, namesOrIds []string, options entities.ContainerInitOptions) ([]*entities.ContainerInitReport, error) {
+	var reports []*entities.ContainerInitReport
+	ctrs, err := getContainersByContext(options.All, options.Latest, namesOrIds, ic.Libpod)
+	if err != nil {
+		return nil, err
+	}
+	for _, ctr := range ctrs {
+		report := entities.ContainerInitReport{Id: ctr.ID()}
+		report.Err = ctr.Init(ctx)
+		reports = append(reports, &report)
+	}
+	return reports, nil
+}