Merge pull request #318 from vdemeester/update-vendoring

Update vendoring

Author: vdemeester

docker/builder/builder.go

@@ -34,7 +34,7 @@ type Builder interface {
 
 // DaemonBuilder is the daemon "docker build" Builder implementation.
 type DaemonBuilder struct {
-	Client           client.APIClient
+	Client           client.ImageAPIClient
 	ContextDirectory string
 	Dockerfile       string
 	AuthConfigs      map[string]types.AuthConfig

docker/container.go

@@ -199,7 +199,8 @@ func (c *Container) CreateWithOverride(ctx context.Context, imageName string, co
 // Stop stops the container.
 func (c *Container) Stop(ctx context.Context, timeout int) error {
 	return c.withContainer(ctx, func(container *types.ContainerJSON) error {
-		return c.client.ContainerStop(ctx, container.ID, time.Duration(timeout)*time.Second)
+		timeoutDuration := time.Duration(timeout) * time.Second
+		return c.client.ContainerStop(ctx, container.ID, &timeoutDuration)
 	})
 }
 
@@ -632,7 +633,8 @@ func (c *Container) Restart(ctx context.Context, timeout int) error {
 		return err
 	}
 
-	return c.client.ContainerRestart(ctx, container.ID, time.Duration(timeout)*time.Second)
+	timeoutDuration := time.Duration(timeout) * time.Second
+	return c.client.ContainerRestart(ctx, container.ID, &timeoutDuration)
 }
 
 // Log forwards container logs to the project configured logger.

docker/name.go

@@ -37,7 +37,7 @@ func NewSingleNamer(name string) Namer {
 
 // NewNamer returns a namer that returns names based on the specified project and
 // service name and an inner counter, e.g. project_service_1, project_service_2…
-func NewNamer(ctx context.Context, client client.APIClient, project, service string, oneOff bool) (Namer, error) {
+func NewNamer(ctx context.Context, client client.ContainerAPIClient, project, service string, oneOff bool) (Namer, error) {
 	namer := &defaultNamer{
 		project: project,
 		service: service,

docker/network/network.go

@@ -16,7 +16,7 @@ import (
 
 // Network holds attributes and method for a network definition in compose
 type Network struct {
-	client        client.APIClient
+	client        client.NetworkAPIClient
 	name          string
 	projectName   string
 	driver        string
@@ -98,7 +98,7 @@ func convertToAPIIpam(ipam config.Ipam) network.IPAM {
 }
 
 // NewNetwork creates a new network from the specified name and config.
-func NewNetwork(projectName, name string, config *config.NetworkConfig, client client.APIClient) *Network {
+func NewNetwork(projectName, name string, config *config.NetworkConfig, client client.NetworkAPIClient) *Network {
 	networkName := name
 	if config.External.External {
 		networkName = config.External.Name
@@ -151,7 +151,7 @@ func (n *Networks) Remove(ctx context.Context) error {
 // NetworksFromServices creates a new Networks struct based on networks configurations and
 // services configuration. If a network is defined but not used by any service, it will return
 // an error along the Networks.
-func NetworksFromServices(cli client.APIClient, projectName string, networkConfigs map[string]*config.NetworkConfig, services *config.ServiceConfigs, networkEnabled bool) (*Networks, error) {
+func NetworksFromServices(cli client.NetworkAPIClient, projectName string, networkConfigs map[string]*config.NetworkConfig, services *config.ServiceConfigs, networkEnabled bool) (*Networks, error) {
 	var err error
 	networks := make([]*Network, 0, len(networkConfigs))
 	networkNames := map[string]*yaml.Network{}

docker/service_test.go

@@ -1,9 +1,10 @@
 package docker
 
 import (
+	"testing"
+
 	"github.com/docker/libcompose/config"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestSpecifiesHostPort(t *testing.T) {

script/vendor.sh

@@ -5,25 +5,28 @@ cd "$(dirname "$BASH_SOURCE")/.."
 rm -rf vendor/
 source 'script/.vendor-helpers.sh'
 
-clone git github.com/Sirupsen/logrus v0.9.0
+clone git github.com/Sirupsen/logrus v0.10.0
 #clone git github.com/codegangsta/cli 6086d7927ec35315964d9fea46df6c04e6d697c1
 clone git github.com/codegangsta/cli 839f07bfe4819fa1434fa907d0804ce6ec45a5df
-clone git github.com/docker/distribution 467fc068d88aa6610691b7f1a677271a3fac4aac
+clone git github.com/docker/distribution 5bbf65499960b184fe8e0f045397375e1a6722b8
 clone git github.com/vbatts/tar-split v0.9.11
-clone git github.com/docker/docker 9837ec4da53f15f9120d53a6e1517491ba8b0261
-clone git github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3
-clone git github.com/docker/go-connections v0.2.0
-clone git github.com/docker/engine-api d06b85b29e37346a050f335042e16e6e8a9f49da
-clone git github.com/vdemeester/docker-events b308d2e8d639d928c882913bcb4f85b3a84c7a07
+clone git github.com/docker/docker 534753663161334baba06f13b8efa4cad22b5bc5
+clone git github.com/docker/go-units f2d77a61e3c169b43402a0a1e84f06daf29b8190
+# clone git github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3
+clone git github.com/docker/go-connections 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
+# clone git github.com/docker/go-connections fa2850ff103453a9ad190da0df0af134f0314b3d
+clone git github.com/docker/engine-api 62043eb79d581a32ea849645277023c550732e52
+clone git github.com/vdemeester/docker-events be74d4929ec1ad118df54349fda4b0cba60f849b
 clone git github.com/flynn/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff
 clone git github.com/gorilla/context 14f550f51a
 clone git github.com/gorilla/mux e444e69cbd
-clone git github.com/opencontainers/runc 2441732d6fcc0fb0a542671a4372e0c7bc99c19e
+clone git github.com/opencontainers/runc cc29e3dded8e27ba8f65738f40d251c885030a28
 clone git github.com/stretchr/testify a1f97990ddc16022ec7610326dd9bce31332c116
 clone git github.com/davecgh/go-spew 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
 clone git github.com/pmezard/go-difflib d8ed2627bdf02c080bf22230dbb337003b7aba2d
-clone git golang.org/x/crypto 4d48e5fa3d62b5e6e71260571bf76c767198ca02 https://github.com/golang/crypto.git
-clone git golang.org/x/net 47990a1ba55743e6ef1affd3a14e5bac8553615d https://github.com/golang/net.git
+clone git golang.org/x/crypto 3fbbcd23f1cb824e69491a5930cfeff09b12f4d2 https://github.com/golang/crypto.git
+clone git golang.org/x/net 2beffdc2e92c8a3027590f898fe88f69af48a3f8 https://github.com/tonistiigi/net.git
+# clone git golang.org/x/net 47990a1ba55743e6ef1affd3a14e5bac8553615d https://github.com/golang/net.git
 clone git gopkg.in/check.v1 11d3bc7aa68e238947792f30573146a3231fc0f1
 clone git github.com/cloudfoundry-incubator/candiedyaml 5cef21e2e4f0fd147973b558d4db7395176bcd95
 clone git github.com/Azure/go-ansiterm 388960b655244e76e24c75f48631564eaefade62
@@ -33,4 +36,6 @@ clone git github.com/xeipuuv/gojsonreference e02fc20de94c78484cd5ffb007f8af96be0
 clone git github.com/xeipuuv/gojsonschema ac452913faa25c08bb78810d3e6f88b8a39f8f25
 clone git github.com/kr/pty 5cf931ef8f
 
+clone git github.com/spf13/pflag cb88ea77998c3f024757528e3305022ab50b43be
+
 clean && mv vendor/src/* vendor

test/nop.go

@@ -18,8 +18,12 @@ import (
 var (
 	errNoEngine = errors.New("Engine no longer exists")
 
-	// Make sure NopClient implements APIClient
-	_ client.APIClient = &NopClient{}
+	// Make sure NopClient implements ContainerAPIclient and other required interface
+	_ client.ContainerAPIClient = (*NopClient)(nil)
+	_ client.ImageAPIClient     = (*NopClient)(nil)
+	_ client.NetworkAPIClient   = (*NopClient)(nil)
+	_ client.VolumeAPIClient    = (*NopClient)(nil)
+	_ client.SystemAPIClient    = (*NopClient)(nil)
 )
 
 // NopClient is a nop API Client based on engine-api
@@ -147,7 +151,7 @@ func (client *NopClient) ContainerResize(ctx context.Context, container string,
 }
 
 // ContainerRestart stops and starts a container again
-func (client *NopClient) ContainerRestart(ctx context.Context, container string, timeout time.Duration) error {
+func (client *NopClient) ContainerRestart(ctx context.Context, container string, timeout *time.Duration) error {
 	return errNoEngine
 }
 
@@ -167,7 +171,7 @@ func (client *NopClient) ContainerStart(ctx context.Context, container string, o
 }
 
 // ContainerStop stops a container without terminating the process
-func (client *NopClient) ContainerStop(ctx context.Context, container string, timeout time.Duration) error {
+func (client *NopClient) ContainerStop(ctx context.Context, container string, timeout *time.Duration) error {
 	return errNoEngine
 }