Skip to content

Commit 7c36a1a

Browse files
crosbymichaelcrosbymichael
committed
Move engine-api client package
This moves the engine-api client package to `/docker/docker/client`. Signed-off-by: Michael Crosby <[email protected]>
1 parent 91e197d commit 7c36a1a

File tree

211 files changed

+10044
-75
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+10044
-75
lines changed

‎api/client/cli.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"github.com/docker/docker/cliconfig"
1515
"github.com/docker/docker/cliconfig/configfile"
1616
"github.com/docker/docker/cliconfig/credentials"
17+
"github.com/docker/docker/client"
1718
"github.com/docker/docker/dockerversion"
1819
dopts "github.com/docker/docker/opts"
1920
"github.com/docker/docker/pkg/term"
20-
"github.com/docker/engine-api/client"
2121
"github.com/docker/go-connections/sockets"
2222
"github.com/docker/go-connections/tlsconfig"
2323
)

‎api/client/container/create.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"github.com/docker/docker/api/types"
1515
"github.com/docker/docker/api/types/container"
1616
networktypes "github.com/docker/docker/api/types/network"
17+
apiclient "github.com/docker/docker/client"
1718
"github.com/docker/docker/reference"
1819
"github.com/docker/docker/registry"
1920
runconfigopts "github.com/docker/docker/runconfig/opts"
20-
apiclient "github.com/docker/engine-api/client"
2121
"github.com/spf13/cobra"
2222
"github.com/spf13/pflag"
2323
)

‎api/client/container/stats_helpers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/Sirupsen/logrus"
1313
"github.com/docker/docker/api/types"
14-
"github.com/docker/engine-api/client"
14+
"github.com/docker/docker/client"
1515
"github.com/docker/go-units"
1616
"golang.org/x/net/context"
1717
)

‎api/client/container/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/docker/docker/api/types"
1313
"github.com/docker/docker/api/types/events"
1414
"github.com/docker/docker/api/types/filters"
15-
clientapi "github.com/docker/engine-api/client"
15+
clientapi "github.com/docker/docker/client"
1616
)
1717

1818
func waitExitOrRemoved(dockerCli *client.DockerCli, ctx context.Context, containerID string, waitRemove bool) (chan int, error) {

‎api/client/idresolver/idresolver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"golang.org/x/net/context"
77

88
"github.com/docker/docker/api/types/swarm"
9-
"github.com/docker/engine-api/client"
9+
"github.com/docker/docker/client"
1010
)
1111

1212
// IDResolver provides ID to Name resolution.

‎api/client/node/cmd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/docker/docker/api/client"
77
"github.com/docker/docker/cli"
8-
apiclient "github.com/docker/engine-api/client"
8+
apiclient "github.com/docker/docker/client"
99
"github.com/spf13/cobra"
1010
"golang.org/x/net/context"
1111
)

‎api/client/service/inspect.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/docker/docker/api/client/inspect"
1313
"github.com/docker/docker/api/types/swarm"
1414
"github.com/docker/docker/cli"
15+
apiclient "github.com/docker/docker/client"
1516
"github.com/docker/docker/pkg/ioutils"
16-
apiclient "github.com/docker/engine-api/client"
1717
"github.com/docker/go-units"
1818
"github.com/spf13/cobra"
1919
)

‎api/client/stack/common.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/docker/docker/api/types"
99
"github.com/docker/docker/api/types/filters"
1010
"github.com/docker/docker/api/types/swarm"
11-
"github.com/docker/engine-api/client"
11+
"github.com/docker/docker/client"
1212
)
1313

1414
const (

‎api/client/system/inspect.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/docker/docker/api/client"
1010
"github.com/docker/docker/api/client/inspect"
1111
"github.com/docker/docker/cli"
12-
apiclient "github.com/docker/engine-api/client"
12+
apiclient "github.com/docker/docker/client"
1313
"github.com/spf13/cobra"
1414
)
1515

‎api/client/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515

1616
"github.com/Sirupsen/logrus"
1717
"github.com/docker/docker/api/types"
18+
"github.com/docker/docker/client"
1819
"github.com/docker/docker/pkg/signal"
1920
"github.com/docker/docker/pkg/term"
20-
"github.com/docker/engine-api/client"
2121
)
2222

