@@ -10,7 +10,7 @@ import (

 	"github.com/docker/docker/cli/command"

 	"github.com/docker/docker/cli/command/formatter"

 	"github.com/docker/docker/opts"

-	"github.com/docker/docker/utils/templates"

+	"github.com/docker/docker/pkg/templates"

 	"github.com/spf13/cobra"

 )

@@ -8,7 +8,7 @@ import (

 	"text/tabwriter"

 	"text/template"

-	"github.com/docker/docker/utils/templates"

+	"github.com/docker/docker/pkg/templates"

 )

 // Format keys used to specify certain kinds of output formats

@@ -9,7 +9,7 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/cli"

-	"github.com/docker/docker/utils/templates"

+	"github.com/docker/docker/pkg/templates"

 )

 // Inspector defines an interface to implement to process elements

@@ -5,7 +5,7 @@ import (

 	"strings"

 	"testing"

-	"github.com/docker/docker/utils/templates"

+	"github.com/docker/docker/pkg/templates"

 )

 type testElement struct {

@@ -17,7 +17,7 @@ import (

 	"github.com/docker/docker/cli/command"

 	"github.com/docker/docker/opts"

 	"github.com/docker/docker/pkg/jsonlog"

-	"github.com/docker/docker/utils/templates"

+	"github.com/docker/docker/pkg/templates"

 	"github.com/spf13/cobra"

 )

@@ -14,7 +14,7 @@ import (

 	"github.com/docker/docker/cli/command"

 	"github.com/docker/docker/cli/debug"

 	"github.com/docker/docker/pkg/ioutils"

-	"github.com/docker/docker/utils/templates"

+	"github.com/docker/docker/pkg/templates"

 	"github.com/docker/go-units"

 	"github.com/spf13/cobra"

 )

@@ -11,7 +11,7 @@ import (

 	"github.com/docker/docker/cli"

 	"github.com/docker/docker/cli/command"

 	"github.com/docker/docker/dockerversion"

-	"github.com/docker/docker/utils/templates"

+	"github.com/docker/docker/pkg/templates"

 	"github.com/spf13/cobra"

 )

@@ -4,7 +4,7 @@ import (

 	"bytes"

 	"github.com/docker/docker/daemon/logger"

-	"github.com/docker/docker/utils/templates"

+	"github.com/docker/docker/pkg/templates"

 )

 // DefaultTemplate defines the defaults template logger should use.

new file mode 100644

@@ -0,0 +1,42 @@

+package templates

+

+import (

+	"encoding/json"

+	"strings"

+	"text/template"

+)

+

+// basicFunctions are the set of initial

+// functions provided to every template.

+var basicFunctions = template.FuncMap{

+	"json": func(v interface{}) string {

+		a, _ := json.Marshal(v)

+		return string(a)

+	},

+	"split": strings.Split,

+	"join":  strings.Join,

+	"title": strings.Title,

+	"lower": strings.ToLower,

+	"upper": strings.ToUpper,

+	"pad":   padWithSpace,

+}

+

+// Parse creates a new annonymous template with the basic functions

+// and parses the given format.

+func Parse(format string) (*template.Template, error) {

+	return NewParse("", format)

+}

+

+// NewParse creates a new tagged template with the basic functions

+// and parses the given format.

+func NewParse(tag, format string) (*template.Template, error) {

+	return template.New(tag).Funcs(basicFunctions).Parse(format)

+}

+

+// padWithSpace adds whitespace to the input if the input is non-empty

+func padWithSpace(source string, prefix, suffix int) string {

+	if source == "" {

+		return source

+	}

+	return strings.Repeat(" ", prefix) + source + strings.Repeat(" ", suffix)

+}

new file mode 100644

@@ -0,0 +1,38 @@

+package templates

+

+import (

+	"bytes"

+	"testing"

+)

+

+func TestParseStringFunctions(t *testing.T) {

+	tm, err := Parse(`{{join (split . ":") "/"}}`)

+	if err != nil {

+		t.Fatal(err)

+	}

+

+	var b bytes.Buffer

+	if err := tm.Execute(&b, "text:with:colon"); err != nil {

+		t.Fatal(err)

+	}

+	want := "text/with/colon"

+	if b.String() != want {

+		t.Fatalf("expected %s, got %s", want, b.String())

+	}

+}

+

+func TestNewParse(t *testing.T) {

+	tm, err := NewParse("foo", "this is a {{ . }}")

+	if err != nil {

+		t.Fatal(err)

+	}

+

+	var b bytes.Buffer

+	if err := tm.Execute(&b, "string"); err != nil {

+		t.Fatal(err)

+	}

+	want := "this is a string"

+	if b.String() != want {

+		t.Fatalf("expected %s, got %s", want, b.String())

+	}

+}

@@ -11,7 +11,7 @@ import (

 	"strings"

 	"github.com/docker/docker/pkg/aaparser"

-	"github.com/docker/docker/utils/templates"

+	"github.com/docker/docker/pkg/templates"

 )

 var (

deleted file mode 100644

@@ -1,42 +0,0 @@

-package templates

-

-import (

-	"encoding/json"

-	"strings"

-	"text/template"

-)

-

-// basicFunctions are the set of initial

-// functions provided to every template.

-var basicFunctions = template.FuncMap{

-	"json": func(v interface{}) string {

-		a, _ := json.Marshal(v)

-		return string(a)

-	},

-	"split": strings.Split,

-	"join":  strings.Join,

-	"title": strings.Title,

-	"lower": strings.ToLower,

-	"upper": strings.ToUpper,

-	"pad":   padWithSpace,

-}

-

-// Parse creates a new annonymous template with the basic functions

-// and parses the given format.

-func Parse(format string) (*template.Template, error) {

-	return NewParse("", format)

-}

-

-// NewParse creates a new tagged template with the basic functions

-// and parses the given format.

-func NewParse(tag, format string) (*template.Template, error) {

-	return template.New(tag).Funcs(basicFunctions).Parse(format)

-}

-

-// padWithSpace adds whitespace to the input if the input is non-empty

-func padWithSpace(source string, prefix, suffix int) string {

-	if source == "" {

-		return source

-	}

-	return strings.Repeat(" ", prefix) + source + strings.Repeat(" ", suffix)

-}

deleted file mode 100644

@@ -1,38 +0,0 @@

-package templates

-

-import (

-	"bytes"

-	"testing"

-)

-

-func TestParseStringFunctions(t *testing.T) {

-	tm, err := Parse(`{{join (split . ":") "/"}}`)

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	var b bytes.Buffer

-	if err := tm.Execute(&b, "text:with:colon"); err != nil {

-		t.Fatal(err)

-	}

-	want := "text/with/colon"

-	if b.String() != want {

-		t.Fatalf("expected %s, got %s", want, b.String())

-	}

-}

-

-func TestNewParse(t *testing.T) {

-	tm, err := NewParse("foo", "this is a {{ . }}")

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	var b bytes.Buffer

-	if err := tm.Execute(&b, "string"); err != nil {

-		t.Fatal(err)

-	}

-	want := "this is a string"

-	if b.String() != want {

-		t.Fatalf("expected %s, got %s", want, b.String())

-	}

-}