Merge pull request #9285 from jwhonce/issues/8773-v3.0.0

Add default template functions

2 files changed, 5 insertions, 11 deletions

diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go
index 31f44d92f..0b5bd22fc 100644
--- a/cmd/podman/containers/ps.go
+++ b/cmd/podman/containers/ps.go
@@ -223,7 +223,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/inspect/inspect.go b/cmd/podman/inspect/inspect.go
index 76613ae71..7708fde3c 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
 	}