Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 1d8aeb6

Browse files
vdemeestervdemeester
committed
Update vendoring libraries
Signed-off-by: Vincent Demeester <[email protected]>
1 parent d9def39 commit 1d8aeb6

File tree

329 files changed

+11577
-4077
lines changed

Some content is hidden

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

329 files changed

+11577
-4077
lines changed

‎docker/auth/auth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package auth
22

33
import (
4+
"github.com/docker/docker/api/types"
45
"github.com/docker/docker/cliconfig/configfile"
56
"github.com/docker/docker/registry"
6-
"github.com/docker/engine-api/types"
77
)
88

99
// Lookup defines a method for looking up authentication information

‎docker/builder/builder.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ import (
1111
"golang.org/x/net/context"
1212

1313
"github.com/Sirupsen/logrus"
14+
"github.com/docker/docker/api/types"
1415
"github.com/docker/docker/builder"
1516
"github.com/docker/docker/builder/dockerignore"
17+
"github.com/docker/docker/client"
1618
"github.com/docker/docker/pkg/archive"
1719
"github.com/docker/docker/pkg/fileutils"
1820
"github.com/docker/docker/pkg/jsonmessage"
1921
"github.com/docker/docker/pkg/progress"
2022
"github.com/docker/docker/pkg/streamformatter"
2123
"github.com/docker/docker/pkg/term"
22-
"github.com/docker/engine-api/client"
23-
"github.com/docker/engine-api/types"
2424
"github.com/docker/libcompose/logger"
2525
)
2626

‎docker/builder/builder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212

1313
"golang.org/x/net/context"
1414

15+
"github.com/docker/docker/api/types"
1516
"github.com/docker/docker/pkg/archive"
1617
"github.com/docker/docker/pkg/jsonmessage"
17-
"github.com/docker/engine-api/types"
1818
"github.com/docker/libcompose/test"
1919
)
2020

‎docker/client/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"runtime"
99

1010
"github.com/docker/docker/cliconfig"
11+
"github.com/docker/docker/client"
1112
"github.com/docker/docker/pkg/homedir"
12-
"github.com/docker/engine-api/client"
1313
"github.com/docker/go-connections/sockets"
1414
"github.com/docker/go-connections/tlsconfig"
1515
"github.com/docker/libcompose/version"

‎docker/client/client_factory.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package client
22

33
import (
4-
"github.com/docker/engine-api/client"
4+
"github.com/docker/docker/client"
55
"github.com/docker/libcompose/project"
66
)
77

@@ -18,7 +18,7 @@ type defaultFactory struct {
1818
}
1919

