Update golang image version

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Dockerfile

@@ -1,5 +1,5 @@
 # This file describes the standard way to build libcompose, using docker
-FROM golang:1.7.5
+FROM golang:1.8.3
 
 # virtualenv is necessary to run acceptance tests
 RUN apt-get update && \
@@ -13,18 +13,23 @@ RUN go get github.com/aktau/github-release && \
     go get github.com/golang/lint/golint
 
 # Which docker version to test on and what default one to use
-ENV DOCKER_VERSIONS 1.9.1 1.10.3 1.11.2 1.12.6 1.13.0
-ENV DEFAULT_DOCKER_VERSION 1.10.3
+ENV DOCKER_VERSIONS 1.9.1 1.10.3 1.13.1 17.03.2 17.06.0
+ENV DEFAULT_DOCKER_VERSION 17.03.2
 
 # Download docker
-RUN set -e; \
+RUN set -e; set -x; \
     for v in $(echo ${DOCKER_VERSIONS} | cut -f1); do \
         if test "${v}" = "1.9.1" || test "${v}" = "1.10.3"; then \
            mkdir -p /usr/local/bin/docker-${v}/; \
            curl https://get.docker.com/builds/Linux/x86_64/docker-${v} -o /usr/local/bin/docker-${v}/docker; \
            chmod +x /usr/local/bin/docker-${v}/docker; \
+        elif test "${v}" = "1.13.1"; then \
+           curl https://get.docker.com/builds/Linux/x86_64/docker-${v}.tgz -o docker-${v}.tgz; \
+             tar xzf docker-${v}.tgz -C /usr/local/bin/; \
+             mv /usr/local/bin/docker /usr/local/bin/docker-${v}; \
+             rm docker-${v}.tgz; \
         else \
-             curl https://get.docker.com/builds/Linux/x86_64/docker-${v}.tgz -o docker-${v}.tgz; \
+             curl https://download.docker.com/linux/static/stable/x86_64/docker-${v}-ce.tgz -o docker-${v}.tgz; \
              tar xzf docker-${v}.tgz -C /usr/local/bin/; \
              mv /usr/local/bin/docker /usr/local/bin/docker-${v}; \
              rm docker-${v}.tgz; \

docker/auth/auth.go

@@ -1,8 +1,8 @@
 package auth
 
 import (
+	"github.com/docker/cli/cli/config/configfile"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli/config/configfile"
 	"github.com/docker/docker/registry"
 )
 

docker/builder/builder.go

@@ -9,9 +9,9 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/cli/cli/command/image/build"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/builder/dockerignore"
-	"github.com/docker/docker/cli/command/image/build"
 	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/fileutils"
@@ -75,7 +75,7 @@ func (d *DaemonBuilder) Build(ctx context.Context, imageName string) error {
 	}
 
 	// Setup an upload progress bar
-	progressOutput := streamformatter.NewStreamFormatter().NewProgressOutput(progBuff, true)
+	progressOutput := streamformatter.NewProgressOutput(progBuff)
 
 	var body io.Reader = progress.NewProgressReader(buildCtx, progressOutput, 0, "", "Sending build context to Docker daemon")
 

docker/builder/builder_test.go

@@ -13,20 +13,22 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/jsonmessage"
-	"github.com/docker/libcompose/test"
+	"github.com/pkg/errors"
+	"strings"
 )
 
