1. docker
  2. Commit 907407d0b2e5863f0e1b40b93a356bbf03c7b9fb
Browse code

Modify import paths to point to the new engine-api package.

Signed-off-by: David Calavera <david.calavera@gmail.com>

David Calavera authored on 2016/01/05 09:05:26
Showing 194 changed files
api/client/attach.go
History View file @ 907407d
... ... 
@@ -5,10 +5,10 @@ import (
5 5 
 	"io"
6 6
7 7 
 	"github.com/Sirupsen/logrus"
8 
-	"github.com/docker/docker/api/types"
9 8 
 	Cli "github.com/docker/docker/cli"
10 9 
 	flag "github.com/docker/docker/pkg/mflag"
11 10 
 	"github.com/docker/docker/pkg/signal"
11 
+	"github.com/docker/engine-api/types"
12 12 
 )
13 13
14 14 
 // CmdAttach attaches to a running container.
api/client/build.go
History View file @ 907407d
... ... 
@@ -15,8 +15,6 @@ import (
15 15 
 	"strings"
16 16
17 17 
 	"github.com/docker/docker/api"
18 
-	"github.com/docker/docker/api/types"
19 
-	"github.com/docker/docker/api/types/container"
20 18 
 	"github.com/docker/docker/builder/dockerignore"
21 19 
 	Cli "github.com/docker/docker/cli"
22 20 
 	"github.com/docker/docker/opts"
... ... 
@@ -31,6 +29,8 @@ import (
31 31 
 	"github.com/docker/docker/pkg/urlutil"
32 32 
 	"github.com/docker/docker/reference"
33 33 
 	runconfigopts "github.com/docker/docker/runconfig/opts"
34 
+	"github.com/docker/engine-api/types"
35 
+	"github.com/docker/engine-api/types/container"
34 36 
 	"github.com/docker/go-units"
35 37 
 )
36 38
api/client/cli.go
History View file @ 907407d
... ... 
@@ -9,12 +9,12 @@ import (
9 9 
 	"runtime"
10 10
11 11 
 	"github.com/docker/docker/api"
12 
-	"github.com/docker/docker/api/client/lib"
13 12 
 	"github.com/docker/docker/cli"
14 13 
 	"github.com/docker/docker/cliconfig"
15 14 
 	"github.com/docker/docker/dockerversion"
16 15 
 	"github.com/docker/docker/opts"
17 16 
 	"github.com/docker/docker/pkg/term"
17 
+	"github.com/docker/engine-api/client"
18 18 
 	"github.com/docker/go-connections/tlsconfig"
19 19 
 )
20 20
... ... 
@@ -120,7 +120,7 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cli.ClientF
120 120 
 			return err
121 121 
 		}
122 122
123 
-		client, err := lib.NewClient(host, verStr, clientTransport, customHeaders)
123 
+		client, err := client.NewClient(host, verStr, clientTransport, customHeaders)
124 124 
 		if err != nil {
125 125 
 			return err
126 126 
 		}
api/client/client.go
History View file @ 907407d
... ... 
@@ -7,11 +7,11 @@ package client
7 7 
 import (
8 8 
 	"io"
9 9
10 
-	"github.com/docker/docker/api/client/lib"
11 
-	"github.com/docker/docker/api/types"
12 
-	"github.com/docker/docker/api/types/container"
13 
-	"github.com/docker/docker/api/types/filters"
14 
-	"github.com/docker/docker/api/types/registry"
10 
+	"github.com/docker/engine-api/client"
11 
+	"github.com/docker/engine-api/types"
12 
+	"github.com/docker/engine-api/types/container"
13 
+	"github.com/docker/engine-api/types/filters"
14 
+	"github.com/docker/engine-api/types/registry"
15 15 
 )
16 16
17 17 
 // apiClient is an interface that clients that talk with a docker server must implement.
