From 57d5fc9bfa90e90ae45eb304ec678305f1ed15cc Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Mon, 12 Dec 2016 09:34:03 +0100 Subject: [PATCH] Move templates to pkg/templates Signed-off-by: Vincent Demeester Upstream-commit: 04f7a03359ac009ad2cd548fa93124a66e880ae5 Component: engine --- components/engine/cli/command/container/list.go | 2 +- components/engine/cli/command/formatter/formatter.go | 2 +- components/engine/cli/command/inspect/inspector.go | 2 +- components/engine/cli/command/inspect/inspector_test.go | 2 +- components/engine/cli/command/system/events.go | 2 +- components/engine/cli/command/system/info.go | 2 +- components/engine/cli/command/system/version.go | 2 +- components/engine/daemon/logger/loggerutils/log_tag.go | 2 +- components/engine/{utils => pkg}/templates/templates.go | 0 components/engine/{utils => pkg}/templates/templates_test.go | 0 components/engine/profiles/apparmor/apparmor.go | 2 +- 11 files changed, 9 insertions(+), 9 deletions(-) rename components/engine/{utils => pkg}/templates/templates.go (100%) rename components/engine/{utils => pkg}/templates/templates_test.go (100%) diff --git a/components/engine/cli/command/container/list.go b/components/engine/cli/command/container/list.go index 60c2462986..5104e9b6c0 100644 --- a/components/engine/cli/command/container/list.go +++ b/components/engine/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/components/engine/cli/command/formatter/formatter.go b/components/engine/cli/command/formatter/formatter.go index e859a1ca26..4345f7c3bc 100644 --- a/components/engine/cli/command/formatter/formatter.go +++ b/components/engine/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/components/engine/cli/command/inspect/inspector.go b/components/engine/cli/command/inspect/inspector.go index 1d81643fb1..1e53671f84 100644 --- a/components/engine/cli/command/inspect/inspector.go +++ b/components/engine/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/components/engine/cli/command/inspect/inspector_test.go b/components/engine/cli/command/inspect/inspector_test.go index 1ce1593ab7..9085230ac5 100644 --- a/components/engine/cli/command/inspect/inspector_test.go +++ b/components/engine/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/components/engine/cli/command/system/events.go b/components/engine/cli/command/system/events.go index 087523051a..441ef91d33 100644 --- a/components/engine/cli/command/system/events.go +++ b/components/engine/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/components/engine/cli/command/system/info.go b/components/engine/cli/command/system/info.go index 6c3487de8a..e11aff77b4 100644 --- a/components/engine/cli/command/system/info.go +++ b/components/engine/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/components/engine/cli/command/system/version.go b/components/engine/cli/command/system/version.go index ded4f4d118..569da21886 100644 --- a/components/engine/cli/command/system/version.go +++ b/components/engine/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/components/engine/daemon/logger/loggerutils/log_tag.go b/components/engine/daemon/logger/loggerutils/log_tag.go index 4752679c72..79fcf585c9 100644 --- a/components/engine/daemon/logger/loggerutils/log_tag.go +++ b/components/engine/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/components/engine/utils/templates/templates.go b/components/engine/pkg/templates/templates.go similarity index 100% rename from components/engine/utils/templates/templates.go rename to components/engine/pkg/templates/templates.go diff --git a/components/engine/utils/templates/templates_test.go b/components/engine/pkg/templates/templates_test.go similarity index 100% rename from components/engine/utils/templates/templates_test.go rename to components/engine/pkg/templates/templates_test.go diff --git a/components/engine/profiles/apparmor/apparmor.go b/components/engine/profiles/apparmor/apparmor.go index 36eb10cdf9..19475680c9 100644 --- a/components/engine/profiles/apparmor/apparmor.go +++ b/components/engine/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 (