2323
func (cli *DockerCli) resizeTty(ctx context.Context, id string, isExec bool) {

‎api/server/router/build/backend.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package build
33
import (
44
"io"
55

6+
"github.com/docker/docker/api/types"
67
"github.com/docker/docker/api/types/backend"
7-
"github.com/docker/engine-api/types"
88
"golang.org/x/net/context"
99
)
1010

‎api/server/router/build/build_routes.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import (
1313

1414
"github.com/Sirupsen/logrus"
1515
"github.com/docker/docker/api/server/httputils"
16+
"github.com/docker/docker/api/types"
1617
"github.com/docker/docker/api/types/backend"
18+
"github.com/docker/docker/api/types/container"
19+
"github.com/docker/docker/api/types/versions"
1720
"github.com/docker/docker/pkg/ioutils"
1821
"github.com/docker/docker/pkg/progress"
1922
"github.com/docker/docker/pkg/streamformatter"
20-
"github.com/docker/engine-api/types"
21-
"github.com/docker/engine-api/types/container"
22-
"github.com/docker/engine-api/types/versions"
2323
"github.com/docker/go-units"
2424
"golang.org/x/net/context"
2525
)

‎api/server/router/container/backend.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66

77
"golang.org/x/net/context"
88

9+
"github.com/docker/docker/api/types"
910
"github.com/docker/docker/api/types/backend"
11+
"github.com/docker/docker/api/types/container"
1012
"github.com/docker/docker/pkg/archive"
11-
"github.com/docker/engine-api/types"
12-
"github.com/docker/engine-api/types/container"
1313
)
1414

1515
// execBackend includes functions to implement to provide exec functionality.

‎api/server/router/container/container_routes.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import (
1212

1313
"github.com/Sirupsen/logrus"
1414
"github.com/docker/docker/api/server/httputils"
15+
"github.com/docker/docker/api/types"
1516
"github.com/docker/docker/api/types/backend"
17+
"github.com/docker/docker/api/types/container"
18+
"github.com/docker/docker/api/types/filters"
19+
"github.com/docker/docker/api/types/versions"
1620
"github.com/docker/docker/pkg/ioutils"
1721
"github.com/docker/docker/pkg/signal"
18-
"github.com/docker/engine-api/types"
19-
"github.com/docker/engine-api/types/container"
20-
"github.com/docker/engine-api/types/filters"
21-
"github.com/docker/engine-api/types/versions"
2222
"golang.org/x/net/context"
2323
"golang.org/x/net/websocket"
2424
)

‎api/server/router/container/copy.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"strings"
1111

1212
"github.com/docker/docker/api/server/httputils"
13-
"github.com/docker/engine-api/types"
14-
"github.com/docker/engine-api/types/versions"
13+
"github.com/docker/docker/api/types"
14+
"github.com/docker/docker/api/types/versions"
1515
"golang.org/x/net/context"
1616
)
1717

‎api/server/router/container/exec.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
"github.com/Sirupsen/logrus"
1111
"github.com/docker/docker/api/server/httputils"
12+
"github.com/docker/docker/api/types"
13+
"github.com/docker/docker/api/types/versions"
1214
"github.com/docker/docker/pkg/stdcopy"
13-
"github.com/docker/engine-api/types"
14-
"github.com/docker/engine-api/types/versions"
1515
"golang.org/x/net/context"
1616
)
1717

‎api/server/router/image/backend.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package image
33
import (
44
"io"
55

6+
"github.com/docker/docker/api/types"
67
"github.com/docker/docker/api/types/backend"
7-
"github.com/docker/engine-api/types"
8-
"github.com/docker/engine-api/types/registry"
8+
"github.com/docker/docker/api/types/registry"
99
"golang.org/x/net/context"
1010
)
1111

‎api/server/router/image/image_routes.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import (
1010
"strings"
1111

1212
"github.com/docker/docker/api/server/httputils"
13+
"github.com/docker/docker/api/types"
1314
"github.com/docker/docker/api/types/backend"
15+
"github.com/docker/docker/api/types/container"
16+
"github.com/docker/docker/api/types/versions"
1417
"github.com/docker/docker/pkg/ioutils"
1518
"github.com/docker/docker/pkg/streamformatter"
1619
"github.com/docker/docker/registry"
17-
"github.com/docker/engine-api/types"
18-
"github.com/docker/engine-api/types/container"
19-
"github.com/docker/engine-api/types/versions"
2020
"golang.org/x/net/context"
2121
)
2222

‎api/server/router/network/backend.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package network
22

33
import (
4-
"github.com/docker/engine-api/types"
5-
"github.com/docker/engine-api/types/network"
4+
"github.com/docker/docker/api/types"
5+
"github.com/docker/docker/api/types/network"
66
"github.com/docker/libnetwork"
77
)
88

‎api/server/router/network/filter.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package network
33
import (
44
"fmt"
55

6+
"github.com/docker/docker/api/types"
7+
"github.com/docker/docker/api/types/filters"
68
"github.com/docker/docker/runconfig"
7-
"github.com/docker/engine-api/types"
8-
"github.com/docker/engine-api/types/filters"
99
)
1010

1111
var (

‎api/server/router/network/network_routes.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"golang.org/x/net/context"
99

1010
"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"
1114
"github.com/docker/docker/errors"
12-
"github.com/docker/engine-api/types"
13-
"github.com/docker/engine-api/types/filters"
14-
"github.com/docker/engine-api/types/network"
1515
"github.com/docker/libnetwork"
1616
)
1717

‎api/server/router/plugin/backend.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package plugin
55
import (
66
"net/http"
77

8-
enginetypes "github.com/docker/engine-api/types"
8+
enginetypes "github.com/docker/docker/api/types"
99
)
1010