... ... 
@@ -55,10 +55,10 @@ type apiClient interface {
55 55 
 	ImageInspectWithRaw(imageID string, getSize bool) (types.ImageInspect, []byte, error)
56 56 
 	ImageList(options types.ImageListOptions) ([]types.Image, error)
57 57 
 	ImageLoad(input io.Reader) (types.ImageLoadResponse, error)
58 
-	ImagePull(options types.ImagePullOptions, privilegeFunc lib.RequestPrivilegeFunc) (io.ReadCloser, error)
59 
-	ImagePush(options types.ImagePushOptions, privilegeFunc lib.RequestPrivilegeFunc) (io.ReadCloser, error)
58 
+	ImagePull(options types.ImagePullOptions, privilegeFunc client.RequestPrivilegeFunc) (io.ReadCloser, error)
59 
+	ImagePush(options types.ImagePushOptions, privilegeFunc client.RequestPrivilegeFunc) (io.ReadCloser, error)
60 60 
 	ImageRemove(options types.ImageRemoveOptions) ([]types.ImageDelete, error)
61 
-	ImageSearch(options types.ImageSearchOptions, privilegeFunc lib.RequestPrivilegeFunc) ([]registry.SearchResult, error)
61 
+	ImageSearch(options types.ImageSearchOptions, privilegeFunc client.RequestPrivilegeFunc) ([]registry.SearchResult, error)
62 62 
 	ImageSave(imageIDs []string) (io.ReadCloser, error)
63 63 
 	ImageTag(options types.ImageTagOptions) error
64 64 
 	Info() (types.Info, error)
api/client/commit.go
History View file @ 907407d
... ... 
@@ -5,12 +5,12 @@ import (
5 5 
 	"errors"
6 6 
 	"fmt"
7 7
8 
-	"github.com/docker/docker/api/types"
9 
-	"github.com/docker/docker/api/types/container"
10 8 
 	Cli "github.com/docker/docker/cli"
11 9 
 	"github.com/docker/docker/opts"
12 10 
 	flag "github.com/docker/docker/pkg/mflag"
13 11 
 	"github.com/docker/docker/reference"
12 
+	"github.com/docker/engine-api/types"
13 
+	"github.com/docker/engine-api/types/container"
14 14 
 )
15 15
16 16 
 // CmdCommit creates a new image from a container's changes.
api/client/cp.go
History View file @ 907407d
... ... 
@@ -7,11 +7,11 @@ import (
7 7 
 	"path/filepath"
8 8 
 	"strings"
9 9
10 
-	"github.com/docker/docker/api/types"
11 10 
 	Cli "github.com/docker/docker/cli"
12 11 
 	"github.com/docker/docker/pkg/archive"
13 12 
 	flag "github.com/docker/docker/pkg/mflag"
14 13 
 	"github.com/docker/docker/pkg/system"
14 
+	"github.com/docker/engine-api/types"
15 15 
 )
16 16
17 17 
 type copyDirection int
api/client/create.go
History View file @ 907407d
... ... 
@@ -5,14 +5,14 @@ import (
5 5 
 	"io"
6 6 
 	"os"
7 7
8 
-	"github.com/docker/docker/api/client/lib"
9 
-	"github.com/docker/docker/api/types"
10 
-	"github.com/docker/docker/api/types/container"
11 8 
 	Cli "github.com/docker/docker/cli"
12 9 
 	"github.com/docker/docker/pkg/jsonmessage"
13 10 
 	"github.com/docker/docker/reference"
14 11 
 	"github.com/docker/docker/registry"
15 12 
 	runconfigopts "github.com/docker/docker/runconfig/opts"
13 
+	"github.com/docker/engine-api/client"
14 
+	"github.com/docker/engine-api/types"
15 
+	"github.com/docker/engine-api/types/container"
16 16 
 )
17 17
18 18 
 func (cli *DockerCli) pullImage(image string) error {
... ... 
@@ -110,7 +110,7 @@ func (cli *DockerCli) createContainer(config *container.Config, hostConfig *cont
110 110 
 	response, err := cli.client.ContainerCreate(config, hostConfig, name)
111 111 
 	//if image not found try to pull it
112 112 
 	if err != nil {
113 
-		if lib.IsErrImageNotFound(err) {
113 
+		if client.IsErrImageNotFound(err) {
114 114 
 			fmt.Fprintf(cli.err, "Unable to find image '%s' locally\n", ref.String())
115 115
116 116 
 			// we don't want to write to stdout anything apart from container.ID
api/client/events.go
History View file @ 907407d
... ... 
@@ -7,13 +7,13 @@ import (
7 7 
 	"strings"
8 8 
 	"time"
9 9
10 
-	"github.com/docker/docker/api/types"
11 
-	eventtypes "github.com/docker/docker/api/types/events"
12 
-	"github.com/docker/docker/api/types/filters"
13 10 
 	Cli "github.com/docker/docker/cli"
14 11 
 	"github.com/docker/docker/opts"
15 12 
 	"github.com/docker/docker/pkg/jsonlog"
16 13 
 	flag "github.com/docker/docker/pkg/mflag"
14 
+	"github.com/docker/engine-api/types"
15 
+	eventtypes "github.com/docker/engine-api/types/events"
16 
+	"github.com/docker/engine-api/types/filters"
17 17 
 )
18 18
19 19 
 // CmdEvents prints a live stream of real time events from the server.
api/client/exec.go
History View file @ 907407d
... ... 
@@ -5,10 +5,10 @@ import (
5 5 
 	"io"
6 6
7 7 
 	"github.com/Sirupsen/logrus"
8 
-	"github.com/docker/docker/api/types"
9 8 
 	Cli "github.com/docker/docker/cli"
10 9 
 	flag "github.com/docker/docker/pkg/mflag"
11 10 
 	"github.com/docker/docker/pkg/promise"
11 
+	"github.com/docker/engine-api/types"
12 12 
 )
13 13
14 14 
 // CmdExec runs a command in a running container.
api/client/exec_test.go
History View file @ 907407d
... ... 
@@ -5,8 +5,8 @@ import (
5 5 
 	"io/ioutil"
6 6 
 	"testing"
7 7
8 
-	"github.com/docker/docker/api/types"
9 8 
 	flag "github.com/docker/docker/pkg/mflag"
9 
+	"github.com/docker/engine-api/types"
10 10 
 )
11 11
12 12 
 type arguments struct {
api/client/formatter/custom.go
History View file @ 907407d
... ... 
@@ -7,9 +7,9 @@ import (
7 7 
 	"time"
8 8
9 9 
 	"github.com/docker/docker/api"
10 
-	"github.com/docker/docker/api/types"
11 10 
 	"github.com/docker/docker/pkg/stringid"
12 11 
 	"github.com/docker/docker/pkg/stringutils"
12 
+	"github.com/docker/engine-api/types"
13 13 
 	"github.com/docker/go-units"
14 14 
 )
15 15
api/client/formatter/custom_test.go
History View file @ 907407d
... ... 
@@ -6,8 +6,8 @@ import (
6 6 
 	"testing"
7 7 
 	"time"
8 8
9 
-	"github.com/docker/docker/api/types"
10 9 
 	"github.com/docker/docker/pkg/stringid"
10 
+	"github.com/docker/engine-api/types"
11 11 
 )
12 12
13 13 
 func TestContainerPsContext(t *testing.T) {
api/client/formatter/formatter.go
History View file @ 907407d
... ... 
@@ -8,8 +8,8 @@ import (
8 8 
 	"text/tabwriter"
9 9 
 	"text/template"
10 10
11 
-	"github.com/docker/docker/api/types"
12 11 
 	"github.com/docker/docker/reference"
12 
+	"github.com/docker/engine-api/types"
13 13 
 )
14 14
15 15 
 const (
api/client/formatter/formatter_test.go
History View file @ 907407d
... ... 
@@ -6,7 +6,7 @@ import (
6 6 
 	"testing"
7 7 
 	"time"
8 8
9 
-	"github.com/docker/docker/api/types"
9 
+	"github.com/docker/engine-api/types"
10 10 
 )
11 11
12 12 
 func TestContainerContextWrite(t *testing.T) {
api/client/hijack.go
History View file @ 907407d
... ... 
@@ -5,9 +5,9 @@ import (
5 5 
 	"os"
6 6
7 7 
 	"github.com/Sirupsen/logrus"
8 
-	"github.com/docker/docker/api/types"
9 8 
 	"github.com/docker/docker/pkg/stdcopy"
10 9 
 	"github.com/docker/docker/pkg/term"
10 
+	"github.com/docker/engine-api/types"
11 11 
 )
12 12
13 13 
 func (cli *DockerCli) holdHijackedConnection(setRawTerminal bool, inputStream io.ReadCloser, outputStream, errorStream io.Writer, resp types.HijackedResponse) error {
api/client/images.go
History View file @ 907407d
... ... 
@@ -2,11 +2,11 @@ package client
2 2
3 3 
 import (
4 4 
 	"github.com/docker/docker/api/client/formatter"
5 
-	"github.com/docker/docker/api/types"
6 
-	"github.com/docker/docker/api/types/filters"
7 5 
 	Cli "github.com/docker/docker/cli"
8 6 
 	"github.com/docker/docker/opts"
9 7 
 	flag "github.com/docker/docker/pkg/mflag"
8 
+	"github.com/docker/engine-api/types"
9 
+	"github.com/docker/engine-api/types/filters"
10 10 
 )
11 11
12 12 
 // CmdImages lists the images in a specified repository, or all top-level images if no repository is specified.
api/client/import.go
History View file @ 907407d
... ... 
@@ -5,13 +5,13 @@ import (
5 5 
 	"io"
6 6 
 	"os"
7 7
8 
-	"github.com/docker/docker/api/types"
9 8 
 	Cli "github.com/docker/docker/cli"
10 9 
 	"github.com/docker/docker/opts"
11 10 
 	"github.com/docker/docker/pkg/jsonmessage"
12 11 
 	flag "github.com/docker/docker/pkg/mflag"
13 12 
 	"github.com/docker/docker/pkg/urlutil"
14 13 
 	"github.com/docker/docker/reference"
14 
+	"github.com/docker/engine-api/types"
15 15 
 )
16 16
17 17 
 // CmdImport creates an empty filesystem image, imports the contents of the tarball into the image, and optionally tags the image.
api/client/inspect.go
History View file @ 907407d
... ... 
@@ -6,9 +6,9 @@ import (
6 6 
 	"text/template"
7 7
8 8 
 	"github.com/docker/docker/api/client/inspect"
9 
-	"github.com/docker/docker/api/client/lib"
10 9 
 	Cli "github.com/docker/docker/cli"
11 10 
 	flag "github.com/docker/docker/pkg/mflag"
11 
+	"github.com/docker/engine-api/client"
12 12 
 )
13 13
14 14 
 var funcMap = template.FuncMap{
... ... 
@@ -64,10 +64,10 @@ func (cli *DockerCli) inspectAll(getSize bool) inspectSearcher {
64 64 
 		c, rawContainer, err := cli.client.ContainerInspectWithRaw(ref, getSize)
65 65 
 		if err != nil {
66 66 
 			// Search for image with that id if a container doesn't exist.
67 
-			if lib.IsErrContainerNotFound(err) {
67 
+			if client.IsErrContainerNotFound(err) {
68 68 
 				i, rawImage, err := cli.client.ImageInspectWithRaw(ref, getSize)
69 69 
 				if err != nil {
70 
-					if lib.IsErrImageNotFound(err) {
70 
+					if client.IsErrImageNotFound(err) {
71 71 
 						return nil, nil, fmt.Errorf("Error: No such image or container: %s", ref)
72 72 
 					}
73 73 
 					return nil, nil, err
api/client/lib/container_attach.go
History View file @ 907407d
... ... 
@@ -3,7 +3,7 @@ package lib
3 3 
 import (
4 4 
 	"net/url"
5 5
6 
-	"github.com/docker/docker/api/types"
6 
+	"github.com/docker/engine-api/types"
7 7 
 )
8 8
9 9 
 // ContainerAttach attaches a connection to a container in the server.
api/client/lib/container_commit.go
History View file @ 907407d
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"encoding/json"
5 5 
 	"net/url"
6 6
7 
-	"github.com/docker/docker/api/types"
7 
+	"github.com/docker/engine-api/types"
8 8 
 )
9 9
10 10 
 // ContainerCommit applies changes into a container and creates a new tagged image.
api/client/lib/container_create.go
History View file @ 907407d
... ... 
@@ -5,8 +5,8 @@ import (
5 5 
 	"net/url"
6 6 
 	"strings"
7 7
8 
-	"github.com/docker/docker/api/types"
9 
-	"github.com/docker/docker/api/types/container"
8 
+	"github.com/docker/engine-api/types"
9 
+	"github.com/docker/engine-api/types/container"
10 10 
 )
11 11
12 12 
 type configWrapper struct {
api/client/lib/container_inspect.go
History View file @ 907407d
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"net/http"
8 8 
 	"net/url"
9 9
10 
-	"github.com/docker/docker/api/types"
10 
+	"github.com/docker/engine-api/types"
11 11 
 )
12 12
13 13 
 // ContainerInspect returns the container information.
api/client/lib/container_list.go
History View file @ 907407d
... ... 
@@ -5,8 +5,8 @@ import (
5 5 
 	"net/url"
6 6 
 	"strconv"
7 7
8 
-	"github.com/docker/docker/api/types"
9 
-	"github.com/docker/docker/api/types/filters"
8 
+	"github.com/docker/engine-api/types"
9 
+	"github.com/docker/engine-api/types/filters"
10 10 
 )
11 11
12 12 
 // ContainerList returns the list of containers in the docker host.
api/client/lib/container_remove.go
History View file @ 907407d
... ... 
@@ -3,7 +3,7 @@ package lib
3 3 
 import (
4 4 
 	"net/url"
5 5
6 
-	"github.com/docker/docker/api/types"
6 
+	"github.com/docker/engine-api/types"
7 7 
 )
8 8
9 9 
 // ContainerRemove kills and removes a container from the docker host.
api/client/lib/container_top.go
History View file @ 907407d
... ... 
@@ -5,7 +5,7 @@ import (
5 5 
 	"net/url"
6 6 
 	"strings"
7 7
8 
-	"github.com/docker/docker/api/types"
8 
+	"github.com/docker/engine-api/types"
9 9 
 )
10 10
11 11 
 // ContainerTop shows process information from within a container.
api/client/lib/container_update.go
History View file @ 907407d
... ... 
@@ -1,7 +1,7 @@
1 1 
 package lib
2 2
3 3 
 import (
4 
-	"github.com/docker/docker/api/types/container"
4 
+	"github.com/docker/engine-api/types/container"
5 5 
 )
6 6
7 7 
 // ContainerUpdate updates resources of a container
api/client/lib/copy.go
History View file @ 907407d
... ... 
@@ -10,7 +10,7 @@ import (
10 10 
 	"path/filepath"
11 11 
 	"strings"
12 12
13 
-	"github.com/docker/docker/api/types"
13 
+	"github.com/docker/engine-api/types"
14 14 
 )
15 15
16 16 
 // ContainerStatPath returns Stat information about a path inside the container filesystem.
api/client/lib/diff.go
History View file @ 907407d
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"encoding/json"
5 5 
 	"net/url"
6 6
7 
-	"github.com/docker/docker/api/types"
7 
+	"github.com/docker/engine-api/types"
8 8 
 )
9 9
10 10 
 // ContainerDiff shows differences in a container filesystem since it was started.
api/client/lib/events.go
History View file @ 907407d
... ... 
@@ -5,9 +5,9 @@ import (
5 5 
 	"net/url"
6 6 
 	"time"
7 7
8 
-	"github.com/docker/docker/api/types"
9 
-	"github.com/docker/docker/api/types/filters"
10 
-	timetypes "github.com/docker/docker/api/types/time"
8 
+	"github.com/docker/engine-api/types"
9 
+	"github.com/docker/engine-api/types/filters"
10 
+	timetypes "github.com/docker/engine-api/types/time"
11 11 
 )
12 12
13 13 
 // Events returns a stream of events in the daemon in a ReadCloser.
api/client/lib/exec.go
History View file @ 907407d
... ... 
@@ -3,7 +3,7 @@ package lib
3 3 
 import (
4 4 
 	"encoding/json"
5 5
6 
-	"github.com/docker/docker/api/types"
6 
+	"github.com/docker/engine-api/types"
7 7 
 )
8 8
9 9 
 // ContainerExecCreate creates a new exec configuration to run an exec process.
api/client/lib/hijack.go
History View file @ 907407d
... ... 
@@ -10,7 +10,7 @@ import (
10 10 
 	"strings"
11 11 
 	"time"
12 12
13 
-	"github.com/docker/docker/api/types"
13 
+	"github.com/docker/engine-api/types"
14 14 
 )
15 15
16 16 
 // tlsClientCon holds tls information and a dialed connection.
api/client/lib/history.go
History View file @ 907407d
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"encoding/json"
5 5 
 	"net/url"
6 6
7 
-	"github.com/docker/docker/api/types"
7 
+	"github.com/docker/engine-api/types"
8 8 
 )
9 9
10 10 
 // ImageHistory returns the changes in an image in history format.
api/client/lib/image_build.go
History View file @ 907407d
... ... 
@@ -9,8 +9,8 @@ import (
9 9 
 	"strconv"
10 10 
 	"strings"
11 11
12 
-	"github.com/docker/docker/api/types"
13 
-	"github.com/docker/docker/api/types/container"
12 
+	"github.com/docker/engine-api/types"
13 
+	"github.com/docker/engine-api/types/container"
14 14 
 )
15 15
16 16 
 var headerRegexp = regexp.MustCompile(`\ADocker/.+\s\((.+)\)\z`)
api/client/lib/image_create.go
History View file @ 907407d
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"io"
5 5 
 	"net/url"
6 6
7 
-	"github.com/docker/docker/api/types"
7 
+	"github.com/docker/engine-api/types"
8 8 
 )
9 9
10 10 
 // ImageCreate creates a new image based in the parent options.
api/client/lib/image_import.go
History View file @ 907407d
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"io"
5 5 
 	"net/url"
6 6
7 
-	"github.com/docker/docker/api/types"
7 
+	"github.com/docker/engine-api/types"
8 8 
 )
9 9
10 10 
 // ImageImport creates a new image based in the source options.
api/client/lib/image_inspect.go
History View file @ 907407d
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"net/http"
8 8 
 	"net/url"
9 9
10 
-	"github.com/docker/docker/api/types"
10 
+	"github.com/docker/engine-api/types"
11 11 
 )
12 12
13 13 
 // ImageInspectWithRaw returns the image information and it's raw representation.
api/client/lib/image_list.go
History View file @ 907407d
... ... 
@@ -4,8 +4,8 @@ import (
4 4 
 	"encoding/json"
5 5 
 	"net/url"
6 6
7 
-	"github.com/docker/docker/api/types"
8 
-	"github.com/docker/docker/api/types/filters"
7 
+	"github.com/docker/engine-api/types"
8 
+	"github.com/docker/engine-api/types/filters"
9 9 
 )
10 10
11 11 
 // ImageList returns a list of images in the docker host.
api/client/lib/image_load.go
History View file @ 907407d
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"io"
5 5 
 	"net/url"
6 6
7 
-	"github.com/docker/docker/api/types"
7 
+	"github.com/docker/engine-api/types"
8 8 
 )
9 9
10 10 
 // ImageLoad loads an image in the docker host from the client host.
api/client/lib/image_pull.go
History View file @ 907407d
... ... 
@@ -5,7 +5,7 @@ import (
5 5 
 	"net/http"
6 6 
 	"net/url"
7 7
8 
-	"github.com/docker/docker/api/types"
8 
+	"github.com/docker/engine-api/types"
9 9 
 )
10 10
11 11 
 // ImagePull request the docker host to pull an image from a remote registry.
api/client/lib/image_push.go
History View file @ 907407d
... ... 
@@ -5,7 +5,7 @@ import (
5 5 
 	"net/http"
6 6 
 	"net/url"
7 7
8 
-	"github.com/docker/docker/api/types"
8 
+	"github.com/docker/engine-api/types"
9 9 
 )
10 10
11 11 
 // ImagePush request the docker host to push an image to a remote registry.
api/client/lib/image_remove.go
History View file @ 907407d
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"encoding/json"
5 5 
 	"net/url"
6 6
7 
-	"github.com/docker/docker/api/types"
7 
+	"github.com/docker/engine-api/types"
8 8 
 )
9 9
10 10 
 // ImageRemove removes an image from the docker host.
api/client/lib/image_search.go
History View file @ 907407d
... ... 
@@ -5,8 +5,8 @@ import (
5 5 
 	"net/http"
6 6 
 	"net/url"
7 7
8 
-	"github.com/docker/docker/api/types"
9 
-	"github.com/docker/docker/api/types/registry"
8 
+	"github.com/docker/engine-api/types"
9 
+	"github.com/docker/engine-api/types/registry"
10 10 
 )
11 11
12 12 
 // ImageSearch makes the docker host to search by a term in a remote registry.
api/client/lib/image_tag.go
History View file @ 907407d
... ... 
@@ -3,7 +3,7 @@ package lib
3 3 
 import (
4 4 
 	"net/url"
5 5
6 
-	"github.com/docker/docker/api/types"
6 
+	"github.com/docker/engine-api/types"
7 7 
 )
8 8
9 9 
 // ImageTag tags an image in the docker host
api/client/lib/info.go
History View file @ 907407d
... ... 
@@ -5,7 +5,7 @@ import (
5 5 
 	"fmt"
6 6 
 	"net/url"
7 7
8 
-	"github.com/docker/docker/api/types"
8 
+	"github.com/docker/engine-api/types"
9 9 
 )
10 10
11 11 
 // Info returns information about the docker server.
api/client/lib/login.go
History View file @ 907407d
... ... 
@@ -5,7 +5,7 @@ import (
5 5 
 	"net/http"
6 6 
 	"net/url"
7 7
8 
-	"github.com/docker/docker/api/types"
8 
+	"github.com/docker/engine-api/types"
9 9 
 )
10 10
11 11 
 // RegistryLogin authenticates the docker server with a given docker registry.
api/client/lib/logs.go
History View file @ 907407d
... ... 
@@ -5,8 +5,8 @@ import (
5 5 
 	"net/url"
6 6 
 	"time"
7 7
8 
-	"github.com/docker/docker/api/types"
9 
-	timetypes "github.com/docker/docker/api/types/time"
8 
+	"github.com/docker/engine-api/types"
9 
+	timetypes "github.com/docker/engine-api/types/time"
10 10 
 )
11 11
12 12 
 // ContainerLogs returns the logs generated by a container in an io.ReadCloser.
api/client/lib/network.go
History View file @ 907407d
... ... 
@@ -5,8 +5,8 @@ import (
5 5 
 	"net/http"
6 6 
 	"net/url"
7 7
8 
-	"github.com/docker/docker/api/types"
9 
-	"github.com/docker/docker/api/types/filters"
8 
+	"github.com/docker/engine-api/types"
9 
+	"github.com/docker/engine-api/types/filters"
10 10 
 )
11 11
12 12 
 // NetworkCreate creates a new network in the docker host.
api/client/lib/resize.go
History View file @ 907407d
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"net/url"
5 5 
 	"strconv"
6 6
7 
-	"github.com/docker/docker/api/types"
7 
+	"github.com/docker/engine-api/types"
8 8 
 )
9 9
10 10 
 // ContainerResize changes the size of the tty for a container.
api/client/lib/version.go
History View file @ 907407d
... ... 
@@ -3,7 +3,7 @@ package lib
3 3 
 import (
4 4 
 	"encoding/json"
5 5
6 
-	"github.com/docker/docker/api/types"
6 
+	"github.com/docker/engine-api/types"
7 7 
 )
8 8
9 9 
 // ServerVersion returns information of the docker client and server host.
api/client/lib/volume.go
History View file @ 907407d
... ... 
@@ -5,8 +5,8 @@ import (
5 5 
 	"net/http"
6 6 
 	"net/url"
7 7
8 
-	"github.com/docker/docker/api/types"
9 
-	"github.com/docker/docker/api/types/filters"
8 
+	"github.com/docker/engine-api/types"
9 
+	"github.com/docker/engine-api/types/filters"
10 10 
 )
11 11
12 12 
 // VolumeList returns the volumes configured in the docker host.
api/client/lib/wait.go
History View file @ 907407d
... ... 
@@ -3,7 +3,7 @@ package lib
3 3 
 import (
4 4 
 	"encoding/json"
5 5
6 
-	"github.com/docker/docker/api/types"
6 
+	"github.com/docker/engine-api/types"
7 7 
 )
8 8
9 9 
 // ContainerWait pauses execution util a container is exits.
api/client/login.go
History View file @ 907407d
... ... 
@@ -8,12 +8,12 @@ import (
8 8 
 	"runtime"
9 9 
 	"strings"
10 10
11 
-	"github.com/docker/docker/api/client/lib"
12 
-	"github.com/docker/docker/api/types"
13 11 
 	Cli "github.com/docker/docker/cli"
14 12 
 	flag "github.com/docker/docker/pkg/mflag"
15 13 
 	"github.com/docker/docker/pkg/term"
16 14 
 	"github.com/docker/docker/registry"
15 
+	"github.com/docker/engine-api/client"
16 
+	"github.com/docker/engine-api/types"
17 17 
 )
18 18
19 19 
 // CmdLogin logs in or registers a user to a Docker registry service.
... ... 
@@ -122,7 +122,7 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
122 122 
 	auth := cli.configFile.AuthConfigs[serverAddress]
123 123 
 	response, err := cli.client.RegistryLogin(auth)
124 124 
 	if err != nil {
125 
-		if lib.IsErrUnauthorized(err) {
125 
+		if client.IsErrUnauthorized(err) {
126 126 
 			delete(cli.configFile.AuthConfigs, serverAddress)
127 127 
 			if err2 := cli.configFile.Save(); err2 != nil {
128 128 
 				fmt.Fprintf(cli.out, "WARNING: could not save config file: %v\n", err2)
api/client/logs.go
History View file @ 907407d
... ... 
@@ -4,10 +4,10 @@ import (
4 4 
 	"fmt"
5 5 
 	"io"
6 6
7 
-	"github.com/docker/docker/api/types"
8 7 
 	Cli "github.com/docker/docker/cli"
9 8 
 	flag "github.com/docker/docker/pkg/mflag"
10 9 
 	"github.com/docker/docker/pkg/stdcopy"
10 
+	"github.com/docker/engine-api/types"
11 11 
 )
12 12
13 13 
 var validDrivers = map[string]bool{
api/client/network.go
History View file @ 907407d
... ... 
@@ -6,13 +6,13 @@ import (
6 6 
 	"strings"
7 7 
 	"text/tabwriter"
8 8
9 
-	"github.com/docker/docker/api/types"
10 
-	"github.com/docker/docker/api/types/filters"
11 
-	"github.com/docker/docker/api/types/network"
12 9 
 	Cli "github.com/docker/docker/cli"
13 10 
 	"github.com/docker/docker/opts"
14 11 
 	flag "github.com/docker/docker/pkg/mflag"
15 12 
 	"github.com/docker/docker/pkg/stringid"
13 
+	"github.com/docker/engine-api/types"
14 
+	"github.com/docker/engine-api/types/filters"
15 
+	"github.com/docker/engine-api/types/network"
16 16 
 )
17 17
18 18 
 // CmdNetwork is the parent subcommand for all network commands
api/client/ps.go
History View file @ 907407d
... ... 
@@ -2,11 +2,11 @@ package client
2 2
3 3 
 import (
4 4 
 	"github.com/docker/docker/api/client/formatter"
5 
-	"github.com/docker/docker/api/types"
6 
-	"github.com/docker/docker/api/types/filters"
7 5 
 	Cli "github.com/docker/docker/cli"
8 6 
 	"github.com/docker/docker/opts"
9 7 
 	flag "github.com/docker/docker/pkg/mflag"
8 
+	"github.com/docker/engine-api/types"
9 
+	"github.com/docker/engine-api/types/filters"
10 10 
 )
11 11
12 12 
 // CmdPs outputs a list of Docker containers.
api/client/pull.go
History View file @ 907407d
... ... 
@@ -4,13 +4,13 @@ import (
4 4 
 	"errors"
5 5 
 	"fmt"
6 6
7 
-	"github.com/docker/docker/api/client/lib"
8 
-	"github.com/docker/docker/api/types"
9 7 
 	Cli "github.com/docker/docker/cli"
10 8 
 	"github.com/docker/docker/pkg/jsonmessage"
11 9 
 	flag "github.com/docker/docker/pkg/mflag"
12 10 
 	"github.com/docker/docker/reference"
13 11 
 	"github.com/docker/docker/registry"
12 
+	"github.com/docker/engine-api/client"
13 
+	"github.com/docker/engine-api/types"
14 14 
 )
15 15
16 16 
 // CmdPull pulls an image or a repository from the registry.
... ... 
@@ -65,7 +65,7 @@ func (cli *DockerCli) CmdPull(args ...string) error {
65 65 
 	return cli.imagePullPrivileged(authConfig, distributionRef.String(), "", requestPrivilege)
66 66 
 }
67 67
68 
-func (cli *DockerCli) imagePullPrivileged(authConfig types.AuthConfig, imageID, tag string, requestPrivilege lib.RequestPrivilegeFunc) error {
68 
+func (cli *DockerCli) imagePullPrivileged(authConfig types.AuthConfig, imageID, tag string, requestPrivilege client.RequestPrivilegeFunc) error {
69 69
70 70 
 	encodedAuth, err := encodeAuthToBase64(authConfig)
71 71 
 	if err != nil {
api/client/push.go
History View file @ 907407d
... ... 
@@ -4,13 +4,13 @@ import (
4 4 
 	"errors"
5 5 
 	"io"
6 6
7 
-	"github.com/docker/docker/api/client/lib"
8 
-	"github.com/docker/docker/api/types"
9 7 
 	Cli "github.com/docker/docker/cli"
10 8 
 	"github.com/docker/docker/pkg/jsonmessage"
11 9 
 	flag "github.com/docker/docker/pkg/mflag"
12 10 
 	"github.com/docker/docker/reference"
13 11 
 	"github.com/docker/docker/registry"
12 
+	"github.com/docker/engine-api/client"
13 
+	"github.com/docker/engine-api/types"
14 14 
 )
15 15
16 16 
 // CmdPush pushes an image or repository to the registry.
... ... 
@@ -52,7 +52,7 @@ func (cli *DockerCli) CmdPush(args ...string) error {
52 52 
 	return cli.imagePushPrivileged(authConfig, ref.Name(), tag, cli.out, requestPrivilege)
53 53 
 }
54 54
55 
-func (cli *DockerCli) imagePushPrivileged(authConfig types.AuthConfig, imageID, tag string, outputStream io.Writer, requestPrivilege lib.RequestPrivilegeFunc) error {
55 
+func (cli *DockerCli) imagePushPrivileged(authConfig types.AuthConfig, imageID, tag string, outputStream io.Writer, requestPrivilege client.RequestPrivilegeFunc) error {
56 56 
 	encodedAuth, err := encodeAuthToBase64(authConfig)
57 57 
 	if err != nil {
58 58 
 		return err
api/client/rm.go
History View file @ 907407d
... ... 
@@ -4,9 +4,9 @@ import (
4 4 
 	"fmt"
5 5 
 	"strings"
6 6
7 
-	"github.com/docker/docker/api/types"
8 7 
 	Cli "github.com/docker/docker/cli"
9 8 
 	flag "github.com/docker/docker/pkg/mflag"
9 
+	"github.com/docker/engine-api/types"
10 10 
 )
11 11
12 12 
 // CmdRm removes one or more containers.
api/client/rmi.go
History View file @ 907407d
... ... 
@@ -4,9 +4,9 @@ import (
4 4 
 	"fmt"
5 5 
 	"net/url"
6 6
7 
-	"github.com/docker/docker/api/types"
8 7 
 	Cli "github.com/docker/docker/cli"
9 8 
 	flag "github.com/docker/docker/pkg/mflag"
9 
+	"github.com/docker/engine-api/types"
10 10 
 )
11 11
12 12 
 // CmdRmi removes all images with the specified name(s).
api/client/run.go
History View file @ 907407d
... ... 
@@ -8,13 +8,13 @@ import (
8 8 
 	"strings"
9 9
10 10 
 	"github.com/Sirupsen/logrus"
11 
-	"github.com/docker/docker/api/types"
12 11 
 	Cli "github.com/docker/docker/cli"
13 12 
 	derr "github.com/docker/docker/errors"
14 13 
 	"github.com/docker/docker/opts"
15 14 
 	"github.com/docker/docker/pkg/promise"
16 15 
 	"github.com/docker/docker/pkg/signal"
17 16 
 	runconfigopts "github.com/docker/docker/runconfig/opts"
17 
+	"github.com/docker/engine-api/types"
18 18 
 	"github.com/docker/libnetwork/resolvconf/dns"
19 19 
 )
20 20
api/client/search.go
History View file @ 907407d
... ... 
@@ -7,12 +7,12 @@ import (
7 7 
 	"strings"
8 8 
 	"text/tabwriter"
9 9
10 
-	"github.com/docker/docker/api/types"
11 
-	registrytypes "github.com/docker/docker/api/types/registry"
12 10 
 	Cli "github.com/docker/docker/cli"
13 11 
 	flag "github.com/docker/docker/pkg/mflag"
14 12 
 	"github.com/docker/docker/pkg/stringutils"
15 13 
 	"github.com/docker/docker/registry"
14 
+	"github.com/docker/engine-api/types"
15 
+	registrytypes "github.com/docker/engine-api/types/registry"
16 16 
 )
17 17
18 18 
 // CmdSearch searches the Docker Hub for images.
api/client/start.go
History View file @ 907407d
... ... 
@@ -7,11 +7,11 @@ import (
7 7 
 	"strings"
8 8
9 9 
 	"github.com/Sirupsen/logrus"
10 
-	"github.com/docker/docker/api/types"
11 10 
 	Cli "github.com/docker/docker/cli"
12 11 
 	flag "github.com/docker/docker/pkg/mflag"
13 12 
 	"github.com/docker/docker/pkg/promise"
14 13 
 	"github.com/docker/docker/pkg/signal"
14 
+	"github.com/docker/engine-api/types"
15 15 
 )
16 16
17 17 
 func (cli *DockerCli) forwardAllSignals(cid string) chan os.Signal {
api/client/stats.go
History View file @ 907407d
... ... 
@@ -10,10 +10,10 @@ import (
10 10 
 	"text/tabwriter"
11 11 
 	"time"
12 12
13 
-	"github.com/docker/docker/api/types"
14 
-	"github.com/docker/docker/api/types/events"
15 
-	"github.com/docker/docker/api/types/filters"
16 13 
 	Cli "github.com/docker/docker/cli"
14 
+	"github.com/docker/engine-api/types"
15 
+	"github.com/docker/engine-api/types/events"
16 
+	"github.com/docker/engine-api/types/filters"
17 17 
 	"github.com/docker/go-units"
18 18 
 )
19 19
api/client/stats_unit_test.go
History View file @ 907407d
... ... 
@@ -5,7 +5,7 @@ import (
5 5 
 	"sync"
6 6 
 	"testing"
7 7
8 
-	"github.com/docker/docker/api/types"
8 
+	"github.com/docker/engine-api/types"
9 9 
 )
10 10
11 11 
 func TestDisplay(t *testing.T) {
api/client/tag.go
History View file @ 907407d
... ... 
@@ -3,10 +3,10 @@ package client
3 3 
 import (
4 4 
 	"errors"
5 5
6 
-	"github.com/docker/docker/api/types"
7 6 
 	Cli "github.com/docker/docker/cli"
8 7 
 	flag "github.com/docker/docker/pkg/mflag"
9 8 
 	"github.com/docker/docker/reference"
9 
+	"github.com/docker/engine-api/types"
10 10 
 )
11 11
12 12 
 // CmdTag tags an image into a repository.
api/client/trust.go
History View file @ 907407d
... ... 
@@ -21,15 +21,15 @@ import (
21 21 
 	"github.com/docker/distribution/digest"
22 22 
 	"github.com/docker/distribution/registry/client/auth"
23 23 
 	"github.com/docker/distribution/registry/client/transport"
24 
-	"github.com/docker/docker/api/client/lib"
25 
-	"github.com/docker/docker/api/types"
26 
-	registrytypes "github.com/docker/docker/api/types/registry"
27 24 
 	"github.com/docker/docker/cliconfig"
28 25 
 	"github.com/docker/docker/pkg/ansiescape"
29 26 
 	"github.com/docker/docker/pkg/ioutils"
30 27 
 	flag "github.com/docker/docker/pkg/mflag"
31 28 
 	"github.com/docker/docker/reference"
32 29 
 	"github.com/docker/docker/registry"
30 
+	apiclient "github.com/docker/engine-api/client"
31 
+	"github.com/docker/engine-api/types"
32 
+	registrytypes "github.com/docker/engine-api/types/registry"
33 33 
 	"github.com/docker/go-connections/tlsconfig"
34 34 
 	"github.com/docker/notary/client"
35 35 
 	"github.com/docker/notary/passphrase"
... ... 
@@ -280,7 +280,7 @@ func notaryError(err error) error {
280 280 
 	return err
281 281 
 }
282 282
283 
-func (cli *DockerCli) trustedPull(repoInfo *registry.RepositoryInfo, ref registry.Reference, authConfig types.AuthConfig, requestPrivilege lib.RequestPrivilegeFunc) error {
283 
+func (cli *DockerCli) trustedPull(repoInfo *registry.RepositoryInfo, ref registry.Reference, authConfig types.AuthConfig, requestPrivilege apiclient.RequestPrivilegeFunc) error {
284 284 
 	var refs []target
285 285
286 286 
 	notaryRepo, err := cli.getNotaryRepository(repoInfo, authConfig)
... ... 
@@ -383,7 +383,7 @@ func targetStream(in io.Writer) (io.WriteCloser, <-chan []target) {
383 383 
 	return ioutils.NewWriteCloserWrapper(out, w.Close), targetChan
384 384 
 }
385 385
386 
-func (cli *DockerCli) trustedPush(repoInfo *registry.RepositoryInfo, tag string, authConfig types.AuthConfig, requestPrivilege lib.RequestPrivilegeFunc) error {
386 
+func (cli *DockerCli) trustedPush(repoInfo *registry.RepositoryInfo, tag string, authConfig types.AuthConfig, requestPrivilege apiclient.RequestPrivilegeFunc) error {
387 387 
 	streamOut, targetChan := targetStream(cli.out)
388 388
389 389 
 	reqError := cli.imagePushPrivileged(authConfig, repoInfo.Name(), tag, streamOut, requestPrivilege)
api/client/trust_test.go
History View file @ 907407d
... ... 
@@ -4,8 +4,8 @@ import (
4 4 
 	"os"
5 5 
 	"testing"
6 6
7 
-	registrytypes "github.com/docker/docker/api/types/registry"
8 7 
 	"github.com/docker/docker/registry"
8 
+	registrytypes "github.com/docker/engine-api/types/registry"
9 9 
 )
10 10
11 11 
 func unsetENV() {
api/client/update.go
History View file @ 907407d
... ... 
@@ -3,9 +3,9 @@ package client
3 3 
 import (
4 4 
 	"fmt"
5 5
6 
-	"github.com/docker/docker/api/types/container"
7 6 
 	Cli "github.com/docker/docker/cli"
8 7 
 	flag "github.com/docker/docker/pkg/mflag"
8 
+	"github.com/docker/engine-api/types/container"
9 9 
 	"github.com/docker/go-units"
10 10 
 )
11 11
api/client/utils.go
History View file @ 907407d
... ... 
@@ -10,12 +10,12 @@ import (
10 10 
 	"time"
11 11
12 12 
 	"github.com/Sirupsen/logrus"
13 
-	"github.com/docker/docker/api/client/lib"
14 
-	"github.com/docker/docker/api/types"
15 
-	registrytypes "github.com/docker/docker/api/types/registry"
16 13 
 	"github.com/docker/docker/pkg/signal"
17 14 
 	"github.com/docker/docker/pkg/term"
18 15 
 	"github.com/docker/docker/registry"
16 
+	"github.com/docker/engine-api/client"
17 
+	"github.com/docker/engine-api/types"
18 
+	registrytypes "github.com/docker/engine-api/types/registry"
19 19 
 )
20 20
21 21 
 // encodeAuthToBase64 serializes the auth configuration as JSON base64 payload
... ... 
@@ -32,7 +32,7 @@ func (cli *DockerCli) encodeRegistryAuth(index *registrytypes.IndexInfo) (string
32 32 
 	return encodeAuthToBase64(authConfig)
33 33 
 }
34 34
35 
-func (cli *DockerCli) registryAuthenticationPrivilegedFunc(index *registrytypes.IndexInfo, cmdName string) lib.RequestPrivilegeFunc {
35 
+func (cli *DockerCli) registryAuthenticationPrivilegedFunc(index *registrytypes.IndexInfo, cmdName string) client.RequestPrivilegeFunc {
36 36 
 	return func() (string, error) {
37 37 
 		fmt.Fprintf(cli.out, "\nPlease login prior to %s:\n", cmdName)
38 38 
 		if err := cli.CmdLogin(registry.GetAuthConfigKey(index)); err != nil {
... ... 
@@ -72,7 +72,7 @@ func getExitCode(cli *DockerCli, containerID string) (bool, int, error) {
72 72 
 	c, err := cli.client.ContainerInspect(containerID)
73 73 
 	if err != nil {
74 74 
 		// If we can't connect, then the daemon probably died.
75 
-		if err != lib.ErrConnectionFailed {
75 
+		if err != client.ErrConnectionFailed {
76 76 
 			return false, -1, err
77 77 
 		}
78 78 
 		return false, -1, nil
... ... 
@@ -87,7 +87,7 @@ func getExecExitCode(cli *DockerCli, execID string) (bool, int, error) {
87 87 
 	resp, err := cli.client.ContainerExecInspect(execID)
88 88 
 	if err != nil {
89 89 
 		// If we can't connect, then the daemon probably died.
90 
-		if err != lib.ErrConnectionFailed {
90 
+		if err != client.ErrConnectionFailed {
91 91 
 			return false, -1, err
92 92 
 		}
93 93 
 		return false, -1, nil
api/client/version.go
History View file @ 907407d
... ... 
@@ -5,11 +5,11 @@ import (
5 5 
 	"text/template"
6 6 
 	"time"
7 7
8 
-	"github.com/docker/docker/api/types"
9 8 
 	Cli "github.com/docker/docker/cli"
10 9 
 	"github.com/docker/docker/dockerversion"
11 10 
 	flag "github.com/docker/docker/pkg/mflag"
12 11 
 	"github.com/docker/docker/utils"
12 
+	"github.com/docker/engine-api/types"
13 13 
 )
14 14
15 15 
 var versionTemplate = `Client:
api/client/volume.go
History View file @ 907407d
... ... 
@@ -4,11 +4,11 @@ import (
4 4 
 	"fmt"
5 5 
 	"text/tabwriter"
6 6
7 
-	"github.com/docker/docker/api/types"
8 
-	"github.com/docker/docker/api/types/filters"
9 7 
 	Cli "github.com/docker/docker/cli"
10 8 
 	"github.com/docker/docker/opts"
11 9 
 	flag "github.com/docker/docker/pkg/mflag"
10 
+	"github.com/docker/engine-api/types"
11 
+	"github.com/docker/engine-api/types/filters"
12 12 
 )
13 13
14 14 
 // CmdVolume is the parent subcommand for all volume commands
api/common.go
History View file @ 907407d
... ... 
@@ -9,9 +9,9 @@ import (
9 9 
 	"strings"
10 10
11 11 
 	"github.com/Sirupsen/logrus"
12 
-	"github.com/docker/docker/api/types"
13 12 
 	"github.com/docker/docker/pkg/system"
14 13 
 	"github.com/docker/docker/pkg/version"
14 
+	"github.com/docker/engine-api/types"
15 15 
 	"github.com/docker/libtrust"
16 16 
 )
17 17
api/common_test.go
History View file @ 907407d
... ... 
@@ -7,7 +7,7 @@ import (
7 7
8 8 
 	"os"
9 9
10 
-	"github.com/docker/docker/api/types"
10 
+	"github.com/docker/engine-api/types"
11 11 
 )
12 12
13 13 
 type ports struct {
api/server/router/build/build_routes.go
History View file @ 907407d
... ... 
@@ -13,8 +13,6 @@ import (
13 13
14 14 
 	"github.com/Sirupsen/logrus"
15 15 
 	"github.com/docker/docker/api/server/httputils"
16 
-	"github.com/docker/docker/api/types"
17 
-	"github.com/docker/docker/api/types/container"
18 16 
 	"github.com/docker/docker/builder"
19 17 
 	"github.com/docker/docker/builder/dockerfile"
20 18 
 	"github.com/docker/docker/daemon/daemonbuilder"
... ... 
@@ -25,6 +23,8 @@ import (
25 25 
 	"github.com/docker/docker/pkg/streamformatter"
26 26 
 	"github.com/docker/docker/reference"
27 27 
 	"github.com/docker/docker/utils"
28 
+	"github.com/docker/engine-api/types"
29 
+	"github.com/docker/engine-api/types/container"
28 30 
 	"github.com/docker/go-units"
29 31 
 	"golang.org/x/net/context"
30 32 
 )
api/server/router/container/backend.go
History View file @ 907407d
... ... 
@@ -4,12 +4,12 @@ import (
4 4 
 	"io"
5 5 
 	"time"
6 6
7 
-	"github.com/docker/docker/api/types"
8 
-	"github.com/docker/docker/api/types/container"
9 7 
 	"github.com/docker/docker/daemon"
10 8 
 	"github.com/docker/docker/daemon/exec"
11 9 
 	"github.com/docker/docker/pkg/archive"
12 10 
 	"github.com/docker/docker/pkg/version"
11 
+	"github.com/docker/engine-api/types"
12 
+	"github.com/docker/engine-api/types/container"
13 13 
 )
14 14
15 15 
 // execBackend includes functions to implement to provide exec functionality.
api/server/router/container/container_routes.go
History View file @ 907407d
... ... 
@@ -12,9 +12,6 @@ import (
12 12 
 	"github.com/Sirupsen/logrus"
13 13 
 	"github.com/docker/distribution/registry/api/errcode"
14 14 
 	"github.com/docker/docker/api/server/httputils"
15 
-	"github.com/docker/docker/api/types"
16 
-	"github.com/docker/docker/api/types/container"
17 
-	timetypes "github.com/docker/docker/api/types/time"
18 15 
 	"github.com/docker/docker/daemon"
19 16 
 	derr "github.com/docker/docker/errors"
20 17 
 	"github.com/docker/docker/pkg/ioutils"
... ... 
@@ -22,6 +19,9 @@ import (
22 22 
 	"github.com/docker/docker/pkg/term"
23 23 
 	"github.com/docker/docker/runconfig"
24 24 
 	"github.com/docker/docker/utils"
25 
+	"github.com/docker/engine-api/types"
26 
+	"github.com/docker/engine-api/types/container"
27 
+	timetypes "github.com/docker/engine-api/types/time"
25 28 
 	"golang.org/x/net/context"
26 29 
 	"golang.org/x/net/websocket"
27 30 
 )
api/server/router/container/copy.go
History View file @ 907407d
... ... 
@@ -10,7 +10,7 @@ import (
10 10 
 	"strings"
11 11
12 12 
 	"github.com/docker/docker/api/server/httputils"
13 
-	"github.com/docker/docker/api/types"
13 
+	"github.com/docker/engine-api/types"
14 14 
 	"golang.org/x/net/context"
15 15 
 )
16 16
api/server/router/container/exec.go
History View file @ 907407d
... ... 
@@ -9,9 +9,9 @@ import (
9 9
10 10 
 	"github.com/Sirupsen/logrus"
11 11 
 	"github.com/docker/docker/api/server/httputils"
12 
-	"github.com/docker/docker/api/types"
13 12 
 	"github.com/docker/docker/pkg/stdcopy"
14 13 
 	"github.com/docker/docker/utils"
14 
+	"github.com/docker/engine-api/types"
15 15 
 	"golang.org/x/net/context"
16 16 
 )
17 17
api/server/router/local/image.go
History View file @ 907407d
... ... 
@@ -11,14 +11,14 @@ import (
11 11
12 12 
 	"github.com/docker/distribution/digest"
13 13 
 	"github.com/docker/docker/api/server/httputils"
14 
-	"github.com/docker/docker/api/types"
15 
-	"github.com/docker/docker/api/types/container"
16 14 
 	"github.com/docker/docker/builder/dockerfile"
17 15 
 	derr "github.com/docker/docker/errors"
18 16 
 	"github.com/docker/docker/pkg/ioutils"
19 17 
 	"github.com/docker/docker/pkg/streamformatter"
20 18 
 	"github.com/docker/docker/reference"
21 19 
 	"github.com/docker/docker/runconfig"
20 
+	"github.com/docker/engine-api/types"
21 
+	"github.com/docker/engine-api/types/container"
22 22 
 	"golang.org/x/net/context"
23 23 
 )
24 24
api/server/router/network/backend.go
History View file @ 907407d
... ... 
@@ -1,7 +1,7 @@
1 1 
 package network
2 2
3 3 
 import (
4 
-	"github.com/docker/docker/api/types/network"
4 
+	"github.com/docker/engine-api/types/network"
5 5
6 6 
 	"github.com/docker/libnetwork"
7 7 
 )
api/server/router/network/filter.go
History View file @ 907407d
... ... 
@@ -5,8 +5,8 @@ import (
5 5 
 	"regexp"
6 6 
 	"strings"
7 7
8 
-	"github.com/docker/docker/api/types/filters"
9 8 
 	"github.com/docker/docker/runconfig"
9 
+	"github.com/docker/engine-api/types/filters"
10 10 
 	"github.com/docker/libnetwork"
11 11 
 )
12 12
api/server/router/network/network_routes.go
History View file @ 907407d
... ... 
@@ -8,11 +8,11 @@ import (
8 8 
 	"golang.org/x/net/context"
9 9
10 10 
 	"github.com/docker/docker/api/server/httputils"
11 
-	"github.com/docker/docker/api/types"
12 
-	"github.com/docker/docker/api/types/filters"
13 
-	"github.com/docker/docker/api/types/network"
14 11 
 	"github.com/docker/docker/daemon"
15 12 
 	"github.com/docker/docker/runconfig"
13 
+	"github.com/docker/engine-api/types"
14 
+	"github.com/docker/engine-api/types/filters"
15 
+	"github.com/docker/engine-api/types/network"
16 16 
 	"github.com/docker/libnetwork"
17 17 
 )
18 18
api/server/router/system/backend.go
History View file @ 907407d
... ... 
@@ -1,9 +1,9 @@
1 1 
 package system
2 2
3 3 
 import (
4 
-	"github.com/docker/docker/api/types"
5 
-	"github.com/docker/docker/api/types/events"
6 
-	"github.com/docker/docker/api/types/filters"
4 
+	"github.com/docker/engine-api/types"
5 
+	"github.com/docker/engine-api/types/events"
6 
+	"github.com/docker/engine-api/types/filters"
7 7 
 )
8 8
9 9 
 // Backend is the methods that need to be implemented to provide
api/server/router/system/system_routes.go
History View file @ 907407d
... ... 
@@ -8,11 +8,11 @@ import (
8 8 
 	"github.com/Sirupsen/logrus"
9 9 
 	"github.com/docker/docker/api"
10 10 
 	"github.com/docker/docker/api/server/httputils"
11 
-	"github.com/docker/docker/api/types"
12 
-	"github.com/docker/docker/api/types/events"
13 
-	"github.com/docker/docker/api/types/filters"
14 
-	timetypes "github.com/docker/docker/api/types/time"
15 11 
 	"github.com/docker/docker/pkg/ioutils"
12 
+	"github.com/docker/engine-api/types"
13 
+	"github.com/docker/engine-api/types/events"
14 
+	"github.com/docker/engine-api/types/filters"
15 
+	timetypes "github.com/docker/engine-api/types/time"
16 16 
 	"golang.org/x/net/context"
17 17 
 )
18 18
api/server/router/volume/backend.go
History View file @ 907407d
... ... 
@@ -2,7 +2,7 @@ package volume
2 2
3 3 
 import (
4 4 
 	// TODO return types need to be refactored into pkg
5 
-	"github.com/docker/docker/api/types"
5 
+	"github.com/docker/engine-api/types"
6 6 
 )
7 7
8 8 
 // Backend is the methods that need to be implemented to provide
api/server/router/volume/volume_routes.go
History View file @ 907407d
... ... 
@@ -5,7 +5,7 @@ import (
5 5 
 	"net/http"
6 6
7 7 
 	"github.com/docker/docker/api/server/httputils"
8 
-	"github.com/docker/docker/api/types"
8 
+	"github.com/docker/engine-api/types"
9 9 
 	"golang.org/x/net/context"
10 10 
 )
11 11
api/types/client.go
History View file @ 907407d
... ... 
@@ -5,8 +5,8 @@ import (
5 5 
 	"io"
6 6 
 	"net"
7 7
8 
-	"github.com/docker/docker/api/types/container"
9 
-	"github.com/docker/docker/api/types/filters"
8 
+	"github.com/docker/engine-api/types/container"
9 
+	"github.com/docker/engine-api/types/filters"
10 10 
 	"github.com/docker/go-units"
11 11 
 )
12 12
api/types/configs.go
History View file @ 907407d
... ... 
@@ -1,6 +1,6 @@
1 1 
 package types
2 2
3 
-import "github.com/docker/docker/api/types/container"
3 
+import "github.com/docker/engine-api/types/container"
4 4
5 5 
 // configs holds structs used for internal communication between the
6 6 
 // frontend (such as an http server) and the backend (such as the
api/types/container/config.go
History View file @ 907407d
... ... 
@@ -1,7 +1,7 @@
1 1 
 package container
2 2
3 3 
 import (
4 
-	"github.com/docker/docker/api/types/strslice"
4 
+	"github.com/docker/engine-api/types/strslice"
5 5 
 	"github.com/docker/go-connections/nat"
6 6 
 )
7 7
api/types/container/host_config.go
History View file @ 907407d
... ... 
@@ -3,8 +3,8 @@ package container
3 3 
 import (
4 4 
 	"strings"
5 5
6 
-	"github.com/docker/docker/api/types/blkiodev"
7 
-	"github.com/docker/docker/api/types/strslice"
6 
+	"github.com/docker/engine-api/types/blkiodev"
7 
+	"github.com/docker/engine-api/types/strslice"
8 8 
 	"github.com/docker/go-connections/nat"
9 9 
 	"github.com/docker/go-units"
10 10 
 )
api/types/types.go
History View file @ 907407d
... ... 
@@ -4,9 +4,9 @@ import (
4 4 
 	"os"
5 5 
 	"time"
6 6
7 
-	"github.com/docker/docker/api/types/container"
8 
-	"github.com/docker/docker/api/types/network"
9 
-	"github.com/docker/docker/api/types/registry"
7 
+	"github.com/docker/engine-api/types/container"
8 
+	"github.com/docker/engine-api/types/network"
9 
+	"github.com/docker/engine-api/types/registry"
10 10 
 	"github.com/docker/go-connections/nat"
11 11 
 )
12 12
api/types/versions/v1p19/types.go
History View file @ 907407d
... ... 
@@ -2,9 +2,9 @@
2 2 
 package v1p19
3 3
4 4 
 import (
5 
-	"github.com/docker/docker/api/types"
6 
-	"github.com/docker/docker/api/types/container"
7 
-	"github.com/docker/docker/api/types/versions/v1p20"
5 
+	"github.com/docker/engine-api/types"
6 
+	"github.com/docker/engine-api/types/container"
7 
+	"github.com/docker/engine-api/types/versions/v1p20"
8 8 
 	"github.com/docker/go-connections/nat"
9 9 
 )
10 10
api/types/versions/v1p20/types.go
History View file @ 907407d
... ... 
@@ -2,8 +2,8 @@
2 2 
 package v1p20
3 3
4 4 
 import (
5 
-	"github.com/docker/docker/api/types"
6 
-	"github.com/docker/docker/api/types/container"
5 
+	"github.com/docker/engine-api/types"
6 
+	"github.com/docker/engine-api/types/container"
7 7 
 	"github.com/docker/go-connections/nat"
8 8 
 )
9 9
builder/builder.go
History View file @ 907407d
... ... 
@@ -9,8 +9,8 @@ import (
9 9 
 	"os"
10 10 
 	"time"
11 11
12 
-	"github.com/docker/docker/api/types"
13 
-	"github.com/docker/docker/api/types/container"
12 
+	"github.com/docker/engine-api/types"
13 
+	"github.com/docker/engine-api/types/container"
14 14 
 )
15 15
16 16 
 // Context represents a file system tree.
builder/dockerfile/builder.go
History View file @ 907407d
... ... 
@@ -10,11 +10,11 @@ import (
10 10 
 	"sync"
11 11
12 12 
 	"github.com/Sirupsen/logrus"
13 
-	"github.com/docker/docker/api/types"
14 
-	"github.com/docker/docker/api/types/container"
15 13 
 	"github.com/docker/docker/builder"
16 14 
 	"github.com/docker/docker/builder/dockerfile/parser"
17 15 
 	"github.com/docker/docker/pkg/stringid"
16 
+	"github.com/docker/engine-api/types"
17 
+	"github.com/docker/engine-api/types/container"
18 18 
 )
19 19
20 20 
 var validCommitCommands = map[string]bool{
builder/dockerfile/dispatchers.go
History View file @ 907407d
... ... 
@@ -18,13 +18,13 @@ import (
18 18
19 19 
 	"github.com/Sirupsen/logrus"
20 20 
 	"github.com/docker/docker/api"
21 
-	"github.com/docker/docker/api/types/container"
22 
-	"github.com/docker/docker/api/types/strslice"
23 21 
 	"github.com/docker/docker/builder"
24 22 
 	derr "github.com/docker/docker/errors"
25 23 
 	"github.com/docker/docker/pkg/signal"
26 24 
 	"github.com/docker/docker/pkg/system"
27 25 
 	runconfigopts "github.com/docker/docker/runconfig/opts"
26 
+	"github.com/docker/engine-api/types/container"
27 
+	"github.com/docker/engine-api/types/strslice"
28 28 
 	"github.com/docker/go-connections/nat"
29 29 
 )
30 30
builder/dockerfile/internals.go
History View file @ 907407d
... ... 
@@ -20,9 +20,6 @@ import (
20 20
21 21 
 	"github.com/Sirupsen/logrus"
22 22 
 	"github.com/docker/docker/api"
23 
-	"github.com/docker/docker/api/types"
24 
-	"github.com/docker/docker/api/types/container"
25 
-	"github.com/docker/docker/api/types/strslice"
26 23 
 	"github.com/docker/docker/builder"
27 24 
 	"github.com/docker/docker/builder/dockerfile/parser"
28 25 
 	"github.com/docker/docker/pkg/archive"
... ... 
@@ -36,6 +33,9 @@ import (
36 36 
 	"github.com/docker/docker/pkg/tarsum"
37 37 
 	"github.com/docker/docker/pkg/urlutil"
38 38 
 	"github.com/docker/docker/runconfig/opts"
39 
+	"github.com/docker/engine-api/types"
40 
+	"github.com/docker/engine-api/types/container"
41 
+	"github.com/docker/engine-api/types/strslice"
39 42 
 )
40 43
41 44 
 func (b *Builder) commit(id string, autoCmd *strslice.StrSlice, comment string) error {
builder/image.go
History View file @ 907407d
... ... 
@@ -1,6 +1,6 @@
1 1 
 package builder
2 2
3 
-import "github.com/docker/docker/api/types/container"
3 
+import "github.com/docker/engine-api/types/container"
4 4
5 5 
 // Image represents a Docker image used by the builder.
6 6 
 type Image interface {
cliconfig/config.go
History View file @ 907407d
... ... 
@@ -10,8 +10,8 @@ import (
10 10 
 	"path/filepath"
11 11 
 	"strings"
12 12
13 
-	"github.com/docker/docker/api/types"
14 13 
 	"github.com/docker/docker/pkg/homedir"
14 
+	"github.com/docker/engine-api/types"
15 15 
 )
16 16
17 17 
 const (
cliconfig/config_test.go
History View file @ 907407d
... ... 
@@ -7,8 +7,8 @@ import (
7 7 
 	"strings"
8 8 
 	"testing"
9 9
10 
-	"github.com/docker/docker/api/types"
11 10 
 	"github.com/docker/docker/pkg/homedir"
11 
+	"github.com/docker/engine-api/types"
12 12 
 )
13 13
14 14 
 func TestEmptyConfigDir(t *testing.T) {
container/archive.go
History View file @ 907407d
... ... 
@@ -4,8 +4,8 @@ import (
4 4 
 	"os"
5 5 
 	"path/filepath"
6 6
7 
-	"github.com/docker/docker/api/types"
8 7 
 	"github.com/docker/docker/pkg/archive"
8 
+	"github.com/docker/engine-api/types"
9 9 
 )
10 10
11 11 
 // ResolvePath resolves the given path in the container to a resource on the
container/container.go
History View file @ 907407d
... ... 
@@ -11,7 +11,6 @@ import (
11 11 
 	"time"
12 12
13 13 
 	"github.com/Sirupsen/logrus"
14 
-	containertypes "github.com/docker/docker/api/types/container"
15 14 
 	"github.com/docker/docker/daemon/exec"
16 15 
 	"github.com/docker/docker/daemon/execdriver"
17 16 
 	"github.com/docker/docker/daemon/logger"
... ... 
@@ -25,6 +24,7 @@ import (
25 25 
 	"github.com/docker/docker/pkg/symlink"
26 26 
 	"github.com/docker/docker/runconfig"
27 27 
 	"github.com/docker/docker/volume"
28 
+	containertypes "github.com/docker/engine-api/types/container"
28 29 
 	"github.com/docker/go-connections/nat"
29 30 
 	"github.com/opencontainers/runc/libcontainer/label"
30 31 
 )
container/container_unit_test.go
History View file @ 907407d
... ... 
@@ -3,8 +3,8 @@ package container
3 3 
 import (
4 4 
 	"testing"
5 5
6 
-	"github.com/docker/docker/api/types/container"
7 6 
 	"github.com/docker/docker/pkg/signal"
7 
+	"github.com/docker/engine-api/types/container"
8 8 
 )
9 9
10 10 
 func TestContainerStopSignal(t *testing.T) {
container/container_unix.go
History View file @ 907407d
... ... 
@@ -13,8 +13,6 @@ import (
13 13 
 	"syscall"
14 14
15 15 
 	"github.com/Sirupsen/logrus"
16 
-	"github.com/docker/docker/api/types/container"
17 
-	"github.com/docker/docker/api/types/network"
18 16 
 	"github.com/docker/docker/daemon/execdriver"
19 17 
 	derr "github.com/docker/docker/errors"
20 18 
 	"github.com/docker/docker/pkg/chrootarchive"
... ... 
@@ -22,6 +20,8 @@ import (
22 22 
 	"github.com/docker/docker/pkg/system"
23 23 
 	"github.com/docker/docker/utils"
24 24 
 	"github.com/docker/docker/volume"
25 
+	"github.com/docker/engine-api/types/container"
26 
+	"github.com/docker/engine-api/types/network"
25 27 
 	"github.com/docker/go-connections/nat"
26 28 
 	"github.com/docker/libnetwork"
27 29 
 	"github.com/docker/libnetwork/netlabel"
container/container_windows.go
History View file @ 907407d
... ... 
@@ -3,9 +3,9 @@
3 3 
 package container
4 4
5 5 
 import (
6 
-	"github.com/docker/docker/api/types/container"
7 6 
 	"github.com/docker/docker/daemon/execdriver"
8 7 
 	"github.com/docker/docker/volume"
8 
+	"github.com/docker/engine-api/types/container"
9 9 
 )
10 10
11 11 
 // Container holds fields specific to the Windows implementation. See
container/monitor.go
History View file @ 907407d
... ... 
@@ -9,12 +9,12 @@ import (
9 9 
 	"time"
10 10
11 11 
 	"github.com/Sirupsen/logrus"
12 
-	"github.com/docker/docker/api/types/container"
13 12 
 	"github.com/docker/docker/daemon/execdriver"
14 13 
 	derr "github.com/docker/docker/errors"
15 14 
 	"github.com/docker/docker/pkg/promise"
16 15 
 	"github.com/docker/docker/pkg/stringid"
17 16 
 	"github.com/docker/docker/utils"
17 
+	"github.com/docker/engine-api/types/container"
18 18 
 )
19 19
20 20 
 const (
daemon/archive.go
History View file @ 907407d
... ... 
@@ -7,11 +7,11 @@ import (
7 7 
 	"path/filepath"
8 8 
 	"strings"
9 9
10 
-	"github.com/docker/docker/api/types"
11 10 
 	"github.com/docker/docker/container"
12 11 
 	"github.com/docker/docker/pkg/archive"
13 12 
 	"github.com/docker/docker/pkg/chrootarchive"
14 13 
 	"github.com/docker/docker/pkg/ioutils"
14 
+	"github.com/docker/engine-api/types"
15 15 
 )
16 16
17 17 
 // ErrExtractPointNotDirectory is used to convey that the operation to extract
daemon/commit.go
History View file @ 907407d
... ... 
@@ -7,8 +7,6 @@ import (
7 7 
 	"strings"
8 8 
 	"time"
9 9
10 
-	"github.com/docker/docker/api/types"
11 
-	containertypes "github.com/docker/docker/api/types/container"
12 10 
 	"github.com/docker/docker/container"
13 11 
 	"github.com/docker/docker/dockerversion"
14 12 
 	"github.com/docker/docker/image"
... ... 
@@ -16,6 +14,8 @@ import (
16 16 
 	"github.com/docker/docker/pkg/archive"
17 17 
 	"github.com/docker/docker/pkg/ioutils"
18 18 
 	"github.com/docker/docker/reference"
19 
+	"github.com/docker/engine-api/types"
20 
+	containertypes "github.com/docker/engine-api/types/container"
19 21 
 	"github.com/docker/go-connections/nat"
20 22 
 )
21 23
daemon/config.go
History View file @ 907407d
... ... 
@@ -1,9 +1,9 @@
1 1 
 package daemon
2 2
3 3 
 import (
4 
-	"github.com/docker/docker/api/types/container"
5 4 
 	"github.com/docker/docker/opts"
6 5 
 	flag "github.com/docker/docker/pkg/mflag"
6 
+	"github.com/docker/engine-api/types/container"
7 7 
 )
8 8
9 9 
 const (
daemon/container_operations_unix.go
History View file @ 907407d
... ... 
@@ -13,8 +13,6 @@ import (
13 13 
 	"time"
14 14
15 15 
 	"github.com/Sirupsen/logrus"
16 
-	containertypes "github.com/docker/docker/api/types/container"
17 
-	networktypes "github.com/docker/docker/api/types/network"
18 16 
 	"github.com/docker/docker/container"
19 17 
 	"github.com/docker/docker/daemon/execdriver"
20 18 
 	"github.com/docker/docker/daemon/links"
... ... 
@@ -25,6 +23,8 @@ import (
25 25 
 	"github.com/docker/docker/pkg/mount"
26 26 
 	"github.com/docker/docker/pkg/stringid"
27 27 
 	"github.com/docker/docker/runconfig"
28 
+	containertypes "github.com/docker/engine-api/types/container"
29 
+	networktypes "github.com/docker/engine-api/types/network"
28 30 
 	"github.com/docker/go-units"
29 31 
 	"github.com/docker/libnetwork"
30 32 
 	"github.com/docker/libnetwork/netlabel"
daemon/create.go
History View file @ 907407d
... ... 
@@ -2,8 +2,6 @@ package daemon
2 2
3 3 
 import (
4 4 
 	"github.com/Sirupsen/logrus"
5 
-	"github.com/docker/docker/api/types"
6 
-	containertypes "github.com/docker/docker/api/types/container"
7 5 
 	"github.com/docker/docker/container"
8 6 
 	derr "github.com/docker/docker/errors"
9 7 
 	"github.com/docker/docker/image"
... ... 
@@ -11,6 +9,8 @@ import (
11 11 
 	"github.com/docker/docker/pkg/idtools"
12 12 
 	"github.com/docker/docker/pkg/stringid"
13 13 
 	volumestore "github.com/docker/docker/volume/store"
14 
+	"github.com/docker/engine-api/types"
15 
+	containertypes "github.com/docker/engine-api/types/container"
14 16 
 	"github.com/opencontainers/runc/libcontainer/label"
15 17 
 )
16 18
daemon/create_unix.go
History View file @ 907407d
... ... 
@@ -6,12 +6,12 @@ import (
6 6 
 	"os"
7 7 
 	"path/filepath"
8 8
9 
-	containertypes "github.com/docker/docker/api/types/container"
10 9 
 	"github.com/docker/docker/container"
11 10 
 	derr "github.com/docker/docker/errors"
12 11 
 	"github.com/docker/docker/image"
13 12 
 	"github.com/docker/docker/pkg/stringid"
14 13 
 	"github.com/docker/docker/volume"
14 
+	containertypes "github.com/docker/engine-api/types/container"
15 15 
 	"github.com/opencontainers/runc/libcontainer/label"
16 16 
 )
17 17
daemon/create_windows.go
History View file @ 907407d
... ... 
@@ -3,11 +3,11 @@ package daemon
3 3 
 import (
4 4 
 	"fmt"
5 5
6 
-	containertypes "github.com/docker/docker/api/types/container"
7 6 
 	"github.com/docker/docker/container"
8 7 
 	"github.com/docker/docker/image"
9 8 
 	"github.com/docker/docker/pkg/stringid"
10 9 
 	"github.com/docker/docker/volume"
10 
+	containertypes "github.com/docker/engine-api/types/container"
11 11 
 )
12 12
13 13 
 // createContainerPlatformSpecificSettings performs platform specific container create functionality
daemon/daemon.go
History View file @ 907407d
... ... 
@@ -22,17 +22,17 @@ import (
22 22 
 	"github.com/Sirupsen/logrus"
23 23 
 	"github.com/docker/distribution/digest"
24 24 
 	"github.com/docker/docker/api"
25 
-	"github.com/docker/docker/api/types"
26 
-	containertypes "github.com/docker/docker/api/types/container"
27 
-	eventtypes "github.com/docker/docker/api/types/events"
28 
-	"github.com/docker/docker/api/types/filters"
29 
-	registrytypes "github.com/docker/docker/api/types/registry"
30 
-	"github.com/docker/docker/api/types/strslice"
31 25 
 	"github.com/docker/docker/container"
32 26 
 	"github.com/docker/docker/daemon/events"
33 27 
 	"github.com/docker/docker/daemon/exec"
34 28 
 	"github.com/docker/docker/daemon/execdriver"
35 29 
 	"github.com/docker/docker/daemon/execdriver/execdrivers"
30 
+	"github.com/docker/engine-api/types"
31 
+	containertypes "github.com/docker/engine-api/types/container"
32 
+	eventtypes "github.com/docker/engine-api/types/events"
33 
+	"github.com/docker/engine-api/types/filters"
34 
+	registrytypes "github.com/docker/engine-api/types/registry"
35 
+	"github.com/docker/engine-api/types/strslice"
36 36 
 	// register graph drivers
37 37 
 	_ "github.com/docker/docker/daemon/graphdriver/register"
38 38 
 	"github.com/docker/docker/daemon/logger"
daemon/daemon_experimental.go
History View file @ 907407d
... ... 
@@ -9,8 +9,8 @@ import (
9 9 
 	"runtime"
10 10
11 11 
 	"github.com/Sirupsen/logrus"
12 
-	"github.com/docker/docker/api/types/container"
13 12 
 	"github.com/docker/docker/pkg/idtools"
13 
+	"github.com/docker/engine-api/types/container"
14 14 
 )
15 15
16 16 
 func setupRemappedRoot(config *Config) ([]idtools.IDMap, []idtools.IDMap, error) {
daemon/daemon_stub.go
History View file @ 907407d
... ... 
@@ -5,9 +5,9 @@ package daemon
5 5 
 import (
6 6 
 	"os"
7 7
8 
-	"github.com/docker/docker/api/types/container"
9 8 
 	"github.com/docker/docker/pkg/idtools"
10 9 
 	"github.com/docker/docker/pkg/system"
10 
+	"github.com/docker/engine-api/types/container"
11 11 
 )
12 12
13 13 
 func setupRemappedRoot(config *Config) ([]idtools.IDMap, []idtools.IDMap, error) {
daemon/daemon_test.go
History View file @ 907407d
... ... 
@@ -7,7 +7,6 @@ import (
7 7 
 	"path/filepath"
8 8 
 	"testing"
9 9
10 
-	containertypes "github.com/docker/docker/api/types/container"
11 10 
 	"github.com/docker/docker/container"
12 11 
 	"github.com/docker/docker/pkg/graphdb"
13 12 
 	"github.com/docker/docker/pkg/truncindex"
... ... 
@@ -15,6 +14,7 @@ import (
15 15 
 	volumedrivers "github.com/docker/docker/volume/drivers"
16 16 
 	"github.com/docker/docker/volume/local"
17 17 
 	"github.com/docker/docker/volume/store"
18 
+	containertypes "github.com/docker/engine-api/types/container"
18 19 
 	"github.com/docker/go-connections/nat"
19 20 
 )
20 21
daemon/daemon_unix.go
History View file @ 907407d
... ... 
@@ -12,8 +12,6 @@ import (
12 12 
 	"syscall"
13 13
14 14 
 	"github.com/Sirupsen/logrus"
15 
-	pblkiodev "github.com/docker/docker/api/types/blkiodev"
16 
-	containertypes "github.com/docker/docker/api/types/container"
17 15 
 	"github.com/docker/docker/container"
18 16 
 	derr "github.com/docker/docker/errors"
19 17 
 	"github.com/docker/docker/image"
... ... 
@@ -24,6 +22,8 @@ import (
24 24 
 	"github.com/docker/docker/reference"
25 25 
 	"github.com/docker/docker/runconfig"
26 26 
 	runconfigopts "github.com/docker/docker/runconfig/opts"
27 
+	pblkiodev "github.com/docker/engine-api/types/blkiodev"
28 
+	containertypes "github.com/docker/engine-api/types/container"
27 29 
 	"github.com/docker/libnetwork"
28 30 
 	nwconfig "github.com/docker/libnetwork/config"
29 31 
 	"github.com/docker/libnetwork/drivers/bridge"
daemon/daemon_unix_test.go
History View file @ 907407d
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"os"
8 8 
 	"testing"
9 9
10 
-	"github.com/docker/docker/api/types/container"
10 
+	"github.com/docker/engine-api/types/container"
11 11 
 )
12 12
13 13 
 func TestAdjustCPUShares(t *testing.T) {
daemon/daemon_windows.go
History View file @ 907407d
... ... 
@@ -9,13 +9,13 @@ import (
9 9 
 	"strings"
10 10
11 11 
 	"github.com/Sirupsen/logrus"
12 
-	containertypes "github.com/docker/docker/api/types/container"
13 12 
 	"github.com/docker/docker/container"
14 13 
 	"github.com/docker/docker/daemon/graphdriver"
15 14 
 	"github.com/docker/docker/dockerversion"
16 15 
 	"github.com/docker/docker/image"
17 16 
 	"github.com/docker/docker/layer"
18 17 
 	"github.com/docker/docker/reference"
18 
+	containertypes "github.com/docker/engine-api/types/container"
19 19 
 	// register the windows graph driver
20 20 
 	"github.com/docker/docker/daemon/graphdriver/windows"
21 21 
 	"github.com/docker/docker/pkg/system"
daemon/daemonbuilder/builder.go
History View file @ 907407d
... ... 
@@ -10,8 +10,6 @@ import (
10 10
11 11 
 	"github.com/Sirupsen/logrus"
12 12 
 	"github.com/docker/docker/api"
13 
-	"github.com/docker/docker/api/types"
14 
-	"github.com/docker/docker/api/types/container"
15 13 
 	"github.com/docker/docker/builder"
16 14 
 	"github.com/docker/docker/daemon"
17 15 
 	"github.com/docker/docker/image"
... ... 
@@ -22,6 +20,8 @@ import (
22 22 
 	"github.com/docker/docker/pkg/urlutil"
23 23 
 	"github.com/docker/docker/reference"
24 24 
 	"github.com/docker/docker/registry"
25 
+	"github.com/docker/engine-api/types"
26 
+	"github.com/docker/engine-api/types/container"
25 27 
 )
26 28
27 29 
 // Docker implements builder.Backend for the docker Daemon object.
daemon/daemonbuilder/image.go
History View file @ 907407d
... ... 
@@ -1,8 +1,8 @@
1 1 
 package daemonbuilder
2 2
3 3 
 import (
4 
-	"github.com/docker/docker/api/types/container"
5 4 
 	"github.com/docker/docker/image"
5 
+	"github.com/docker/engine-api/types/container"
6 6 
 )
7 7
8 8 
 type imgWrap struct {
daemon/delete.go
History View file @ 907407d
... ... 
@@ -5,11 +5,11 @@ import (
5 5 
 	"path"
6 6
7 7 
 	"github.com/Sirupsen/logrus"
8 
-	"github.com/docker/docker/api/types"
9 8 
 	"github.com/docker/docker/container"
10 9 
 	derr "github.com/docker/docker/errors"
11 10 
 	"github.com/docker/docker/layer"
12 11 
 	volumestore "github.com/docker/docker/volume/store"
12 
+	"github.com/docker/engine-api/types"
13 13 
 )
14 14
15 15 
 // ContainerRm removes the container id from the filesystem. An error
daemon/delete_test.go
History View file @ 907407d
... ... 
@@ -5,9 +5,9 @@ import (
5 5 
 	"os"
6 6 
 	"testing"
7 7
8 
-	"github.com/docker/docker/api/types"
9 
-	containertypes "github.com/docker/docker/api/types/container"
10 8 
 	"github.com/docker/docker/container"
9 
+	"github.com/docker/engine-api/types"
10 
+	containertypes "github.com/docker/engine-api/types/container"
11 11 
 )
12 12
13 13 
 func TestContainerDoubleDelete(t *testing.T) {
daemon/events.go
History View file @ 907407d
... ... 
@@ -3,8 +3,8 @@ package daemon
3 3 
 import (
4 4 
 	"strings"
5 5
6 
-	"github.com/docker/docker/api/types/events"
7 6 
 	"github.com/docker/docker/container"
7 
+	"github.com/docker/engine-api/types/events"
8 8 
 	"github.com/docker/libnetwork"
9 9 
 )
10 10
daemon/events/events.go
History View file @ 907407d
... ... 
@@ -4,8 +4,8 @@ import (
4 4 
 	"sync"
5 5 
 	"time"
6 6
7 
-	eventtypes "github.com/docker/docker/api/types/events"
8 7 
 	"github.com/docker/docker/pkg/pubsub"
8 
+	eventtypes "github.com/docker/engine-api/types/events"
9 9 
 )
10 10
11 11 
 const (
daemon/events/events_test.go
History View file @ 907407d
... ... 
@@ -5,7 +5,7 @@ import (
5 5 
 	"testing"
6 6 
 	"time"
7 7
8 
-	"github.com/docker/docker/api/types/events"
8 
+	"github.com/docker/engine-api/types/events"
9 9 
 )
10 10
11 11 
 func TestEventsLog(t *testing.T) {
daemon/events/filter.go
History View file @ 907407d
... ... 
@@ -1,9 +1,9 @@
1 1 
 package events
2 2
3 3 
 import (
4 
-	"github.com/docker/docker/api/types/events"
5 
-	"github.com/docker/docker/api/types/filters"
6 4 
 	"github.com/docker/docker/reference"
5 
+	"github.com/docker/engine-api/types/events"
6 
+	"github.com/docker/engine-api/types/filters"
7 7 
 )
8 8
9 9 
 // Filter can filter out docker events from a stream
daemon/events_test.go
History View file @ 907407d
... ... 
@@ -3,9 +3,9 @@ package daemon
3 3 
 import (
4 4 
 	"testing"
5 5
6 
-	containertypes "github.com/docker/docker/api/types/container"
7 6 
 	"github.com/docker/docker/container"
8 7 
 	"github.com/docker/docker/daemon/events"
8 
+	containertypes "github.com/docker/engine-api/types/container"
9 9 
 )
10 10
11 11 
 func TestLogContainerCopyLabels(t *testing.T) {
daemon/exec.go
History View file @ 907407d
... ... 
@@ -6,8 +6,6 @@ import (
6 6 
 	"time"
7 7
8 8 
 	"github.com/Sirupsen/logrus"
9 
-	"github.com/docker/docker/api/types"
10 
-	"github.com/docker/docker/api/types/strslice"
11 9 
 	"github.com/docker/docker/container"
12 10 
 	"github.com/docker/docker/daemon/exec"
13 11 
 	"github.com/docker/docker/daemon/execdriver"
... ... 
@@ -15,6 +13,8 @@ import (
15 15 
 	"github.com/docker/docker/pkg/pools"
16 16 
 	"github.com/docker/docker/pkg/promise"
17 17 
 	"github.com/docker/docker/pkg/term"
18 
+	"github.com/docker/engine-api/types"
19 
+	"github.com/docker/engine-api/types/strslice"
18 20 
 )
19 21
20 22 
 func (d *Daemon) registerExecCommand(container *container.Container, config *exec.Config) {
daemon/exec_unix.go
History View file @ 907407d
... ... 
@@ -3,9 +3,9 @@
3 3 
 package daemon
4 4
5 5 
 import (
6 
-	"github.com/docker/docker/api/types"
7 6 
 	"github.com/docker/docker/container"
8 7 
 	"github.com/docker/docker/daemon/execdriver"
8 
+	"github.com/docker/engine-api/types"
9 9 
 )
10 10
11 11 
 // setPlatformSpecificExecProcessConfig sets platform-specific fields in the
daemon/exec_windows.go
History View file @ 907407d
... ... 
@@ -1,9 +1,9 @@
1 1 
 package daemon
2 2
3 3 
 import (
4 
-	"github.com/docker/docker/api/types"
5 4 
 	"github.com/docker/docker/container"
6 5 
 	"github.com/docker/docker/daemon/execdriver"
6 
+	"github.com/docker/engine-api/types"
7 7 
 )
8 8
9 9 
 // setPlatformSpecificExecProcessConfig sets platform-specific fields in the
daemon/execdriver/windows/info.go
History View file @ 907407d
... ... 
@@ -3,8 +3,8 @@
3 3 
 package windows
4 4
5 5 
 import (
6 
-	"github.com/docker/docker/api/types/container"
7 6 
 	"github.com/docker/docker/daemon/execdriver"
7 
+	"github.com/docker/engine-api/types/container"
8 8 
 )
9 9
10 10 
 type info struct {
daemon/execdriver/windows/windows.go
History View file @ 907407d
... ... 
@@ -8,10 +8,10 @@ import (
8 8 
 	"sync"
9 9
10 10 
 	"github.com/Sirupsen/logrus"
11 
-	"github.com/docker/docker/api/types/container"
12 11 
 	"github.com/docker/docker/daemon/execdriver"
13 12 
 	"github.com/docker/docker/dockerversion"
14 13 
 	"github.com/docker/docker/pkg/parsers"
14 
+	"github.com/docker/engine-api/types/container"
15 15 
 )
16 16
17 17 
 // This is a daemon development variable only and should not be
daemon/image_delete.go
History View file @ 907407d
... ... 
@@ -4,12 +4,12 @@ import (
4 4 
 	"fmt"
5 5 
 	"strings"
6 6
7 
-	"github.com/docker/docker/api/types"
8 7 
 	"github.com/docker/docker/container"
9 8 
 	derr "github.com/docker/docker/errors"
10 9 
 	"github.com/docker/docker/image"
11 10 
 	"github.com/docker/docker/pkg/stringid"
12 11 
 	"github.com/docker/docker/reference"
12 
+	"github.com/docker/engine-api/types"
13 13 
 )
14 14
15 15 
 // ImageDelete deletes the image referenced by the given imageRef from this
daemon/images.go
History View file @ 907407d
... ... 
@@ -5,11 +5,11 @@ import (
5 5 
 	"path"
6 6 
 	"sort"
7 7
8 
-	"github.com/docker/docker/api/types"
9 
-	"github.com/docker/docker/api/types/filters"
10 8 
 	"github.com/docker/docker/image"
11 9 
 	"github.com/docker/docker/layer"
12 10 
 	"github.com/docker/docker/reference"
11 
+	"github.com/docker/engine-api/types"
12 
+	"github.com/docker/engine-api/types/filters"
13 13 
 )
14 14
15 15 
 var acceptedImageFilterTags = map[string]bool{
daemon/import.go
History View file @ 907407d
... ... 
@@ -8,7 +8,6 @@ import (
8 8 
 	"runtime"
9 9 
 	"time"
10 10
11 
-	"github.com/docker/docker/api/types/container"
12 11 
 	"github.com/docker/docker/dockerversion"
13 12 
 	"github.com/docker/docker/image"
14 13 
 	"github.com/docker/docker/layer"
... ... 
@@ -16,6 +15,7 @@ import (
16 16 
 	"github.com/docker/docker/pkg/progress"
17 17 
 	"github.com/docker/docker/pkg/streamformatter"
18 18 
 	"github.com/docker/docker/reference"
19 
+	"github.com/docker/engine-api/types/container"
19 20 
 )
20 21
21 22 
 // ImportImage imports an image, getting the archived layer data either from
daemon/info.go
History View file @ 907407d
... ... 
@@ -7,7 +7,6 @@ import (
7 7 
 	"time"
8 8
9 9 
 	"github.com/Sirupsen/logrus"
10 
-	"github.com/docker/docker/api/types"
11 10 
 	"github.com/docker/docker/dockerversion"
12 11 
 	"github.com/docker/docker/pkg/fileutils"
13 12 
 	"github.com/docker/docker/pkg/parsers/kernel"
... ... 
@@ -18,6 +17,7 @@ import (
18 18 
 	"github.com/docker/docker/registry"
19 19 
 	"github.com/docker/docker/utils"
20 20 
 	"github.com/docker/docker/volume/drivers"
21 
+	"github.com/docker/engine-api/types"
21 22 
 )
22 23
23 24 
 // SystemInfo returns information about the host server the daemon is running on.
daemon/inspect.go
History View file @ 907407d
... ... 
@@ -4,13 +4,13 @@ import (
4 4 
 	"fmt"
5 5 
 	"time"
6 6
7 
-	"github.com/docker/docker/api/types"
8 
-	networktypes "github.com/docker/docker/api/types/network"
9 
-	"github.com/docker/docker/api/types/versions/v1p20"
10 7 
 	"github.com/docker/docker/container"
11 8 
 	"github.com/docker/docker/daemon/exec"
12 9 
 	"github.com/docker/docker/daemon/network"
13 10 
 	"github.com/docker/docker/pkg/version"
11 
+	"github.com/docker/engine-api/types"
12 
+	networktypes "github.com/docker/engine-api/types/network"
13 
+	"github.com/docker/engine-api/types/versions/v1p20"
14 14 
 )
15 15
16 16 
 // ContainerInspect returns low-level information about a
daemon/inspect_unix.go
History View file @ 907407d
... ... 
@@ -3,9 +3,9 @@
3 3 
 package daemon
4 4
5 5 
 import (
6 
-	"github.com/docker/docker/api/types"
7 
-	"github.com/docker/docker/api/types/versions/v1p19"
8 6 
 	"github.com/docker/docker/container"
7 
+	"github.com/docker/engine-api/types"
8 
+	"github.com/docker/engine-api/types/versions/v1p19"
9 9 
 )
10 10
11 11 
 // This sets platform-specific fields
daemon/inspect_windows.go
History View file @ 907407d
... ... 
@@ -1,8 +1,8 @@
1 1 
 package daemon
2 2
3 3 
 import (
4 
-	"github.com/docker/docker/api/types"
5 4 
 	"github.com/docker/docker/container"
5 
+	"github.com/docker/engine-api/types"
6 6 
 )
7 7
8 8 
 // This sets platform-specific fields
daemon/list.go
History View file @ 907407d
... ... 
@@ -7,11 +7,11 @@ import (
7 7 
 	"strings"
8 8
9 9 
 	"github.com/Sirupsen/logrus"
10 
-	"github.com/docker/docker/api/types"
11 
-	"github.com/docker/docker/api/types/filters"
12 10 
 	"github.com/docker/docker/container"
13 11 
 	"github.com/docker/docker/image"
14 12 
 	"github.com/docker/docker/pkg/graphdb"
13 
+	"github.com/docker/engine-api/types"
14 
+	"github.com/docker/engine-api/types/filters"
15 15 
 	"github.com/docker/go-connections/nat"
16 16 
 )
17 17
daemon/network.go
History View file @ 907407d
... ... 
@@ -6,9 +6,9 @@ import (
6 6 
 	"net"
7 7 
 	"strings"
8 8
9 
-	"github.com/docker/docker/api/types/network"
10 9 
 	derr "github.com/docker/docker/errors"
11 10 
 	"github.com/docker/docker/runconfig"
11 
+	"github.com/docker/engine-api/types/network"
12 12 
 	"github.com/docker/libnetwork"
13 13 
 )
14 14
daemon/network/settings.go
History View file @ 907407d
... ... 
@@ -1,7 +1,7 @@
1 1 
 package network
2 2
3 3 
 import (
4 
-	networktypes "github.com/docker/docker/api/types/network"
4 
+	networktypes "github.com/docker/engine-api/types/network"
5 5 
 	"github.com/docker/go-connections/nat"
6 6 
 )
7 7
daemon/start.go
History View file @ 907407d
... ... 
@@ -4,10 +4,10 @@ import (
4 4 
 	"runtime"
5 5
6 6 
 	"github.com/Sirupsen/logrus"
7 
-	containertypes "github.com/docker/docker/api/types/container"
8 7 
 	"github.com/docker/docker/container"
9 8 
 	derr "github.com/docker/docker/errors"
10 9 
 	"github.com/docker/docker/runconfig"
10 
+	containertypes "github.com/docker/engine-api/types/container"
11 11 
 )
12 12
13 13 
 // ContainerStart starts a container.
daemon/stats.go
History View file @ 907407d
... ... 
@@ -4,10 +4,10 @@ import (
4 4 
 	"encoding/json"
5 5 
 	"io"
6 6
7 
-	"github.com/docker/docker/api/types"
8 
-	"github.com/docker/docker/api/types/versions/v1p20"
9 7 
 	"github.com/docker/docker/daemon/execdriver"
10 8 
 	"github.com/docker/docker/pkg/version"
9 
+	"github.com/docker/engine-api/types"
10 
+	"github.com/docker/engine-api/types/versions/v1p20"
11 11 
 )
12 12
13 13 
 // ContainerStatsConfig holds information for configuring the runtime
daemon/stats_freebsd.go
History View file @ 907407d
... ... 
@@ -1,7 +1,7 @@
1 1 
 package daemon
2 2
3 3 
 import (
4 
-	"github.com/docker/docker/api/types"
4 
+	"github.com/docker/engine-api/types"
5 5 
 	"github.com/opencontainers/runc/libcontainer"
6 6 
 )
7 7
daemon/stats_linux.go
History View file @ 907407d
... ... 
@@ -1,7 +1,7 @@
1 1 
 package daemon
2 2
3 3 
 import (
4 
-	"github.com/docker/docker/api/types"
4 
+	"github.com/docker/engine-api/types"
5 5 
 	"github.com/opencontainers/runc/libcontainer"
6 6 
 	"github.com/opencontainers/runc/libcontainer/cgroups"
7 7 
 )
daemon/stats_windows.go
History View file @ 907407d
... ... 
@@ -1,7 +1,7 @@
1 1 
 package daemon
2 2
3 3 
 import (
4 
-	"github.com/docker/docker/api/types"
4 
+	"github.com/docker/engine-api/types"
5 5 
 	"github.com/opencontainers/runc/libcontainer"
6 6 
 )
7 7
daemon/top_unix.go
History View file @ 907407d
... ... 
@@ -7,8 +7,8 @@ import (
7 7 
 	"strconv"
8 8 
 	"strings"
9 9
10 
-	"github.com/docker/docker/api/types"
11 10 
 	derr "github.com/docker/docker/errors"
11 
+	"github.com/docker/engine-api/types"
12 12 
 )
13 13
14 14 
 // ContainerTop lists the processes running inside of the given
daemon/top_windows.go
History View file @ 907407d
... ... 
@@ -1,8 +1,8 @@
1 1 
 package daemon
2 2
3 3 
 import (
4 
-	"github.com/docker/docker/api/types"
5 4 
 	derr "github.com/docker/docker/errors"
5 
+	"github.com/docker/engine-api/types"
6 6 
 )
7 7
8 8 
 // ContainerTop is not supported on Windows and returns an error.
daemon/update.go
History View file @ 907407d
... ... 
@@ -3,7 +3,7 @@ package daemon
3 3 
 import (
4 4 
 	"fmt"
5 5
6 
-	"github.com/docker/docker/api/types/container"
6 
+	"github.com/docker/engine-api/types/container"
7 7 
 )
8 8
9 9 
 // ContainerUpdate updates resources of the container
daemon/volumes.go
History View file @ 907407d
... ... 
@@ -6,12 +6,12 @@ import (
6 6 
 	"path/filepath"
7 7 
 	"strings"
8 8
9 
-	"github.com/docker/docker/api/types"
10 
-	containertypes "github.com/docker/docker/api/types/container"
11 9 
 	"github.com/docker/docker/container"
12 10 
 	"github.com/docker/docker/daemon/execdriver"
13 11 
 	derr "github.com/docker/docker/errors"
14 12 
 	"github.com/docker/docker/volume"
13 
+	"github.com/docker/engine-api/types"
14 
+	containertypes "github.com/docker/engine-api/types/container"
15 15 
 	"github.com/opencontainers/runc/libcontainer/label"
16 16 
 )
17 17
distribution/pull.go
History View file @ 907407d
... ... 
@@ -7,13 +7,13 @@ import (
7 7
8 8 
 	"github.com/Sirupsen/logrus"
9 9 
 	"github.com/docker/docker/api"
10 
-	"github.com/docker/docker/api/types"
11 10 
 	"github.com/docker/docker/distribution/metadata"
12 11 
 	"github.com/docker/docker/distribution/xfer"
13 12 
 	"github.com/docker/docker/image"
14 13 
 	"github.com/docker/docker/pkg/progress"
15 14 
 	"github.com/docker/docker/reference"
16 15 
 	"github.com/docker/docker/registry"
16 
+	"github.com/docker/engine-api/types"
17 17 
 	"golang.org/x/net/context"
18 18 
 )
19 19
distribution/push.go
History View file @ 907407d
... ... 
@@ -8,7 +8,6 @@ import (
8 8
9 9 
 	"github.com/Sirupsen/logrus"
10 10 
 	"github.com/docker/distribution/digest"
11 
-	"github.com/docker/docker/api/types"
12 11 
 	"github.com/docker/docker/distribution/metadata"
13 12 
 	"github.com/docker/docker/distribution/xfer"
14 13 
 	"github.com/docker/docker/image"
... ... 
@@ -16,6 +15,7 @@ import (
16 16 
 	"github.com/docker/docker/pkg/progress"
17 17 
 	"github.com/docker/docker/reference"
18 18 
 	"github.com/docker/docker/registry"
19 
+	"github.com/docker/engine-api/types"
19 20 
 	"github.com/docker/libtrust"
20 21 
 	"golang.org/x/net/context"
21 22 
 )
distribution/registry.go
History View file @ 907407d
... ... 
@@ -16,10 +16,10 @@ import (
16 16 
 	"github.com/docker/distribution/registry/client"
17 17 
 	"github.com/docker/distribution/registry/client/auth"
18 18 
 	"github.com/docker/distribution/registry/client/transport"
19 
-	"github.com/docker/docker/api/types"
20 19 
 	"github.com/docker/docker/distribution/xfer"
21 20 
 	"github.com/docker/docker/reference"
22 21 
 	"github.com/docker/docker/registry"
22 
+	"github.com/docker/engine-api/types"
23 23 
 	"golang.org/x/net/context"
24 24 
 )
25 25
distribution/registry_unit_test.go
History View file @ 907407d
... ... 
@@ -8,11 +8,11 @@ import (
8 8 
 	"testing"
9 9
10 10 
 	"github.com/Sirupsen/logrus"
11 
-	"github.com/docker/docker/api/types"
12 
-	registrytypes "github.com/docker/docker/api/types/registry"
13 11 
 	"github.com/docker/docker/reference"
14 12 
 	"github.com/docker/docker/registry"
15 13 
 	"github.com/docker/docker/utils"
14 
+	"github.com/docker/engine-api/types"
15 
+	registrytypes "github.com/docker/engine-api/types/registry"
16 16 
 	"golang.org/x/net/context"
17 17 
 )
18 18
image/image.go
History View file @ 907407d
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"time"
8 8
9 9 
 	"github.com/docker/distribution/digest"
10 
-	"github.com/docker/docker/api/types/container"
10 
+	"github.com/docker/engine-api/types/container"
11 11 
 )
12 12
13 13 
 // ID is the content-addressable ID of an image.
integration-cli/docker_api_containers_test.go
History View file @ 907407d
... ... 
@@ -15,11 +15,11 @@ import (
15 15 
 	"strings"
16 16 
 	"time"
17 17
18 
-	"github.com/docker/docker/api/types"
19 
-	containertypes "github.com/docker/docker/api/types/container"
20 18 
 	"github.com/docker/docker/pkg/integration"
21 19 
 	"github.com/docker/docker/pkg/integration/checker"
22 20 
 	"github.com/docker/docker/pkg/stringid"
21 
+	"github.com/docker/engine-api/types"
22 
+	containertypes "github.com/docker/engine-api/types/container"
23 23 
 	"github.com/go-check/check"
24 24 
 )
25 25
integration-cli/docker_api_images_test.go
History View file @ 907407d
... ... 
@@ -6,8 +6,8 @@ import (
6 6 
 	"net/url"
7 7 
 	"strings"
8 8
9 
-	"github.com/docker/docker/api/types"
10 9 
 	"github.com/docker/docker/pkg/integration/checker"
10 
+	"github.com/docker/engine-api/types"
11 11 
 	"github.com/go-check/check"
12 12 
 )
13 13
integration-cli/docker_api_inspect_test.go
History View file @ 907407d
... ... 
@@ -5,10 +5,10 @@ import (
5 5 
 	"net/http"
6 6 
 	"strings"
7 7
8 
-	"github.com/docker/docker/api/types"
9 
-	"github.com/docker/docker/api/types/versions/v1p20"
10 8 
 	"github.com/docker/docker/pkg/integration/checker"
11 9 
 	"github.com/docker/docker/pkg/stringutils"
10 
+	"github.com/docker/engine-api/types"
11 
+	"github.com/docker/engine-api/types/versions/v1p20"
12 12 
 	"github.com/go-check/check"
13 13 
 )
14 14
integration-cli/docker_api_network_test.go
History View file @ 907407d
... ... 
@@ -8,10 +8,10 @@ import (
8 8 
 	"net/url"
9 9 
 	"strings"
10 10
11 
-	"github.com/docker/docker/api/types"
12 
-	"github.com/docker/docker/api/types/filters"
13 
-	"github.com/docker/docker/api/types/network"
14 11 
 	"github.com/docker/docker/pkg/integration/checker"
12 
+	"github.com/docker/engine-api/types"
13 
+	"github.com/docker/engine-api/types/filters"
14 
+	"github.com/docker/engine-api/types/network"
15 15 
 	"github.com/go-check/check"
16 16 
 )
17 17
integration-cli/docker_api_stats_test.go
History View file @ 907407d
... ... 
@@ -10,9 +10,9 @@ import (
10 10 
 	"strings"
11 11 
 	"time"
12 12
13 
-	"github.com/docker/docker/api/types"
14 13 
 	"github.com/docker/docker/pkg/integration/checker"
15 14 
 	"github.com/docker/docker/pkg/version"
15 
+	"github.com/docker/engine-api/types"
16 16 
 	"github.com/go-check/check"
17 17 
 )
18 18
integration-cli/docker_api_version_test.go
History View file @ 907407d
... ... 
@@ -4,9 +4,9 @@ import (
4 4 
 	"encoding/json"
5 5 
 	"net/http"
6 6
7 
-	"github.com/docker/docker/api/types"
8 7 
 	"github.com/docker/docker/dockerversion"
9 8 
 	"github.com/docker/docker/pkg/integration/checker"
9 
+	"github.com/docker/engine-api/types"
10 10 
 	"github.com/go-check/check"
11 11 
 )
12 12
integration-cli/docker_api_volumes_test.go
History View file @ 907407d
... ... 
@@ -5,8 +5,8 @@ import (
5 5 
 	"net/http"
6 6 
 	"path/filepath"
7 7
8 
-	"github.com/docker/docker/api/types"
9 8 
 	"github.com/docker/docker/pkg/integration/checker"
9 
+	"github.com/docker/engine-api/types"
10 10 
 	"github.com/go-check/check"
11 11 
 )
12 12
integration-cli/docker_cli_by_digest_test.go
History View file @ 907407d
... ... 
@@ -10,9 +10,9 @@ import (
10 10
11 11 
 	"github.com/docker/distribution/digest"
12 12 
 	"github.com/docker/distribution/manifest/schema1"
13 
-	"github.com/docker/docker/api/types"
14 13 
 	"github.com/docker/docker/pkg/integration/checker"
15 14 
 	"github.com/docker/docker/pkg/stringutils"
15 
+	"github.com/docker/engine-api/types"
16 16 
 	"github.com/go-check/check"
17 17 
 )
18 18
integration-cli/docker_cli_inspect_experimental_test.go
History View file @ 907407d
... ... 
@@ -3,8 +3,8 @@
3 3 
 package main
4 4
5 5 
 import (
6 
-	"github.com/docker/docker/api/types"
7 6 
 	"github.com/docker/docker/pkg/integration/checker"
7 
+	"github.com/docker/engine-api/types"
8 8 
 	"github.com/go-check/check"
9 9 
 )
10 10
integration-cli/docker_cli_inspect_test.go
History View file @ 907407d
... ... 
@@ -8,9 +8,9 @@ import (
8 8 
 	"strings"
9 9 
 	"time"
10 10
11 
-	"github.com/docker/docker/api/types"
12 
-	"github.com/docker/docker/api/types/container"
13 11 
 	"github.com/docker/docker/pkg/integration/checker"
12 
+	"github.com/docker/engine-api/types"
13 
+	"github.com/docker/engine-api/types/container"
14 14 
 	"github.com/go-check/check"
15 15 
 )
16 16
integration-cli/docker_cli_network_unix_test.go
History View file @ 907407d
... ... 
@@ -13,10 +13,10 @@ import (
13 13 
 	"sort"
14 14 
 	"strings"
15 15
16 
-	"github.com/docker/docker/api/types"
17 
-	"github.com/docker/docker/api/types/versions/v1p20"
18 16 
 	"github.com/docker/docker/pkg/integration/checker"
19 17 
 	"github.com/docker/docker/runconfig"
18 
+	"github.com/docker/engine-api/types"
19 
+	"github.com/docker/engine-api/types/versions/v1p20"
20 20 
 	"github.com/docker/libnetwork/driverapi"
21 21 
 	remoteapi "github.com/docker/libnetwork/drivers/remote/api"
22 22 
 	"github.com/docker/libnetwork/ipamapi"
integration-cli/docker_cli_update_unix_test.go
History View file @ 907407d
... ... 
@@ -7,8 +7,8 @@ import (
7 7 
 	"fmt"
8 8 
 	"strings"
9 9
10 
-	"github.com/docker/docker/api/types"
11 10 
 	"github.com/docker/docker/pkg/integration/checker"
11 
+	"github.com/docker/engine-api/types"
12 12 
 	"github.com/go-check/check"
13 13 
 )
14 14
integration-cli/docker_utils.go
History View file @ 907407d
... ... 
@@ -22,12 +22,12 @@ import (
22 22 
 	"strings"
23 23 
 	"time"
24 24
25 
-	"github.com/docker/docker/api/types"
26 25 
 	"github.com/docker/docker/opts"
27 26 
 	"github.com/docker/docker/pkg/httputils"
28 27 
 	"github.com/docker/docker/pkg/integration"
29 28 
 	"github.com/docker/docker/pkg/ioutils"
30 29 
 	"github.com/docker/docker/pkg/stringutils"
30 
+	"github.com/docker/engine-api/types"
31 31 
 	"github.com/docker/go-connections/sockets"
32 32 
 	"github.com/docker/go-connections/tlsconfig"
33 33 
 	"github.com/go-check/check"
registry/auth.go
History View file @ 907407d
... ... 
@@ -8,8 +8,8 @@ import (
8 8 
 	"strings"
9 9
10 10 
 	"github.com/Sirupsen/logrus"
11 
-	"github.com/docker/docker/api/types"
12 
-	registrytypes "github.com/docker/docker/api/types/registry"
11 
+	"github.com/docker/engine-api/types"
12 
+	registrytypes "github.com/docker/engine-api/types/registry"
13 13 
 )
14 14
15 15 
 // Login tries to register/login to the registry server.
registry/auth_test.go
History View file @ 907407d
... ... 
@@ -3,8 +3,8 @@ package registry
3 3 
 import (
4 4 
 	"testing"
5 5
6 
-	"github.com/docker/docker/api/types"
7 
-	registrytypes "github.com/docker/docker/api/types/registry"
6 
+	"github.com/docker/engine-api/types"
7 
+	registrytypes "github.com/docker/engine-api/types/registry"
8 8 
 )
9 9
10 10 
 func buildAuthConfigs() map[string]types.AuthConfig {
registry/config.go
History View file @ 907407d
... ... 
@@ -7,10 +7,10 @@ import (
7 7 
 	"net/url"
8 8 
 	"strings"
9 9
10 
-	registrytypes "github.com/docker/docker/api/types/registry"
11 10 
 	"github.com/docker/docker/opts"
12 11 
 	flag "github.com/docker/docker/pkg/mflag"
13 12 
 	"github.com/docker/docker/reference"
13 
+	registrytypes "github.com/docker/engine-api/types/registry"
14 14 
 )
15 15
16 16 
 // Options holds command line options.
registry/endpoint.go
History View file @ 907407d
... ... 
@@ -13,7 +13,7 @@ import (
13 13 
 	"github.com/Sirupsen/logrus"
14 14 
 	"github.com/docker/distribution/registry/api/v2"
15 15 
 	"github.com/docker/distribution/registry/client/transport"
16 
-	registrytypes "github.com/docker/docker/api/types/registry"
16 
+	registrytypes "github.com/docker/engine-api/types/registry"
17 17 
 )
18 18
19 19 
 // for mocking in unit tests
registry/registry_mock_test.go
History View file @ 907407d
... ... 
@@ -15,9 +15,9 @@ import (
15 15 
 	"testing"
16 16 
 	"time"
17 17
18 
-	registrytypes "github.com/docker/docker/api/types/registry"
19 18 
 	"github.com/docker/docker/opts"
20 19 
 	"github.com/docker/docker/reference"
20 
+	registrytypes "github.com/docker/engine-api/types/registry"
21 21 
 	"github.com/gorilla/mux"
22 22
23 23 
 	"github.com/Sirupsen/logrus"
registry/registry_test.go
History View file @ 907407d
... ... 
@@ -9,9 +9,9 @@ import (
9 9 
 	"testing"
10 10
11 11 
 	"github.com/docker/distribution/registry/client/transport"
12 
-	"github.com/docker/docker/api/types"
13 
-	registrytypes "github.com/docker/docker/api/types/registry"
14 12 
 	"github.com/docker/docker/reference"
13 
+	"github.com/docker/engine-api/types"
14 
+	registrytypes "github.com/docker/engine-api/types/registry"
15 15 
 )
16 16
17 17 
 var (
registry/service.go
History View file @ 907407d
... ... 
@@ -6,9 +6,9 @@ import (
6 6 
 	"net/url"
7 7 
 	"strings"
8 8
9 
-	"github.com/docker/docker/api/types"
10 
-	registrytypes "github.com/docker/docker/api/types/registry"
11 9 
 	"github.com/docker/docker/reference"
10 
+	"github.com/docker/engine-api/types"
11 
+	registrytypes "github.com/docker/engine-api/types/registry"
12 12 
 )
13 13
14 14 
 // Service is a registry service. It tracks configuration data such as a list
registry/session.go
History View file @ 907407d
... ... 
@@ -19,13 +19,13 @@ import (
19 19 
 	"strings"
20 20
21 21 
 	"github.com/Sirupsen/logrus"
22 
-	"github.com/docker/docker/api/types"
23 
-	registrytypes "github.com/docker/docker/api/types/registry"
24 22 
 	"github.com/docker/docker/pkg/httputils"
25 23 
 	"github.com/docker/docker/pkg/ioutils"
26 24 
 	"github.com/docker/docker/pkg/stringid"
27 25 
 	"github.com/docker/docker/pkg/tarsum"
28 26 
 	"github.com/docker/docker/reference"
27 
+	"github.com/docker/engine-api/types"
28 
+	registrytypes "github.com/docker/engine-api/types/registry"
29 29 
 )
30 30
31 31 
 var (
registry/types.go
History View file @ 907407d
... ... 
@@ -1,8 +1,8 @@
1 1 
 package registry
2 2
3 3 
 import (
4 
-	registrytypes "github.com/docker/docker/api/types/registry"
5 4 
 	"github.com/docker/docker/reference"
5 
+	registrytypes "github.com/docker/engine-api/types/registry"
6 6 
 )
7 7
8 8 
 // RepositoryData tracks the image list, list of endpoints, and list of tokens
runconfig/compare.go
History View file @ 907407d
... ... 
@@ -1,6 +1,6 @@
1 1 
 package runconfig
2 2
3 
-import "github.com/docker/docker/api/types/container"
3 
+import "github.com/docker/engine-api/types/container"
4 4
5 5 
 // Compare two Config struct. Do not compare the "Image" nor "Hostname" fields
6 6 
 // If OpenStdin is set, then it differs
runconfig/compare_test.go
History View file @ 907407d
... ... 
@@ -3,8 +3,8 @@ package runconfig
3 3 
 import (
4 4 
 	"testing"
5 5
6 
-	"github.com/docker/docker/api/types/container"
7 
-	"github.com/docker/docker/api/types/strslice"
6 
+	"github.com/docker/engine-api/types/container"
7 
+	"github.com/docker/engine-api/types/strslice"
8 8 
 	"github.com/docker/go-connections/nat"
9 9 
 )
10 10
runconfig/config.go
History View file @ 907407d
... ... 
@@ -5,8 +5,8 @@ import (
5 5 
 	"fmt"
6 6 
 	"io"
7 7
8 
-	"github.com/docker/docker/api/types/container"
9 8 
 	"github.com/docker/docker/volume"
9 
+	"github.com/docker/engine-api/types/container"
10 10 
 )
11 11
12 12 
 // DecodeContainerConfig decodes a json encoded config into a ContainerConfigWrapper
runconfig/config_test.go
History View file @ 907407d
... ... 
@@ -9,8 +9,8 @@ import (
9 9 
 	"strings"
10 10 
 	"testing"
11 11
12 
-	"github.com/docker/docker/api/types/container"
13 
-	"github.com/docker/docker/api/types/strslice"
12 
+	"github.com/docker/engine-api/types/container"
13 
+	"github.com/docker/engine-api/types/strslice"
14 14 
 )
15 15
16 16 
 type f struct {
runconfig/config_unix.go
History View file @ 907407d
... ... 
@@ -2,7 +2,7 @@
2 2
3 3 
 package runconfig
4 4
5 
-import "github.com/docker/docker/api/types/container"
5 
+import "github.com/docker/engine-api/types/container"
6 6
7 7 
 // ContainerConfigWrapper is a Config wrapper that hold the container Config (portable)
8 8 
 // and the corresponding HostConfig (non-portable).
runconfig/config_windows.go
History View file @ 907407d
... ... 
@@ -1,6 +1,6 @@
1 1 
 package runconfig
2 2
3 
-import "github.com/docker/docker/api/types/container"
3 
+import "github.com/docker/engine-api/types/container"
4 4
5 5 
 // ContainerConfigWrapper is a Config wrapper that hold the container Config (portable)
6 6 
 // and the corresponding HostConfig (non-portable).
runconfig/hostconfig.go
History View file @ 907407d
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"encoding/json"
5 5 
 	"io"
6 6
7 
-	"github.com/docker/docker/api/types/container"
7 
+	"github.com/docker/engine-api/types/container"
8 8 
 )
9 9
10 10 
 // DecodeHostConfig creates a HostConfig based on the specified Reader.
runconfig/hostconfig_test.go
History View file @ 907407d
... ... 
@@ -8,7 +8,7 @@ import (
8 8 
 	"io/ioutil"
9 9 
 	"testing"
10 10
11 
-	"github.com/docker/docker/api/types/container"
11 
+	"github.com/docker/engine-api/types/container"
12 12 
 )
13 13
14 14 
 // TODO Windows: This will need addressing for a Windows daemon.
runconfig/hostconfig_unix.go
History View file @ 907407d
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"runtime"
8 8 
 	"strings"
9 9
10 
-	"github.com/docker/docker/api/types/container"
10 
+	"github.com/docker/engine-api/types/container"
11 11 
 )
12 12
13 13 
 // DefaultDaemonNetworkMode returns the default network stack the daemon should
runconfig/hostconfig_windows.go
History View file @ 907407d
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"fmt"
5 5 
 	"strings"
6 6
7 
-	"github.com/docker/docker/api/types/container"
7 
+	"github.com/docker/engine-api/types/container"
8 8 
 )
9 9
10 10 
 // DefaultDaemonNetworkMode returns the default network stack the daemon should
runconfig/opts/parse.go
History View file @ 907407d
... ... 
@@ -6,12 +6,12 @@ import (
6 6 
 	"strconv"
7 7 
 	"strings"
8 8
9 
-	"github.com/docker/docker/api/types/container"
10 
-	"github.com/docker/docker/api/types/strslice"
11 9 
 	"github.com/docker/docker/opts"
12 10 
 	flag "github.com/docker/docker/pkg/mflag"
13 11 
 	"github.com/docker/docker/pkg/mount"
14 12 
 	"github.com/docker/docker/pkg/signal"
13 
+	"github.com/docker/engine-api/types/container"
14 
+	"github.com/docker/engine-api/types/strslice"
15 15 
 	"github.com/docker/go-connections/nat"
16 16 
 	"github.com/docker/go-units"
17 17 
 )
runconfig/opts/parse_test.go
History View file @ 907407d
... ... 
@@ -10,9 +10,9 @@ import (
10 10 
 	"strings"
11 11 
 	"testing"
12 12
13 
-	"github.com/docker/docker/api/types/container"
14 13 
 	flag "github.com/docker/docker/pkg/mflag"
15 14 
 	"github.com/docker/docker/runconfig"
15 
+	"github.com/docker/engine-api/types/container"
16 16 
 	"github.com/docker/go-connections/nat"
17 17 
 )
18 18
runconfig/opts/throttledevice.go
History View file @ 907407d
... ... 
@@ -5,7 +5,7 @@ import (
5 5 
 	"strconv"
6 6 
 	"strings"
7 7
8 
-	"github.com/docker/docker/api/types/blkiodev"
8 
+	"github.com/docker/engine-api/types/blkiodev"
9 9 
 	"github.com/docker/go-units"
10 10 
 )
11 11
runconfig/opts/weightdevice.go
History View file @ 907407d
... ... 
@@ -5,7 +5,7 @@ import (
5 5 
 	"strconv"
6 6 
 	"strings"
7 7
8 
-	"github.com/docker/docker/api/types/blkiodev"
8 
+	"github.com/docker/engine-api/types/blkiodev"
9 9 
 )
10 10
11 11 
 // ValidatorWeightFctType defines a validator function that returns a validated struct and/or an error.