3 files changed, 58 insertions, 2 deletions
diff --git a/cmd/podman/build.go b/cmd/podman/build.go
index fbf85fc97..08d3edaa3 100644
--- a/cmd/podman/build.go
+++ b/cmd/podman/build.go
@@ -375,7 +375,8 @@ func buildCmd(c *cliconfig.BuildValues) error {
 		},
 		Target: c.Target,
 	}
-	return runtime.Build(getContext(), c, options, containerfiles)
+	_, _, err = runtime.Build(getContext(), c, options, containerfiles)
+	return err
 }
 
 // useLayers returns false if BUILDAH_LAYERS is set to "0" or "false"
diff --git a/cmd/podman/tree.go b/cmd/podman/tree.go
index cb1b3fc9c..566f96995 100644
--- a/cmd/podman/tree.go
+++ b/cmd/podman/tree.go
@@ -56,7 +56,7 @@ func treeCmd(c *cliconfig.TreeValues) error {
 		return errors.Wrapf(err, "error creating libpod runtime")
 	}
 	defer runtime.DeferredShutdown(false)
-	imageInfo, layerInfoMap, img, err := runtime.Tree(c)
+	imageInfo, layerInfoMap, img, err := runtime.Tree(c.InputArgs[0])
 	if err != nil {
 		return err
 	}
diff --git a/cmd/service/main.go b/cmd/service/main.go
new file mode 100644
index 000000000..0290de892
--- /dev/null
+++ b/cmd/service/main.go
@@ -0,0 +1,55 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"os"
+
+	"github.com/containers/libpod/cmd/podman/cliconfig"
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	api "github.com/containers/libpod/pkg/api/server"
+	"github.com/containers/storage/pkg/reexec"
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+)
+
+func initConfig() {
+	//	we can do more stuff in here.
+}
+
+func main() {
+	if reexec.Init() {
+		// We were invoked with a different argv[0] indicating that we
+		// had a specific job to do as a subprocess, and it's done.
+		return
+	}
+
+	cobra.OnInitialize(initConfig)
+	log.SetLevel(log.DebugLevel)
+
+	config := cliconfig.PodmanCommand{
+		Command:     &cobra.Command{},
+		InputArgs:   []string{},
+		GlobalFlags: cliconfig.MainFlags{},
+		Remote:      false,
+	}
+	// Create a single runtime for http
+	runtime, err := libpodruntime.GetRuntimeDisableFDs(context.Background(), &config)
+	if err != nil {
+		fmt.Printf("error creating libpod runtime: %s", err.Error())
+		os.Exit(1)
+	}
+	defer runtime.DeferredShutdown(false)
+
+	server, err := api.NewServer(runtime)
+	if err != nil {
+		fmt.Println(err.Error())
+		os.Exit(1)
+	}
+
+	err = server.Serve()
+	if err != nil {
+		fmt.Println(err.Error())
+		os.Exit(1)
+	}
+}