Migrate Sirupsen to sirupsen.

vendor/github.com/libkermit/compose/check/compose.go

@@ -3,12 +3,12 @@
 package check
 
 import (
-	"github.com/go-check/check"
-
 	"fmt"
-	"github.com/docker/docker/api/types"
-	"github.com/libkermit/compose"
 	"strings"
+
+	"github.com/docker/docker/api/types"
+	"github.com/go-check/check"
+	"github.com/libkermit/compose"
 )
 
 // Project holds compose related project attributes

vendor/github.com/libkermit/compose/compose.go

@@ -45,8 +45,10 @@ func CreateProject(name string, composeFiles ...string) (*Project, error) {
 	if err != nil {
 		return nil, err
 	}
-	// FIXME(vdemeester) fix this
-	apiClient.UpdateClientVersion(d.CurrentAPIVersion)
+
+	ping := types.Ping{APIVersion: d.CurrentAPIVersion}
+	apiClient.NegotiateAPIVersionPing(ping)
+
 	composeProject, err := docker.NewProject(&ctx.Context{
 		Context: project.Context{
 			ComposeFiles: composeFiles,
@@ -86,7 +88,7 @@ func (p *Project) Start(services ...string) error {
 		*p = *newProject
 	}
 	ctx := context.Background()
-	err := p.composeProject.Create(ctx, options.Create{})
+	err := p.composeProject.Create(ctx, options.Create{}, services...)
 	if err != nil {
 		return err
 	}

vendor/github.com/libkermit/docker-check/containers.go

@@ -1,9 +1,8 @@
 package docker
 
 import (
-	"github.com/go-check/check"
-
 	"github.com/docker/docker/api/types"
+	"github.com/go-check/check"
 	"github.com/libkermit/docker"
 )
 

vendor/github.com/libkermit/docker/docker.go

@@ -7,6 +7,8 @@ package docker
 
 import (
 	"fmt"
+
+	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
 )
 
@@ -53,12 +55,13 @@ type APIClient interface {
 
 // NewProjectFromEnv creates a project with a client that is build from environment variables.
 func NewProjectFromEnv() (*Project, error) {
-	client, err := client.NewEnvClient()
+	cli, err := client.NewEnvClient()
 	if err != nil {
 		return nil, err
 	}
-	client.UpdateClientVersion(CurrentAPIVersion)
-	return NewProject(client), nil
+	ping := types.Ping{APIVersion: CurrentAPIVersion}
+	cli.NegotiateAPIVersionPing(ping)
+	return NewProject(cli), nil
 }
 
 // NewProject creates a project with the given client and the default attributes.

vendor/github.com/libkermit/docker/image.go

@@ -19,7 +19,7 @@ func (p *Project) ensureImageExists(ref string, force bool) error {
 	if !force {
 		// Check if ref is already there
 		_, _, err := p.Client.ImageInspectWithRaw(context.Background(), ref)
-		if err != nil && !client.IsErrImageNotFound(err) {
+		if err != nil && !client.IsErrNotFound(err) {
 			return err
 		}
 		if err == nil {

vendor/github.com/libkermit/docker/remove.go

@@ -8,10 +8,7 @@ import (
 
 // Remove removes the container
 func (p *Project) Remove(containerID string) error {
-	if err := p.Client.ContainerRemove(context.Background(), containerID, types.ContainerRemoveOptions{
+	return p.Client.ContainerRemove(context.Background(), containerID, types.ContainerRemoveOptions{
 		Force: true,
-	}); err != nil {
-		return err
-	}
-	return nil
+	})
 }

vendor/github.com/libkermit/docker/stop.go

@@ -14,9 +14,6 @@ func (p *Project) Stop(containerID string) error {
 // StopWithTimeout stops the container with the specified timeout.
 func (p *Project) StopWithTimeout(containerID string, timeout int) error {
 	timeoutDuration := time.Duration(timeout) * time.Second
-	if err := p.Client.ContainerStop(context.Background(), containerID, &timeoutDuration); err != nil {
-		return err
-	}
 
-	return nil
+	return p.Client.ContainerStop(context.Background(), containerID, &timeoutDuration)
 }