1111
// Backend for Plugin

‎api/server/router/plugin/plugin_routes.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010

1111
"github.com/docker/docker/api/server/httputils"
12-
"github.com/docker/engine-api/types"
12+
"github.com/docker/docker/api/types"
1313
"golang.org/x/net/context"
1414
)
1515

‎api/server/router/swarm/backend.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package swarm
22

33
import (
4-
basictypes "github.com/docker/engine-api/types"
5-
types "github.com/docker/engine-api/types/swarm"
4+
basictypes "github.com/docker/docker/api/types"
5+
types "github.com/docker/docker/api/types/swarm"
66
)
77

88
// Backend abstracts an swarm commands manager.

‎api/server/router/swarm/cluster_routes.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88

99
"github.com/Sirupsen/logrus"
1010
"github.com/docker/docker/api/server/httputils"
11-
basictypes "github.com/docker/engine-api/types"
12-
"github.com/docker/engine-api/types/filters"
13-
types "github.com/docker/engine-api/types/swarm"
11+
basictypes "github.com/docker/docker/api/types"
12+
"github.com/docker/docker/api/types/filters"
13+
types "github.com/docker/docker/api/types/swarm"
1414
"golang.org/x/net/context"
1515
)
1616

‎api/server/router/system/backend.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package system
33
import (
44
"time"
55

6-
"github.com/docker/engine-api/types"
7-
"github.com/docker/engine-api/types/events"
8-
"github.com/docker/engine-api/types/filters"
6+
"github.com/docker/docker/api/types"
7+
"github.com/docker/docker/api/types/events"
8+
"github.com/docker/docker/api/types/filters"
99
"golang.org/x/net/context"
1010
)
1111

‎api/server/router/system/system_routes.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
"github.com/Sirupsen/logrus"
1010
"github.com/docker/docker/api"
1111
"github.com/docker/docker/api/server/httputils"
12+
"github.com/docker/docker/api/types"
13+
"github.com/docker/docker/api/types/events"
14+
"github.com/docker/docker/api/types/filters"
15+
timetypes "github.com/docker/docker/api/types/time"
16+
"github.com/docker/docker/api/types/versions"
1217
"github.com/docker/docker/errors"
1318
"github.com/docker/docker/pkg/ioutils"
14-
"github.com/docker/engine-api/types"
15-
"github.com/docker/engine-api/types/events"
16-
"github.com/docker/engine-api/types/filters"
17-
timetypes "github.com/docker/engine-api/types/time"
18-
"github.com/docker/engine-api/types/versions"
1919
"golang.org/x/net/context"
2020
)
2121

‎api/server/router/volume/backend.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package volume
22

33
import (
44
// TODO return types need to be refactored into pkg
5-
"github.com/docker/engine-api/types"
5+
"github.com/docker/docker/api/types"
66
)
77

88
// Backend is the methods that need to be implemented to provide

‎api/server/router/volume/volume_routes.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"net/http"
66

77
"github.com/docker/docker/api/server/httputils"
8-
"github.com/docker/engine-api/types"
8+
"github.com/docker/docker/api/types"
99
"golang.org/x/net/context"
1010
)
1111

‎api/types/versions/v1p19/types.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
package v1p19
33

44
import (
5-
"github.com/docker/engine-api/types"
6-
"github.com/docker/engine-api/types/container"
7-
"github.com/docker/engine-api/types/versions/v1p20"
5+
"github.com/docker/docker/api/types"
6+
"github.com/docker/docker/api/types/container"
7+
"github.com/docker/docker/api/types/versions/v1p20"
88
"github.com/docker/go-connections/nat"
99
)
1010

‎api/types/versions/v1p20/types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
package v1p20
33

44
import (
5-
"github.com/docker/engine-api/types"
6-
"github.com/docker/engine-api/types/container"
5+
"github.com/docker/docker/api/types"
6+
"github.com/docker/docker/api/types/container"
77
"github.com/docker/go-connections/nat"
88
)
99

‎cliconfig/credentials/file_store.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package credentials
22

33
import (
4-
"github.com/docker/docker/cliconfig/configfile"
5-
"github.com/docker/docker/registry"
6-
74
"github.com/docker/docker/api/types"
85
"github.com/docker/docker/cliconfig/configfile"
6+
"github.com/docker/docker/registry"
97
)
108

119
// fileStore implements a credentials store using

‎client/checkpoint_create.go

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package client
2+
3+
import (
4+
"github.com/docker/docker/api/types"
5+
"golang.org/x/net/context"
6+
)
7+
8+
// CheckpointCreate creates a checkpoint from the given container with the given name
9+
func (cli *Client) CheckpointCreate(ctx context.Context, container string, options types.CheckpointCreateOptions) error {
10+
resp, err := cli.post(ctx, "/containers/"+container+"/checkpoints", nil, options, nil)
11+
ensureReaderClosed(resp)
12+
return err
13+
}

0 commit comments

Comments
 (0)