4 files changed, 20 insertions, 11 deletions
diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go
index 6b125fede..70bfd3574 100644
--- a/cmd/podman/containers/ps.go
+++ b/cmd/podman/containers/ps.go
@@ -232,7 +232,9 @@ func ps(cmd *cobra.Command, _ []string) error {
 	ns := strings.NewReplacer(".Namespaces.", ".")
 	format = ns.Replace(format)
 
-	tmpl, err := template.New("listContainers").Parse(format)
+	tmpl, err := template.New("listContainers").
+		Funcs(template.FuncMap(report.DefaultFuncs)).
+		Parse(format)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index da7f5d862..04fdeab0a 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -11,6 +11,7 @@ import (
 	buildahDefine "github.com/containers/buildah/define"
 	buildahCLI "github.com/containers/buildah/pkg/cli"
 	"github.com/containers/buildah/pkg/parse"
+	"github.com/containers/common/pkg/auth"
 	"github.com/containers/common/pkg/completion"
 	"github.com/containers/common/pkg/config"
 	encconfig "github.com/containers/ocicrypt/config"
@@ -330,6 +331,12 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
 		pullPolicy = buildahDefine.PullNever
 	}
 
+	if c.Flag("authfile").Changed {
+		if err := auth.CheckAuthFile(flags.Authfile); err != nil {
+			return nil, err
+		}
+	}
+
 	args := make(map[string]string)
 	if c.Flag("build-arg").Changed {
 		for _, arg := range flags.BuildArg {
diff --git a/cmd/podman/inspect/inspect.go b/cmd/podman/inspect/inspect.go
index 09721a2a8..351684af1 100644
--- a/cmd/podman/inspect/inspect.go
+++ b/cmd/podman/inspect/inspect.go
@@ -1,7 +1,6 @@
 package inspect
 
 import (
-	"bytes"
 	"context"
 	"encoding/json" // due to a bug in json-iterator it cannot be used here
 	"fmt"
@@ -246,15 +245,8 @@ func printJSON(data []interface{}) error {
 }
 
 func printTmpl(typ, row string, data []interface{}) error {
-	t, err := template.New(typ + " inspect").Funcs(map[string]interface{}{
-		"json": func(v interface{}) string {
-			b := &bytes.Buffer{}
-			e := registry.JSONLibrary().NewEncoder(b)
-			e.SetEscapeHTML(false)
-			_ = e.Encode(v)
-			return strings.TrimSpace(b.String())
-		},
-	}).Parse(row)
+	// We cannot use c/common/reports here, too many levels of interface{}
+	t, err := template.New(typ + " inspect").Funcs(template.FuncMap(report.DefaultFuncs)).Parse(row)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/podman/root.go b/cmd/podman/root.go
index 2b77afbeb..4527c2646 100644
--- a/cmd/podman/root.go
+++ b/cmd/podman/root.go
@@ -180,6 +180,10 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
 		os.Setenv("TMPDIR", "/var/tmp")
 	}
 
+	context := cmd.Root().LocalFlags().Lookup("context")
+	if context.Value.String() != "default" {
+		return errors.New("Podman does not support swarm, the only --context value allowed is \"default\"")
+	}
 	if !registry.IsRemote() {
 		if cmd.Flag("cpu-profile").Changed {
 			f, err := os.Create(cfg.CPUProfile)
@@ -269,6 +273,10 @@ func rootFlags(cmd *cobra.Command, opts *entities.PodmanConfig) {
 	lFlags.StringVar(&opts.URI, urlFlagName, uri, "URL to access Podman service (CONTAINER_HOST)")
 	_ = cmd.RegisterFlagCompletionFunc(urlFlagName, completion.AutocompleteDefault)
 
+	// Context option added just for compatibility with DockerCLI.
+	lFlags.String("context", "default", "Name of the context to use to connect to the daemon (This flag is a NOOP and provided solely for scripting compatibility.)")
+	_ = lFlags.MarkHidden("context")
+
 	identityFlagName := "identity"
 	lFlags.StringVar(&opts.Identity, identityFlagName, ident, "path to SSH identity file, (CONTAINER_SSHKEY)")
 	_ = cmd.RegisterFlagCompletionFunc(identityFlagName, completion.AutocompleteDefault)