Update imports.

Signed-off-by: Daniel Nephin <dnephin@docker.com>

cli/compose/convert/compose.go

@@ -4,10 +4,10 @@ import (
 	"io/ioutil"
 	"strings"
 
+	composetypes "github.com/docker/cli/cli/compose/types"
 	"github.com/docker/docker/api/types"
 	networktypes "github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/swarm"
-	composetypes "github.com/docker/docker/cli/compose/types"
 )
 
 const (

cli/compose/convert/compose_test.go

@@ -3,9 +3,9 @@ package convert
 import (
 	"testing"
 
+	composetypes "github.com/docker/cli/cli/compose/types"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/network"
-	composetypes "github.com/docker/docker/cli/compose/types"
 	"github.com/docker/docker/pkg/testutil/tempfile"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

cli/compose/convert/service.go

@@ -7,12 +7,12 @@ import (
 	"strings"
 	"time"
 
+	servicecli "github.com/docker/cli/cli/command/service"
+	composetypes "github.com/docker/cli/cli/compose/types"
+	"github.com/docker/cli/client"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/api/types/versions"
-	servicecli "github.com/docker/docker/cli/command/service"
-	composetypes "github.com/docker/docker/cli/compose/types"
-	"github.com/docker/docker/client"
 	"github.com/docker/docker/opts"
 	runconfigopts "github.com/docker/docker/runconfig/opts"
 	"github.com/pkg/errors"

cli/compose/convert/service_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
+	composetypes "github.com/docker/cli/cli/compose/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/swarm"
-	composetypes "github.com/docker/docker/cli/compose/types"
 	"github.com/stretchr/testify/assert"
 )
 

cli/compose/convert/volume.go

@@ -1,8 +1,8 @@
 package convert
 
 import (
+	composetypes "github.com/docker/cli/cli/compose/types"
 	"github.com/docker/docker/api/types/mount"
-	composetypes "github.com/docker/docker/cli/compose/types"
 	"github.com/pkg/errors"
 )
 

cli/compose/convert/volume_test.go

@@ -3,8 +3,8 @@ package convert
 import (
 	"testing"
 
+	composetypes "github.com/docker/cli/cli/compose/types"
 	"github.com/docker/docker/api/types/mount"
-	composetypes "github.com/docker/docker/cli/compose/types"
 	"github.com/stretchr/testify/assert"
 )
 

cli/compose/interpolation/interpolation.go

@@ -1,7 +1,7 @@
 package interpolation
 
 import (
-	"github.com/docker/docker/cli/compose/template"
+	"github.com/docker/cli/cli/compose/template"
 	"github.com/pkg/errors"
 )
 

cli/compose/loader/loader.go

@@ -9,10 +9,10 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/cli/compose/interpolation"
-	"github.com/docker/docker/cli/compose/schema"
-	"github.com/docker/docker/cli/compose/template"
-	"github.com/docker/docker/cli/compose/types"
+	"github.com/docker/cli/cli/compose/interpolation"
+	"github.com/docker/cli/cli/compose/schema"
+	"github.com/docker/cli/cli/compose/template"
+	"github.com/docker/cli/cli/compose/types"
 	"github.com/docker/docker/opts"
 	runconfigopts "github.com/docker/docker/runconfig/opts"
 	"github.com/docker/go-connections/nat"

cli/compose/loader/loader_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker/cli/compose/types"
+	"github.com/docker/cli/cli/compose/types"
 	"github.com/stretchr/testify/assert"
 )
 

cli/compose/loader/volume.go

@@ -5,8 +5,8 @@ import (
 	"unicode"
 	"unicode/utf8"
 
+	"github.com/docker/cli/cli/compose/types"
 	"github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/cli/compose/types"
 	"github.com/pkg/errors"
 )
 

cli/compose/loader/volume_test.go

@@ -3,7 +3,7 @@ package loader
 import (
 	"testing"
 
-	"github.com/docker/docker/cli/compose/types"
+	"github.com/docker/cli/cli/compose/types"
 	"github.com/docker/docker/pkg/testutil"
 	"github.com/stretchr/testify/assert"
 )