5 files changed, 100 insertions, 7 deletions

diff --git a/cmd/podman/system/info.go b/cmd/podman/system/info.go
index aa0a66ffc..8b36ef549 100644
--- a/cmd/podman/system/info.go
+++ b/cmd/podman/system/info.go
@@ -1,15 +1,14 @@
 package system
 
 import (
-	"encoding/json"
 	"fmt"
 	"os"
 	"text/template"
 
 	"github.com/containers/libpod/cmd/podman/registry"
 	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/ghodss/yaml"
 	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v2"
 )
 
 var (
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go
index fa1a33faa..f4b91dd78 100644
--- a/cmd/podman/system/service.go
+++ b/cmd/podman/system/service.go
@@ -2,8 +2,10 @@ package system
 
 import (
 	"fmt"
+	"net/url"
 	"os"
 	"path/filepath"
+	"syscall"
 	"time"
 
 	"github.com/containers/libpod/cmd/podman/registry"
@@ -57,7 +59,24 @@ func service(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	logrus.Infof("using API endpoint: \"%s\"", apiURI)
+	logrus.Infof("using API endpoint: '%s'", apiURI)
+
+	// Clean up any old existing unix domain socket
+	if len(apiURI) > 0 {
+		uri, err := url.Parse(apiURI)
+		if err != nil {
+			return err
+		}
+
+		// socket activation uses a unix:// socket in the shipped unit files but apiURI is coded as "" at this layer.
+		if "unix" == uri.Scheme && !registry.IsRemote() {
+			if err := syscall.Unlink(uri.Path); err != nil && !os.IsNotExist(err) {
+				return err
+			}
+			mask := syscall.Umask(0177)
+			defer syscall.Umask(mask)
+		}
+	}
 
 	opts := entities.ServiceOptions{
 		URI:     apiURI,
@@ -71,11 +90,11 @@ func service(cmd *cobra.Command, args []string) error {
 
 	logrus.Warn("This function is EXPERIMENTAL")
 	fmt.Fprintf(os.Stderr, "This function is EXPERIMENTAL.\n")
-	return registry.ContainerEngine().RestService(registry.GetContext(), opts)
+
+	return restService(opts, cmd.Flags(), registry.PodmanConfig())
 }
 
 func resolveApiURI(_url []string) (string, error) {
-
 	// When determining _*THE*_ listening endpoint --
 	// 1) User input wins always
 	// 2) systemd socket activation
@@ -83,14 +102,15 @@ func resolveApiURI(_url []string) (string, error) {
 	// 4) if varlink -- adapter.DefaultVarlinkAddress
 	// 5) lastly adapter.DefaultAPIAddress
 
-	if _url == nil {
+	if len(_url) == 0 {
 		if v, found := os.LookupEnv("PODMAN_SOCKET"); found {
+			logrus.Debugf("PODMAN_SOCKET='%s' used to determine API endpoint", v)
 			_url = []string{v}
 		}
 	}
 
 	switch {
-	case len(_url) > 0:
+	case len(_url) > 0 && _url[0] != "":
 		return _url[0], nil
 	case systemd.SocketActivated():
 		logrus.Info("using systemd socket activation to determine API endpoint")
diff --git a/cmd/podman/system/service_abi.go b/cmd/podman/system/service_abi.go
new file mode 100644
index 000000000..3da6ccfc7
--- /dev/null
+++ b/cmd/podman/system/service_abi.go
@@ -0,0 +1,57 @@
+// +build ABISupport
+
+package system
+
+import (
+	"context"
+	"net"
+	"strings"
+
+	api "github.com/containers/libpod/pkg/api/server"
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/pkg/domain/infra"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/pflag"
+)
+
+func restService(opts entities.ServiceOptions, flags *pflag.FlagSet, cfg *entities.PodmanConfig) error {
+	var (
+		listener *net.Listener
+		err      error
+	)
+
+	if opts.URI != "" {
+		fields := strings.Split(opts.URI, ":")
+		if len(fields) == 1 {
+			return errors.Errorf("%s is an invalid socket destination", opts.URI)
+		}
+		address := strings.Join(fields[1:], ":")
+		l, err := net.Listen(fields[0], address)
+		if err != nil {
+			return errors.Wrapf(err, "unable to create socket %s", opts.URI)
+		}
+		listener = &l
+	}
+
+	rt, err := infra.GetRuntime(context.Background(), flags, cfg)
+	if err != nil {
+		return err
+	}
+
+	server, err := api.NewServerWithSettings(rt, opts.Timeout, listener)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if err := server.Shutdown(); err != nil {
+			logrus.Warnf("Error when stopping API service: %s", err)
+		}
+	}()
+
+	err = server.Serve()
+	if listener != nil {
+		_ = (*listener).Close()
+	}
+	return err
+}
diff --git a/cmd/podman/system/service_unsupported.go b/cmd/podman/system/service_unsupported.go
new file mode 100644
index 000000000..95f8189f6
--- /dev/null
+++ b/cmd/podman/system/service_unsupported.go
@@ -0,0 +1,14 @@
+// +build !ABISupport
+
+package system
+
+import (
+	"errors"
+
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/spf13/pflag"
+)
+
+func restService(opts entities.ServiceOptions, flags *pflag.FlagSet, cfg *entities.PodmanConfig) error {
+	return errors.New("not supported")
+}
diff --git a/cmd/podman/system/system.go b/cmd/podman/system/system.go
index 6d8c9ebc5..2d55e8c13 100644
--- a/cmd/podman/system/system.go
+++ b/cmd/podman/system/system.go
@@ -7,6 +7,9 @@ import (
 )
 
 var (
+	// Pull in configured json library
+	json = registry.JsonLibrary()
+
 	// Command: podman _system_
 	systemCmd = &cobra.Command{
 		Use:              "system",