-type DaemonClient struct {
-	test.NopClient
+type daemonClient struct {
+	client.Client
 	contextDir string
 	imageName  string
 	changes    int
 	message    jsonmessage.JSONMessage
 }
 
-func (c *DaemonClient) ImageBuild(ctx context.Context, context io.Reader, options types.ImageBuildOptions) (types.ImageBuildResponse, error) {
+func (c *daemonClient) ImageBuild(ctx context.Context, context io.Reader, options types.ImageBuildOptions) (types.ImageBuildResponse, error) {
 	if c.imageName != "" {
 		if len(options.Tags) != 1 || options.Tags[0] != c.imageName {
 			return types.ImageBuildResponse{}, fmt.Errorf("expected image %q, got %v", c.imageName, options.Tags)
@@ -55,7 +57,9 @@ func (c *DaemonClient) ImageBuild(ctx context.Context, context io.Reader, option
 			Body: ioutil.NopCloser(bytes.NewReader(b)),
 		}, nil
 	}
-	return c.NopClient.ImageBuild(ctx, context, options)
+	return types.ImageBuildResponse{
+		Body: ioutil.NopCloser(strings.NewReader("{}")),
+	}, errors.New("Engine no longer exists")
 }
 
 func TestBuildInvalidContextDirectoryOrDockerfile(t *testing.T) {
@@ -118,7 +122,7 @@ func TestBuildWithClientBuildError(t *testing.T) {
 	}
 
 	imageName := "image"
-	client := &DaemonClient{}
+	client := &daemonClient{}
 	builder := &DaemonBuilder{
 		ContextDirectory: tmpDir,
 		Client:           client,
@@ -144,7 +148,7 @@ func TestBuildWithDefaultDockerfile(t *testing.T) {
 	}
 
 	imageName := "image"
-	client := &DaemonClient{
+	client := &daemonClient{
 		contextDir: tmpDir,
 		imageName:  imageName,
 	}
@@ -173,7 +177,7 @@ func TestBuildWithDefaultLowercaseDockerfile(t *testing.T) {
 	}
 
 	imageName := "image"
-	client := &DaemonClient{
+	client := &daemonClient{
 		contextDir: tmpDir,
 		imageName:  imageName,
 	}
@@ -202,7 +206,7 @@ func TestBuildWithSpecificDockerfile(t *testing.T) {
 	}
 
 	imageName := "image"
-	client := &DaemonClient{
+	client := &daemonClient{
 		contextDir: tmpDir,
 		imageName:  imageName,
 	}
@@ -235,7 +239,7 @@ func TestBuildWithDockerignoreNothing(t *testing.T) {
 	}
 
 	imageName := "image"
-	client := &DaemonClient{
+	client := &daemonClient{
 		contextDir: tmpDir,
 		imageName:  imageName,
 	}
@@ -268,7 +272,7 @@ func TestBuildWithDockerignoreDockerfileAndItself(t *testing.T) {
 	}
 
 	imageName := "image"
-	client := &DaemonClient{
+	client := &daemonClient{
 		contextDir: tmpDir,
 		imageName:  imageName,
 	}
@@ -301,7 +305,7 @@ func TestBuildWithDockerignoreAfile(t *testing.T) {
 	}
 
 	imageName := "image"
-	client := &DaemonClient{
+	client := &daemonClient{
 		contextDir: tmpDir,
 		imageName:  imageName,
 		changes:    1,
@@ -332,7 +336,7 @@ func TestBuildWithErrorJSONMessage(t *testing.T) {
 	}
 
 	imageName := "image"
-	client := &DaemonClient{
+	client := &daemonClient{
 		contextDir: tmpDir,
 		imageName:  imageName,
 		message: jsonmessage.JSONMessage{

docker/client/client.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	cliconfig "github.com/docker/docker/cli/config"
+	cliconfig "github.com/docker/cli/cli/config"
 	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/homedir"
 	"github.com/docker/go-connections/sockets"

docker/client/client_factory_test.go

@@ -1,6 +1,7 @@
 package client
 
 import (
+	"strings"
 	"testing"
 )
 
@@ -18,7 +19,7 @@ func TestFactoryWithEnv(t *testing.T) {
 			envs: map[string]string{
 				"DOCKER_CERT_PATH": "invalid/path",
 			},
-			expectedError:   "Could not load X509 key pair: open invalid/path/cert.pem: no such file or directory. Make sure the key is not encrypted",
+			expectedError:   "Could not load X509 key pair: open invalid/path/cert.pem: no such file or directory",
 			expectedVersion: "v1.20",
 		},
 		{
@@ -32,7 +33,7 @@ func TestFactoryWithEnv(t *testing.T) {
 		recoverEnvs := setupEnvs(t, c.envs)
 		factory, err := NewDefaultFactory(Options{})
 		if c.expectedError != "" {
-			if err == nil || err.Error() != c.expectedError {
+			if err == nil || !strings.Contains(err.Error(), c.expectedError) {
 				t.Errorf("expected an error %s, got %s, for %v", c.expectedError, err.Error(), c)
 			}
 		} else {
@@ -59,7 +60,7 @@ func TestFactoryWithOptions(t *testing.T) {
 			options: Options{
 				Host: "host",
 			},
-			expectedError: "unable to parse docker host `host`",
+			expectedError: "unable to parse docker host",
 		},
 		{
 			options: Options{
@@ -78,7 +79,7 @@ func TestFactoryWithOptions(t *testing.T) {
 	for _, c := range cases {
 		factory, err := NewDefaultFactory(c.options)
 		if c.expectedError != "" {
-			if err == nil || err.Error() != c.expectedError {
+			if err == nil || !strings.Contains(err.Error(), c.expectedError) {
 				t.Errorf("expected an error %s, got %s, for %v", c.expectedError, err.Error(), c)
 			}
 		} else {

docker/client/client_test.go

@@ -3,9 +3,10 @@ package client
 import (
 	"fmt"
 	"os"
+	"strings"
 	"testing"
 
-	cliconfig "github.com/docker/docker/cli/config"
+	cliconfig "github.com/docker/cli/cli/config"
 	"github.com/docker/go-connections/tlsconfig"
 )
 
@@ -24,13 +25,13 @@ func TestCreateWithEnv(t *testing.T) {
 			envs: map[string]string{
 				"DOCKER_CERT_PATH": "invalid/path",
 			},
-			expectedError: "Could not load X509 key pair: open invalid/path/cert.pem: no such file or directory. Make sure the key is not encrypted",
+			expectedError: "Could not load X509 key pair: open invalid/path/cert.pem: no such file or directory",
 		},
 		{
 			envs: map[string]string{
 				"DOCKER_HOST": "host",
 			},
-			expectedError: "unable to parse docker host `host`",
+			expectedError: "unable to parse docker host",
 		},
 		{
 			envs: map[string]string{
@@ -55,8 +56,8 @@ func TestCreateWithEnv(t *testing.T) {
 		recoverEnvs := setupEnvs(t, c.envs)
 		apiclient, err := Create(Options{})
 		if c.expectedError != "" {
-			if err == nil || err.Error() != c.expectedError {
-				t.Errorf("expected an error %s, got %s, for %v", c.expectedError, err.Error(), c)
+			if err == nil || !strings.Contains(err.Error(), c.expectedError) {
+				t.Errorf("expected an error '%s', got '%s', for %v", c.expectedError, err.Error(), c)
 			}
 		} else {
 			if err != nil {
@@ -81,7 +82,7 @@ func TestCreateWithOptions(t *testing.T) {
 			options: Options{
 				Host: "host",
 			},
-			expectedError: "unable to parse docker host `host`",
+			expectedError: "unable to parse docker host",
 		},
 		{
 			options: Options{
@@ -109,7 +110,7 @@ func TestCreateWithOptions(t *testing.T) {
 				TLS:        true,
 				APIVersion: "v1.22",
 			},
-			expectedError: fmt.Sprintf("Could not load X509 key pair: open %s/cert.pem: no such file or directory. Make sure the key is not encrypted", cliconfig.Dir()),
+			expectedError: fmt.Sprintf("Could not load X509 key pair: open %s/cert.pem: no such file or directory", cliconfig.Dir()),
 		},
 		{
 			options: Options{
@@ -123,7 +124,7 @@ func TestCreateWithOptions(t *testing.T) {
 				TrustKey:   "invalid/trust/key",
 				APIVersion: "v1.22",
 			},
-			expectedError: "Could not load X509 key pair: open invalid/cert/file: no such file or directory. Make sure the key is not encrypted",
+			expectedError: "Could not load X509 key pair: open invalid/cert/file: no such file or directory",
 		},
 		{
 			options: Options{
@@ -136,7 +137,7 @@ func TestCreateWithOptions(t *testing.T) {
 				},
 				APIVersion: "v1.22",
 			},
-			expectedError: "unable to parse docker host `host`",
+			expectedError: "unable to parse docker host",
 		},
 		{
 			options: Options{
@@ -155,8 +156,8 @@ func TestCreateWithOptions(t *testing.T) {
 	for _, c := range cases {
 		apiclient, err := Create(c.options)
 		if c.expectedError != "" {
-			if err == nil || err.Error() != c.expectedError {
-				t.Errorf("expected an error %s, got %s, for %v", c.expectedError, err.Error(), c)
+			if err == nil || !strings.Contains(err.Error(), c.expectedError) {
+				t.Errorf("expected an error '%s', got '%s', for %v", c.expectedError, err.Error(), c)
 			}
 		} else {
 			if err != nil {

docker/ctx/context.go

@@ -1,8 +1,8 @@
 package ctx
 
 import (
-	cliconfig "github.com/docker/docker/cli/config"
-	"github.com/docker/docker/cli/config/configfile"
+	cliconfig "github.com/docker/cli/cli/config"
+	"github.com/docker/cli/cli/config/configfile"
 	"github.com/docker/libcompose/docker/auth"
 	"github.com/docker/libcompose/docker/client"
 	"github.com/docker/libcompose/project"

docker/network/network.go

@@ -35,7 +35,7 @@ func (n *Network) fullName() string {
 
 // Inspect inspect the current network
 func (n *Network) Inspect(ctx context.Context) (types.NetworkResource, error) {
-	return n.client.NetworkInspect(ctx, n.fullName())
+	return n.client.NetworkInspect(ctx, n.fullName(), false)
 }
 
 // Remove removes the current network (from docker engine)

docker/network/network_test.go

@@ -8,9 +8,10 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/network"
+	"github.com/docker/docker/client"
 	"github.com/docker/libcompose/config"
-	"github.com/docker/libcompose/test"
 	"github.com/docker/libcompose/yaml"
+	"github.com/pkg/errors"
 )
 
 type networkNotFound struct {
@@ -218,7 +219,7 @@ func testExpectedContainsNetwork(t *testing.T, index int, expected []*Network, n
 }
 
 type networkClient struct {
-	test.NopClient
+	client.Client
 	expectedNetworkCreate   types.NetworkCreate
 	expectedRemoveNetworkID string
 	expectedName            string
@@ -228,7 +229,7 @@ type networkClient struct {
 	removeError             error
 }
 
-func (c *networkClient) NetworkInspect(ctx context.Context, networkID string) (types.NetworkResource, error) {
+func (c *networkClient) NetworkInspect(ctx context.Context, networkID string, verbose bool) (types.NetworkResource, error) {
 	if c.inspectError != nil {
 		return types.NetworkResource{}, c.inspectError
 	}
@@ -254,7 +255,7 @@ func (c *networkClient) NetworkCreate(ctx context.Context, name string, options
 			ID: c.expectedName,
 		}, nil
 	}
-	return c.NopClient.NetworkCreate(ctx, name, options)
+	return types.NetworkCreateResponse{}, errors.New("Engine no longer exists")
 }
 
 func (c *networkClient) NetworkRemove(ctx context.Context, networkID string) error {
@@ -264,7 +265,7 @@ func (c *networkClient) NetworkRemove(ctx context.Context, networkID string) err
 		}
 		return nil
 	}
-	return c.NopClient.NetworkRemove(ctx, networkID)
+	return errors.New("Engine no longer exists")
 }
 
 func TestNetworksInitialize(t *testing.T) {