Move templates to pkg/templates

vdemeester · vdemeester · commit 04f7a03359ac · 2016-12-12T09:34:03.000+01:00
Signed-off-by: Vincent Demeester &lt;vincent@sbr.pm&gt;
diff --git a/cli/command/container/list.go b/cli/command/container/list.go
@@ -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"
 )
 
diff --git a/cli/command/formatter/formatter.go b/cli/command/formatter/formatter.go
@@ -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
diff --git a/cli/command/inspect/inspector.go b/cli/command/inspect/inspector.go
@@ -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
diff --git a/cli/command/inspect/inspector_test.go b/cli/command/inspect/inspector_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker/utils/templates"
+	"github.com/docker/docker/pkg/templates"
 )
 
 type testElement struct {
diff --git a/cli/command/system/events.go b/cli/command/system/events.go
@@ -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"
 )
 
diff --git a/cli/command/system/info.go b/cli/command/system/info.go
@@ -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"
 )
diff --git a/cli/command/system/version.go b/cli/command/system/version.go
@@ -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"
 )
 
diff --git a/daemon/logger/loggerutils/log_tag.go b/daemon/logger/loggerutils/log_tag.go
@@ -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.
diff --git a/pkg/templates/templates.go b/pkg/templates/templates.go
diff --git a/pkg/templates/templates_test.go b/pkg/templates/templates_test.go
diff --git a/profiles/apparmor/apparmor.go b/profiles/apparmor/apparmor.go
@@ -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 (

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"github.com/docker/docker/cli/command"`
`11`	`11`	`"github.com/docker/docker/cli/command/formatter"`
`12`	`12`	`"github.com/docker/docker/opts"`
`13`		`- "github.com/docker/docker/utils/templates"`
	`13`	`+ "github.com/docker/docker/pkg/templates"`
`14`	`14`	`"github.com/spf13/cobra"`
`15`	`15`	`)`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"text/tabwriter"`
`9`	`9`	`"text/template"`
`10`	`10`
`11`		`- "github.com/docker/docker/utils/templates"`
	`11`	`+ "github.com/docker/docker/pkg/templates"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// Format keys used to specify certain kinds of output formats`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`"github.com/Sirupsen/logrus"`
`11`	`11`	`"github.com/docker/docker/cli"`
`12`		`- "github.com/docker/docker/utils/templates"`
	`12`	`+ "github.com/docker/docker/pkg/templates"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`// Inspector defines an interface to implement to process elements`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"strings"`
`6`	`6`	`"testing"`
`7`	`7`
`8`		`- "github.com/docker/docker/utils/templates"`
	`8`	`+ "github.com/docker/docker/pkg/templates"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type testElement struct {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`"github.com/docker/docker/cli/command"`
`18`	`18`	`"github.com/docker/docker/opts"`
`19`	`19`	`"github.com/docker/docker/pkg/jsonlog"`
`20`		`- "github.com/docker/docker/utils/templates"`
	`20`	`+ "github.com/docker/docker/pkg/templates"`
`21`	`21`	`"github.com/spf13/cobra"`
`22`	`22`	`)`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`"github.com/docker/docker/cli/command"`
`15`	`15`	`"github.com/docker/docker/cli/debug"`
`16`	`16`	`"github.com/docker/docker/pkg/ioutils"`
`17`		`- "github.com/docker/docker/utils/templates"`
	`17`	`+ "github.com/docker/docker/pkg/templates"`
`18`	`18`	`"github.com/docker/go-units"`
`19`	`19`	`"github.com/spf13/cobra"`
`20`	`20`	`)`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"github.com/docker/docker/cli"`
`12`	`12`	`"github.com/docker/docker/cli/command"`
`13`	`13`	`"github.com/docker/docker/dockerversion"`
`14`		`- "github.com/docker/docker/utils/templates"`
	`14`	`+ "github.com/docker/docker/pkg/templates"`
`15`	`15`	`"github.com/spf13/cobra"`
`16`	`16`	`)`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"bytes"`
`5`	`5`
`6`	`6`	`"github.com/docker/docker/daemon/logger"`
`7`		`- "github.com/docker/docker/utils/templates"`
	`7`	`+ "github.com/docker/docker/pkg/templates"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`// DefaultTemplate defines the defaults template logger should use.`