5 files changed, 3 insertions, 70 deletions
diff --git a/pkg/domain/infra/abi/system_novalink.go b/pkg/domain/infra/abi/system_novalink.go
deleted file mode 100644
index 3518e9db6..000000000
--- a/pkg/domain/infra/abi/system_novalink.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build !varlink
-
-package abi
-
-import (
-	"context"
-
-	"github.com/containers/podman/v2/pkg/domain/entities"
-	"github.com/pkg/errors"
-)
-
-func (ic *ContainerEngine) VarlinkService(_ context.Context, opts entities.ServiceOptions) error {
-	return errors.Errorf("varlink is not supported")
-}
diff --git a/pkg/domain/infra/abi/system_varlink.go b/pkg/domain/infra/abi/system_varlink.go
deleted file mode 100644
index ead84fc84..000000000
--- a/pkg/domain/infra/abi/system_varlink.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// +build varlink
-
-package abi
-
-import (
-	"context"
-
-	"github.com/containers/podman/v2/pkg/domain/entities"
-	iopodman "github.com/containers/podman/v2/pkg/varlink"
-	iopodmanAPI "github.com/containers/podman/v2/pkg/varlinkapi"
-	"github.com/containers/podman/v2/version"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	"github.com/varlink/go/varlink"
-)
-
-func (ic *ContainerEngine) VarlinkService(_ context.Context, opts entities.ServiceOptions) error {
-	var varlinkInterfaces = []*iopodman.VarlinkInterface{
-		iopodmanAPI.New(opts.Command, ic.Libpod),
-	}
-
-	service, err := varlink.NewService(
-		"Atomic",
-		"podman",
-		version.Version.String(),
-		"https://github.com/containers/podman",
-	)
-	if err != nil {
-		return errors.Wrapf(err, "unable to create new varlink service")
-	}
-
-	for _, i := range varlinkInterfaces {
-		if err := service.RegisterInterface(i); err != nil {
-			return errors.Errorf("unable to register varlink interface %v", i)
-		}
-	}
-
-	// Run the varlink server at the given address
-	if err = service.Listen(opts.URI, opts.Timeout); err != nil {
-		switch err.(type) {
-		case varlink.ServiceTimeoutError:
-			logrus.Infof("varlink service expired (use --time to increase session time beyond %s ms, 0 means never timeout)", opts.Timeout.String())
-			return nil
-		default:
-			return errors.Wrapf(err, "unable to start varlink service")
-		}
-	}
-	return nil
-}
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 1aa5afbe7..63677719b 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -235,7 +235,7 @@ func (ic *ContainerEngine) ContainerCommit(ctx context.Context, nameOrID string,
 	if len(options.ImageName) > 0 {
 		ref, err := reference.Parse(options.ImageName)
 		if err != nil {
-			return nil, err
+			return nil, errors.Wrapf(err, "error parsing reference %q", options.ImageName)
 		}
 		if t, ok := ref.(reference.Tagged); ok {
 			tag = t.Tag()
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go
index 61ac2141c..09931de12 100644
--- a/pkg/domain/infra/tunnel/images.go
+++ b/pkg/domain/infra/tunnel/images.go
@@ -119,7 +119,7 @@ func (ir *ImageEngine) Tag(ctx context.Context, nameOrID string, tags []string,
 		)
 		ref, err := reference.Parse(newTag)
 		if err != nil {
-			return err
+			return errors.Wrapf(err, "error parsing reference %q", newTag)
 		}
 		if t, ok := ref.(reference.Tagged); ok {
 			tag = t.Tag()
@@ -148,7 +148,7 @@ func (ir *ImageEngine) Untag(ctx context.Context, nameOrID string, tags []string
 		)
 		ref, err := reference.Parse(newTag)
 		if err != nil {
-			return err
+			return errors.Wrapf(err, "error parsing reference %q", newTag)
 		}
 		if t, ok := ref.(reference.Tagged); ok {
 			tag = t.Tag()
diff --git a/pkg/domain/infra/tunnel/system.go b/pkg/domain/infra/tunnel/system.go
index c276e15c5..f3e8fbcb1 100644
--- a/pkg/domain/infra/tunnel/system.go
+++ b/pkg/domain/infra/tunnel/system.go
@@ -14,10 +14,6 @@ func (ic *ContainerEngine) Info(ctx context.Context) (*define.Info, error) {
 	return system.Info(ic.ClientCxt)
 }
 
-func (ic *ContainerEngine) VarlinkService(_ context.Context, _ entities.ServiceOptions) error {
-	panic(errors.New("varlink service is not supported when tunneling"))
-}
-
 func (ic *ContainerEngine) SetupRootless(_ context.Context, cmd *cobra.Command) error {
 	panic(errors.New("rootless engine mode is not supported when tunneling"))
 }