diff --git a/cli/command/cli.go b/cli/command/cli.go index 3cb5b9a146..9923815ae0 100644 --- a/cli/command/cli.go +++ b/cli/command/cli.go @@ -12,10 +12,10 @@ import ( "github.com/docker/cli/cli/config/configfile" "github.com/docker/cli/cli/config/credentials" cliflags "github.com/docker/cli/cli/flags" - "github.com/docker/docker/client" "github.com/docker/docker/api" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/versions" + "github.com/docker/docker/client" "github.com/docker/docker/dockerversion" dopts "github.com/docker/docker/opts" "github.com/docker/go-connections/sockets" diff --git a/cli/command/container/create.go b/cli/command/container/create.go index 3f36bb8e57..a73fadf9db 100644 --- a/cli/command/container/create.go +++ b/cli/command/container/create.go @@ -8,10 +8,10 @@ import ( "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/image" - apiclient "github.com/docker/docker/client" "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" + apiclient "github.com/docker/docker/client" "github.com/docker/docker/pkg/jsonmessage" "github.com/docker/docker/registry" "github.com/pkg/errors" diff --git a/cli/command/container/exec.go b/cli/command/container/exec.go index 67bc71494d..27328960e6 100644 --- a/cli/command/container/exec.go +++ b/cli/command/container/exec.go @@ -7,8 +7,8 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" - apiclient "github.com/docker/docker/client" "github.com/docker/docker/api/types" + apiclient "github.com/docker/docker/client" options "github.com/docker/docker/opts" "github.com/docker/docker/pkg/promise" "github.com/spf13/cobra" diff --git a/cli/command/container/stats_helpers.go b/cli/command/container/stats_helpers.go index f7808533ca..586f4908b1 100644 --- a/cli/command/container/stats_helpers.go +++ b/cli/command/container/stats_helpers.go @@ -9,8 +9,8 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/cli/cli/command/formatter" - "github.com/docker/docker/client" "github.com/docker/docker/api/types" + "github.com/docker/docker/client" "github.com/pkg/errors" "golang.org/x/net/context" ) diff --git a/cli/command/container/tty.go b/cli/command/container/tty.go index a1b068b26c..9b09d4a0f9 100644 --- a/cli/command/container/tty.go +++ b/cli/command/container/tty.go @@ -9,8 +9,8 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/cli/cli/command" - "github.com/docker/docker/client" "github.com/docker/docker/api/types" + "github.com/docker/docker/client" "github.com/docker/docker/pkg/signal" "golang.org/x/net/context" ) diff --git a/cli/command/container/utils.go b/cli/command/container/utils.go index 344ac40685..cf1cad95b2 100644 --- a/cli/command/container/utils.go +++ b/cli/command/container/utils.go @@ -5,11 +5,11 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/cli/cli/command" - clientapi "github.com/docker/docker/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/versions" + clientapi "github.com/docker/docker/client" "golang.org/x/net/context" ) diff --git a/cli/command/idresolver/client_test.go b/cli/command/idresolver/client_test.go index 8568f0e770..f84683b907 100644 --- a/cli/command/idresolver/client_test.go +++ b/cli/command/idresolver/client_test.go @@ -1,9 +1,9 @@ package idresolver import ( - "github.com/docker/docker/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" + "github.com/docker/docker/client" "golang.org/x/net/context" ) diff --git a/cli/command/idresolver/idresolver.go b/cli/command/idresolver/idresolver.go index 746eb866de..6088b64b59 100644 --- a/cli/command/idresolver/idresolver.go +++ b/cli/command/idresolver/idresolver.go @@ -3,9 +3,9 @@ package idresolver import ( "golang.org/x/net/context" - "github.com/docker/docker/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" + "github.com/docker/docker/client" "github.com/pkg/errors" ) diff --git a/cli/command/image/client_test.go b/cli/command/image/client_test.go index 10ceefd281..0df6fa4f77 100644 --- a/cli/command/image/client_test.go +++ b/cli/command/image/client_test.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "github.com/docker/docker/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/image" + "github.com/docker/docker/client" "golang.org/x/net/context" ) diff --git a/cli/command/node/client_test.go b/cli/command/node/client_test.go index df3a450da6..1f5cdc7cee 100644 --- a/cli/command/node/client_test.go +++ b/cli/command/node/client_test.go @@ -1,9 +1,9 @@ package node import ( - "github.com/docker/docker/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" + "github.com/docker/docker/client" "golang.org/x/net/context" ) diff --git a/cli/command/node/cmd.go b/cli/command/node/cmd.go index 1ecfcc048f..ec7a9e395c 100644 --- a/cli/command/node/cmd.go +++ b/cli/command/node/cmd.go @@ -5,8 +5,8 @@ import ( "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" - apiclient "github.com/docker/docker/client" "github.com/docker/docker/api/types" + apiclient "github.com/docker/docker/client" "github.com/spf13/cobra" "golang.org/x/net/context" ) diff --git a/cli/command/secret/client_test.go b/cli/command/secret/client_test.go index f498abe390..bb4b412fc2 100644 --- a/cli/command/secret/client_test.go +++ b/cli/command/secret/client_test.go @@ -1,9 +1,9 @@ package secret import ( - "github.com/docker/docker/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" + "github.com/docker/docker/client" "golang.org/x/net/context" ) diff --git a/cli/command/service/inspect.go b/cli/command/service/inspect.go index 1a1f6c3d2c..45e7459dd4 100644 --- a/cli/command/service/inspect.go +++ b/cli/command/service/inspect.go @@ -8,8 +8,8 @@ import ( "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/formatter" - apiclient "github.com/docker/docker/client" "github.com/docker/docker/api/types" + apiclient "github.com/docker/docker/client" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cli/command/service/logs.go b/cli/command/service/logs.go index 07758e645f..50a85e24fa 100644 --- a/cli/command/service/logs.go +++ b/cli/command/service/logs.go @@ -12,9 +12,9 @@ import ( "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/idresolver" - "github.com/docker/docker/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" + "github.com/docker/docker/client" "github.com/docker/docker/pkg/stdcopy" "github.com/docker/docker/pkg/stringid" "github.com/pkg/errors" diff --git a/cli/command/service/opts.go b/cli/command/service/opts.go index 747df23bff..ecc37d7b00 100644 --- a/cli/command/service/opts.go +++ b/cli/command/service/opts.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/docker/docker/client" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/swarm" + "github.com/docker/docker/client" "github.com/docker/docker/opts" runconfigopts "github.com/docker/docker/runconfig/opts" "github.com/docker/swarmkit/api" diff --git a/cli/command/service/parse.go b/cli/command/service/parse.go index b125f8ce78..acee08761f 100644 --- a/cli/command/service/parse.go +++ b/cli/command/service/parse.go @@ -1,10 +1,10 @@ package service import ( - "github.com/docker/docker/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" swarmtypes "github.com/docker/docker/api/types/swarm" + "github.com/docker/docker/client" "github.com/pkg/errors" "golang.org/x/net/context" ) diff --git a/cli/command/service/progress/progress.go b/cli/command/service/progress/progress.go index 9a81aabfc3..88cc9e5fac 100644 --- a/cli/command/service/progress/progress.go +++ b/cli/command/service/progress/progress.go @@ -8,10 +8,10 @@ import ( "os/signal" "time" - "github.com/docker/docker/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" + "github.com/docker/docker/client" "github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/streamformatter" "github.com/docker/docker/pkg/stringid" diff --git a/cli/command/service/update.go b/cli/command/service/update.go index 9185503d35..bac8c29d2e 100644 --- a/cli/command/service/update.go +++ b/cli/command/service/update.go @@ -8,12 +8,12 @@ import ( "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" - "github.com/docker/docker/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" mounttypes "github.com/docker/docker/api/types/mount" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/versions" + "github.com/docker/docker/client" "github.com/docker/docker/opts" runconfigopts "github.com/docker/docker/runconfig/opts" "github.com/docker/swarmkit/api/defaults" diff --git a/cli/command/stack/client_test.go b/cli/command/stack/client_test.go index 2a283dfe2f..5b51575580 100644 --- a/cli/command/stack/client_test.go +++ b/cli/command/stack/client_test.go @@ -4,10 +4,10 @@ import ( "strings" "github.com/docker/cli/cli/compose/convert" - "github.com/docker/docker/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" + "github.com/docker/docker/client" "golang.org/x/net/context" ) diff --git a/cli/command/stack/common.go b/cli/command/stack/common.go index 0c7f621d0a..7b3cd3cca8 100644 --- a/cli/command/stack/common.go +++ b/cli/command/stack/common.go @@ -4,10 +4,10 @@ import ( "golang.org/x/net/context" "github.com/docker/cli/cli/compose/convert" - "github.com/docker/docker/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" + "github.com/docker/docker/client" "github.com/docker/docker/opts" ) diff --git a/cli/command/stack/deploy_composefile.go b/cli/command/stack/deploy_composefile.go index 56bb34872f..2aa5fe15d9 100644 --- a/cli/command/stack/deploy_composefile.go +++ b/cli/command/stack/deploy_composefile.go @@ -12,10 +12,10 @@ import ( "github.com/docker/cli/cli/compose/convert" "github.com/docker/cli/cli/compose/loader" composetypes "github.com/docker/cli/cli/compose/types" - apiclient "github.com/docker/docker/client" - dockerclient "github.com/docker/docker/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" + apiclient "github.com/docker/docker/client" + dockerclient "github.com/docker/docker/client" "github.com/pkg/errors" "golang.org/x/net/context" ) diff --git a/cli/command/stack/list.go b/cli/command/stack/list.go index 443fd13331..4560a98ec9 100644 --- a/cli/command/stack/list.go +++ b/cli/command/stack/list.go @@ -7,8 +7,8 @@ import ( "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/formatter" "github.com/docker/cli/cli/compose/convert" - "github.com/docker/docker/client" "github.com/docker/docker/api/types" + "github.com/docker/docker/client" "github.com/pkg/errors" "github.com/spf13/cobra" "golang.org/x/net/context" diff --git a/cli/command/swarm/client_test.go b/cli/command/swarm/client_test.go index afb773444a..1d42b9499c 100644 --- a/cli/command/swarm/client_test.go +++ b/cli/command/swarm/client_test.go @@ -1,9 +1,9 @@ package swarm import ( - "github.com/docker/docker/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" + "github.com/docker/docker/client" "golang.org/x/net/context" ) diff --git a/cli/command/system/inspect.go b/cli/command/system/inspect.go index 9f9f69420e..cac6d0fb2f 100644 --- a/cli/command/system/inspect.go +++ b/cli/command/system/inspect.go @@ -7,8 +7,8 @@ import ( "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/inspect" - apiclient "github.com/docker/docker/client" "github.com/docker/docker/api/types" + apiclient "github.com/docker/docker/client" "github.com/pkg/errors" "github.com/spf13/cobra" "golang.org/x/net/context" diff --git a/cli/command/volume/client_test.go b/cli/command/volume/client_test.go index 52e82e598f..c29655cdb0 100644 --- a/cli/command/volume/client_test.go +++ b/cli/command/volume/client_test.go @@ -1,10 +1,10 @@ package volume import ( - "github.com/docker/docker/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" volumetypes "github.com/docker/docker/api/types/volume" + "github.com/docker/docker/client" "golang.org/x/net/context" ) diff --git a/cli/compose/convert/service.go b/cli/compose/convert/service.go index aff3fc21e7..fadf69b5bf 100644 --- a/cli/compose/convert/service.go +++ b/cli/compose/convert/service.go @@ -9,10 +9,10 @@ import ( servicecli "github.com/docker/cli/cli/command/service" composetypes "github.com/docker/cli/cli/compose/types" - "github.com/docker/docker/client" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/versions" + "github.com/docker/docker/client" "github.com/docker/docker/opts" runconfigopts "github.com/docker/docker/runconfig/opts" "github.com/pkg/errors" diff --git a/cli/compose/schema/bindata.go b/cli/compose/schema/bindata.go index 7ce0fc0113..c8ff76693f 100644 --- a/cli/compose/schema/bindata.go +++ b/cli/compose/schema/bindata.go @@ -226,11 +226,12 @@ type bintree struct { Func func() (*asset, error) Children map[string]*bintree } + var _bintree = &bintree{nil, map[string]*bintree{ - "data": &bintree{nil, map[string]*bintree{ - "config_schema_v3.0.json": &bintree{dataConfig_schema_v30Json, map[string]*bintree{}}, - "config_schema_v3.1.json": &bintree{dataConfig_schema_v31Json, map[string]*bintree{}}, - "config_schema_v3.2.json": &bintree{dataConfig_schema_v32Json, map[string]*bintree{}}, + "data": {nil, map[string]*bintree{ + "config_schema_v3.0.json": {dataConfig_schema_v30Json, map[string]*bintree{}}, + "config_schema_v3.1.json": {dataConfig_schema_v31Json, map[string]*bintree{}}, + "config_schema_v3.2.json": {dataConfig_schema_v32Json, map[string]*bintree{}}, }}, }} @@ -280,4 +281,3 @@ func _filePath(dir, name string) string { cannonicalName := strings.Replace(name, "\\", "/", -1) return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) } -