2020
// NewDefaultFactory creates and returns the default client factory that uses
21-
// github.com/docker/engine-api client.
21+
// github.com/docker/docker client.
2222
func NewDefaultFactory(opts Options) (Factory, error) {
2323
client, err := Create(opts)
2424
if err != nil {

‎docker/container/container.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import (
1212
"golang.org/x/net/context"
1313

1414
"github.com/Sirupsen/logrus"
15+
"github.com/docker/docker/api/types"
16+
"github.com/docker/docker/api/types/container"
17+
"github.com/docker/docker/api/types/network"
18+
"github.com/docker/docker/client"
1519
"github.com/docker/docker/pkg/promise"
1620
"github.com/docker/docker/pkg/stdcopy"
1721
"github.com/docker/docker/pkg/term"
18-
"github.com/docker/engine-api/client"
19-
"github.com/docker/engine-api/types"
20-
"github.com/docker/engine-api/types/container"
21-
"github.com/docker/engine-api/types/network"
2222
"github.com/docker/go-connections/nat"
2323
"github.com/docker/libcompose/config"
2424
"github.com/docker/libcompose/labels"

‎docker/container/functions.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package container
33
import (
44
"golang.org/x/net/context"
55

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

1111
// ListByFilter looks up the hosts containers with the specified filters and

‎docker/image/image.go

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,31 @@ import (
1010
"golang.org/x/net/context"
1111

1212
"github.com/Sirupsen/logrus"
13+
"github.com/docker/docker/api/types"
14+
"github.com/docker/docker/client"
1315
"github.com/docker/docker/pkg/jsonmessage"
1416
"github.com/docker/docker/pkg/term"
1517
"github.com/docker/docker/reference"
1618
"github.com/docker/docker/registry"
17-
"github.com/docker/engine-api/client"
18-
"github.com/docker/engine-api/types"
1919
"github.com/docker/libcompose/docker/auth"
2020
)
2121

22+
// Exists return whether or not the service image already exists
23+
func Exists(ctx context.Context, clt client.ImageAPIClient, image string) (bool, error) {
24+
_, err := InspectImage(ctx, clt, image)
25+
if err != nil {
26+
if client.IsErrImageNotFound(err) {
27+
return false, nil
28+
}
29+
return false, err
30+
}
31+
return true, nil
32+
}
33+
2234
// InspectImage inspect the specified image (can be a name, an id or a digest)
2335
// with the specified client.
2436
func InspectImage(ctx context.Context, client client.ImageAPIClient, image string) (types.ImageInspect, error) {
25-
imageInspect, _, err := client.ImageInspectWithRaw(ctx, image, false)
37+
imageInspect, _, err := client.ImageInspectWithRaw(ctx, image)
2638
return imageInspect, err
2739
}
2840

‎docker/network/network.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77

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

10-
"github.com/docker/engine-api/client"
11-
"github.com/docker/engine-api/types"
12-
"github.com/docker/engine-api/types/network"
10+
"github.com/docker/docker/api/types"
11+
"github.com/docker/docker/api/types/network"
12+
"github.com/docker/docker/client"
1313
"github.com/docker/libcompose/config"
1414
"github.com/docker/libcompose/yaml"
1515
)
@@ -81,7 +81,7 @@ func (n *Network) create(ctx context.Context) error {
8181
return err
8282
}
8383

84-
func convertToAPIIpam(ipam config.Ipam) network.IPAM {
84+
func convertToAPIIpam(ipam config.Ipam) *network.IPAM {
8585
ipamConfigs := []network.IPAMConfig{}
8686
for _, config := range ipam.Config {
8787
ipamConfigs = append(ipamConfigs, network.IPAMConfig{
@@ -91,7 +91,7 @@ func convertToAPIIpam(ipam config.Ipam) network.IPAM {
9191
AuxAddress: config.AuxAddress,
9292
})
9393
}
94-
return network.IPAM{
94+
return &network.IPAM{
9595
Driver: ipam.Driver,
9696
Config: ipamConfigs,
9797
}

‎docker/network/network_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66

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

9-
"github.com/docker/engine-api/types"
10-
"github.com/docker/engine-api/types/network"
9+
"github.com/docker/docker/api/types"
10+
"github.com/docker/docker/api/types/network"
1111
"github.com/docker/libcompose/config"
1212
"github.com/docker/libcompose/test"
1313
"github.com/docker/libcompose/yaml"
@@ -239,10 +239,10 @@ func (c *networkClient) NetworkCreate(ctx context.Context, name string, options
239239
if options.Driver != c.expectedNetworkCreate.Driver {
240240
return types.NetworkCreateResponse{}, fmt.Errorf("Invalid network create, expected driver %q, got %q", c.expectedNetworkCreate.Driver, options.Driver)
241241
}
242-
if options.IPAM.Driver != c.expectedNetworkCreate.IPAM.Driver {
242+
if c.expectedNetworkCreate.IPAM != nil && options.IPAM.Driver != c.expectedNetworkCreate.IPAM.Driver {
243243
return types.NetworkCreateResponse{}, fmt.Errorf("Invalid network create, expected ipam %q, got %q", c.expectedNetworkCreate.IPAM, options.IPAM)
244244
}
245-
if len(options.IPAM.Config) != len(c.expectedNetworkCreate.IPAM.Config) {
245+
if c.expectedNetworkCreate.IPAM != nil && len(options.IPAM.Config) != len(c.expectedNetworkCreate.IPAM.Config) {
246246
return types.NetworkCreateResponse{}, fmt.Errorf("Invalid network create, expected ipam %q, got %q", c.expectedNetworkCreate.Driver, options.Driver)
247247
}
248248
return types.NetworkCreateResponse{
@@ -329,7 +329,7 @@ func TestNetworksInitialize(t *testing.T) {
329329
expectedName: "net1",
330330
expectedNetworkCreate: types.NetworkCreate{
331331
Driver: "driver1",
332-
IPAM: network.IPAM{
332+
IPAM: &network.IPAM{
333333
Driver: "ipamDriver",
334334
Config: []network.IPAMConfig{
335335
{

0 commit comments

Comments
 (0)