Merge pull request #839 from baude/varlinkcreatefixes

varlink build

3 files changed, 206 insertions, 15 deletions

diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go
index 41263b52b..2b84151a9 100644
--- a/pkg/varlinkapi/containers.go
+++ b/pkg/varlinkapi/containers.go
@@ -182,6 +182,9 @@ func (i *LibpodAPI) GetContainerLogs(call ioprojectatomicpodman.VarlinkCall, nam
 			logs = append(logs, line)
 		}
 	}
+
+	call.Continues = false
+
 	return call.ReplyGetContainerLogs(logs)
 }
 
diff --git a/pkg/varlinkapi/containers_create.go b/pkg/varlinkapi/containers_create.go
index 24edb05b8..40bd92e9a 100644
--- a/pkg/varlinkapi/containers_create.go
+++ b/pkg/varlinkapi/containers_create.go
@@ -22,14 +22,6 @@ import (
 
 // CreateContainer ...
 func (i *LibpodAPI) CreateContainer(call ioprojectatomicpodman.VarlinkCall, config ioprojectatomicpodman.Create) error {
-	//mappings, err := util.ParseIDMapping(config.Uidmap, config.Gidmap, config.Subuidmap, config.Subgidmap)
-	//if err != nil {
-	//	return err
-	//}
-	//storageOpts := storage.DefaultStoreOptions
-	//storageOpts.UIDMap = mappings.UIDMap
-	//storageOpts.GIDMap = mappings.GIDMap
-
 	runtime, err := libpodruntime.GetRuntime(i.Cli)
 	if err != nil {
 		return call.ReplyRuntimeError(err.Error())
@@ -120,7 +112,7 @@ func varlinkCreateToCreateConfig(ctx context.Context, create ioprojectatomicpodm
 	if len(inputCommand) > 0 {
 		// User command overrides data CMD
 		command = append(command, inputCommand...)
-	} else if len(data.ContainerConfig.Cmd) > 0 && len(create.Entrypoint) > 0 {
+	} else if len(data.ContainerConfig.Cmd) > 0 && len(command) == 0 {
 		// If not user command, add CMD
 		command = append(command, data.ContainerConfig.Cmd...)
 	}
diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go
index c536e856a..551eb781c 100644
--- a/pkg/varlinkapi/images.go
+++ b/pkg/varlinkapi/images.go
@@ -3,12 +3,21 @@ package varlinkapi
 import (
 	"encoding/json"
 	"fmt"
+	"io"
+	"path/filepath"
+	"strings"
+	"time"
 
+	"bytes"
 	"github.com/containers/image/docker"
+	"github.com/containers/image/types"
+	"github.com/docker/go-units"
 	"github.com/opencontainers/image-spec/specs-go/v1"
+	"github.com/pkg/errors"
 	"github.com/projectatomic/buildah"
+	"github.com/projectatomic/buildah/imagebuildah"
 	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	ioprojectatomicpodman "github.com/projectatomic/libpod/cmd/podman/varlink"
+	"github.com/projectatomic/libpod/cmd/podman/varlink"
 	"github.com/projectatomic/libpod/libpod"
 	"github.com/projectatomic/libpod/libpod/image"
 	sysreg "github.com/projectatomic/libpod/pkg/registries"
@@ -28,9 +37,9 @@ func (i *LibpodAPI) ListImages(call ioprojectatomicpodman.VarlinkCall) error {
 	}
 	var imageList []ioprojectatomicpodman.ImageInList
 	for _, image := range images {
-		//size, _:= image.Size(getContext())
 		labels, _ := image.Labels(getContext())
 		containers, _ := image.Containers()
+		size, _ := image.Size(getContext())
 
 		i := ioprojectatomicpodman.ImageInList{
 			Id:          image.ID(),
@@ -38,7 +47,7 @@ func (i *LibpodAPI) ListImages(call ioprojectatomicpodman.VarlinkCall) error {
 			RepoTags:    image.Names(),
 			RepoDigests: image.RepoDigests(),
 			Created:     image.Created().String(),
-			//Size: size,
+			Size:        int64(*size),
 			VirtualSize: image.VirtualSize,
 			Containers:  int64(len(containers)),
 			Labels:      labels,
@@ -48,10 +57,197 @@ func (i *LibpodAPI) ListImages(call ioprojectatomicpodman.VarlinkCall) error {
 	return call.ReplyListImages(imageList)
 }
 
+// GetImage returns a single image in the form of a ImageInList
+func (i *LibpodAPI) GetImage(call ioprojectatomicpodman.VarlinkCall, name string) error {
+	runtime, err := libpodruntime.GetRuntime(i.Cli)
+	if err != nil {
+		return call.ReplyRuntimeError(err.Error())
+	}
+	newImage, err := runtime.ImageRuntime().NewFromLocal(name)
+	if err != nil {
+		return call.ReplyErrorOccurred(err.Error())
+	}
+	labels, err := newImage.Labels(getContext())
+	if err != nil {
+		return err
+	}
+	containers, err := newImage.Containers()
+	if err != nil {
+		return err
+	}
+	size, err := newImage.Size(getContext())
+	if err != nil {
+		return err
+	}
+
+	il := ioprojectatomicpodman.ImageInList{
+		Id:          newImage.ID(),
+		ParentId:    newImage.Parent,
+		RepoTags:    newImage.Names(),
+		RepoDigests: newImage.RepoDigests(),
+		Created:     newImage.Created().String(),
+		Size:        int64(*size),
+		VirtualSize: newImage.VirtualSize,
+		Containers:  int64(len(containers)),
+		Labels:      labels,
+	}
+	return call.ReplyGetImage(il)
+}
+
 // BuildImage ...
-// TODO Waiting for buildah to be vendored into libpod to do this only one
-func (i *LibpodAPI) BuildImage(call ioprojectatomicpodman.VarlinkCall) error {
-	return call.ReplyMethodNotImplemented("BuildImage")
+func (i *LibpodAPI) BuildImage(call ioprojectatomicpodman.VarlinkCall, config ioprojectatomicpodman.BuildInfo) error {
+	var (
+		memoryLimit int64
+		memorySwap  int64
+	)
+
+	runtime, err := libpodruntime.GetRuntime(i.Cli)
+	if err != nil {
+		return call.ReplyRuntimeError(err.Error())
+	}
+	defer runtime.Shutdown(false)
+
+	systemContext := types.SystemContext{}
+	dockerfiles := config.Dockerfile
+	contextDir := ""
+
+	for i := range dockerfiles {
+		if strings.HasPrefix(dockerfiles[i], "http://") ||
+			strings.HasPrefix(dockerfiles[i], "https://") ||
+			strings.HasPrefix(dockerfiles[i], "git://") ||
+			strings.HasPrefix(dockerfiles[i], "github.com/") {
+			continue
+		}
+		absFile, err := filepath.Abs(dockerfiles[i])
+		if err != nil {
+			return errors.Wrapf(err, "error determining path to file %q", dockerfiles[i])
+		}
+		contextDir = filepath.Dir(absFile)
+		dockerfiles[i], err = filepath.Rel(contextDir, absFile)
+		if err != nil {
+			return errors.Wrapf(err, "error determining path to file %q", dockerfiles[i])
+		}
+		break
+	}
+
+	pullPolicy := imagebuildah.PullNever
+	if config.Pull {
+		pullPolicy = imagebuildah.PullIfMissing
+	}
+
+	if config.Pull_always {
+		pullPolicy = imagebuildah.PullAlways
+	}
+
+	format := "oci"
+	if config.Image_format != "" {
+		format = config.Image_format
+	}
+
+	if strings.HasPrefix(format, "oci") {
+		format = imagebuildah.OCIv1ImageFormat
+	} else if strings.HasPrefix(format, "docker") {
+		format = imagebuildah.Dockerv2ImageFormat
+	} else {
+		return call.ReplyErrorOccurred(fmt.Sprintf("unrecognized image type %q", format))
+	}
+
+	if config.Memory != "" {
+		memoryLimit, err = units.RAMInBytes(config.Memory)
+		if err != nil {
+			return call.ReplyErrorOccurred(err.Error())
+		}
+	}
+
+	if config.Memory_swap != "" {
+		memorySwap, err = units.RAMInBytes(config.Memory_swap)
+		if err != nil {
+			return call.ReplyErrorOccurred(err.Error())
+		}
+	}
+
+	output := bytes.NewBuffer([]byte{})
+	commonOpts := &buildah.CommonBuildOptions{
+		AddHost:      config.Add_hosts,
+		CgroupParent: config.Cgroup_parent,
+		CPUPeriod:    uint64(config.Cpu_period),
+		CPUQuota:     config.Cpu_quota,
+		CPUSetCPUs:   config.Cpuset_cpus,
+		CPUSetMems:   config.Cpuset_mems,
+		Memory:       memoryLimit,
+		MemorySwap:   memorySwap,
+		ShmSize:      config.Shm_size,
+		Ulimit:       config.Ulimit,
+		Volumes:      config.Volume,
+	}
+
+	options := imagebuildah.BuildOptions{
+		ContextDirectory: contextDir,
+		PullPolicy:       pullPolicy,
+		Compression:      imagebuildah.Gzip,
+		Quiet:            false,
+		//SignaturePolicyPath:
+		Args: config.Build_args,
+		//Output:
+		AdditionalTags: config.Tags,
+		//Runtime: runtime.
+		//RuntimeArgs: ,
+		OutputFormat:    format,
+		SystemContext:   &systemContext,
+		CommonBuildOpts: commonOpts,
+		Squash:          config.Squash,
+		Labels:          config.Label,
+		Annotations:     config.Annotations,
+		ReportWriter:    output,
+	}
+
+	if call.WantsMore() {
+		call.Continues = true
+	}
+
+	c := build(runtime, options, config.Dockerfile)
+	var log []string
+	done := false
+	for {
+		line, err := output.ReadString('\n')
+		if err == nil {
+			log = append(log, line)
+			continue
+		} else if err == io.EOF {
+			select {
+			case err := <-c:
+				if err != nil {
+					return call.ReplyErrorOccurred(err.Error())
+				}
+				done = true
+			default:
+				if !call.WantsMore() {
+					time.Sleep(1 * time.Second)
+					break
+				}
+				call.ReplyBuildImage(log)
+				log = []string{}
+			}
+		} else {
+			return call.ReplyErrorOccurred(err.Error())
+		}
+		if done {
+			break
+		}
+	}
+	call.Continues = false
+	return call.ReplyBuildImage(log)
+}
+
+func build(runtime *libpod.Runtime, options imagebuildah.BuildOptions, dockerfiles []string) chan error {
+	c := make(chan error)
+	go func() {
+		err := runtime.Build(getContext(), options, dockerfiles...)
+		c <- err
+		close(c)
+	}()
+
+	return c
 }
 
 // CreateImage ...