Merge pull request #440 from vdemeester/update-vendor

Update vendor dependencies…

Author: vdemeester

docker/auth/auth.go

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

docker/builder/builder.go

@@ -8,12 +8,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	"golang.org/x/net/context"
-
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/builder"
 	"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"
@@ -22,6 +20,7 @@ import (
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/docker/docker/pkg/term"
 	"github.com/docker/libcompose/logger"
+	"golang.org/x/net/context"
 )
 
 // DefaultDockerfileName is the default name of a Dockerfile
@@ -42,7 +41,7 @@ type DaemonBuilder struct {
 	NoCache          bool
 	ForceRemove      bool
 	Pull             bool
-	BuildArgs        map[string]string
+	BuildArgs        map[string]*string
 	LoggerFactory    logger.Factory
 }
 
@@ -194,8 +193,8 @@ func CreateTar(contextDirectory, dockerfile string) (io.ReadCloser, error) {
 		includes = append(includes, ".dockerignore", dockerfileName)
 	}
 
-	if err := builder.ValidateContextDirectory(contextDirectory, excludes); err != nil {
-		return nil, fmt.Errorf("Error checking context is accessible: '%s'. Please check permissions and try again.", err)
+	if err := build.ValidateContextDirectory(contextDirectory, excludes); err != nil {
+		return nil, fmt.Errorf("error checking context is accessible: '%s', please check permissions and try again", err)
 	}
 
 	options := &archive.TarOptions{

docker/client/client.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/docker/docker/cliconfig"
+	cliconfig "github.com/docker/docker/cli/config"
 	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/homedir"
 	"github.com/docker/go-connections/sockets"
@@ -30,7 +30,7 @@ var (
 
 func init() {
 	if dockerCertPath == "" {
-		dockerCertPath = cliconfig.ConfigDir()
+		dockerCertPath = cliconfig.Dir()
 	}
 }
 

docker/client/client_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/docker/docker/cliconfig"
+	cliconfig "github.com/docker/docker/cli/config"
 	"github.com/docker/go-connections/tlsconfig"
 )
 
@@ -109,7 +109,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.ConfigDir()),
+			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()),
 		},
 		{
 			options: Options{

docker/container/functions.go

@@ -1,11 +1,10 @@
 package container
 
 import (
-	"golang.org/x/net/context"
-
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/client"
+	"golang.org/x/net/context"
 )
 
 // ListByFilter looks up the hosts containers with the specified filters and
@@ -23,8 +22,8 @@ func ListByFilter(ctx context.Context, clientInstance client.ContainerAPIClient,
 	}
 
 	return clientInstance.ContainerList(ctx, types.ContainerListOptions{
-		All:    true,
-		Filter: filterArgs,
+		All:     true,
+		Filters: filterArgs,
 	})
 }
 

docker/ctx/context.go

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

docker/image/image.go

@@ -7,16 +7,15 @@ import (
 	"io"
 	"os"
 
-	"golang.org/x/net/context"
-
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/pkg/term"
-	"github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
 	"github.com/docker/libcompose/docker/auth"
+	"golang.org/x/net/context"
 )
 
 // Exists return whether or not the service image already exists
@@ -49,7 +48,7 @@ func RemoveImage(ctx context.Context, client client.ImageAPIClient, image string
 // to the daemon store with the specified client.
 func PullImage(ctx context.Context, client client.ImageAPIClient, serviceName string, authLookup auth.Lookup, image string) error {
 	fmt.Fprintf(os.Stderr, "Pulling %s (%s)...\n", serviceName, image)
-	distributionRef, err := reference.ParseNamed(image)
+	distributionRef, err := reference.ParseNormalizedNamed(image)
 	if err != nil {
 		return err
 	}

docker/project.go

@@ -80,7 +80,7 @@ func (p *Project) RemoveOrphans(ctx context.Context, projectName string, service
 	filter := filters.NewArgs()
 	filter.Add("label", labels.PROJECT.EqString(projectName))
 	containers, err := client.ContainerList(ctx, types.ContainerListOptions{
-		Filter: filter,
+		Filters: filter,
 	})
 	if err != nil {
 		return err

docker/service/convert.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"strings"
 
-	"golang.org/x/net/context"
-
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/strslice"
@@ -17,7 +15,7 @@ import (
 	composecontainer "github.com/docker/libcompose/docker/container"
 	"github.com/docker/libcompose/project"
 	"github.com/docker/libcompose/utils"
-	// "github.com/docker/libcompose/yaml"
+	"golang.org/x/net/context"
 )
 
 // ConfigWrapper wraps Config, HostConfig and NetworkingConfig for a container.
@@ -305,7 +303,7 @@ func parseDevices(devices []string) ([]container.DeviceMapping, error) {
 	// parse device mappings
 	deviceMappings := []container.DeviceMapping{}
 	for _, device := range devices {
-		v, err := opts.ParseDevice(device)
+		v, err := parseDevice(device)
 		if err != nil {
 			return nil, err
 		}
@@ -318,3 +316,59 @@ func parseDevices(devices []string) ([]container.DeviceMapping, error) {
 
 	return deviceMappings, nil
 }
+
+// parseDevice parses a device mapping string to a container.DeviceMapping struct
+// FIXME(vdemeester) de-duplicate this by re-exporting it in docker/docker
+func parseDevice(device string) (container.DeviceMapping, error) {
+	src := ""
+	dst := ""
+	permissions := "rwm"
+	arr := strings.Split(device, ":")
+	switch len(arr) {
+	case 3:
+		permissions = arr[2]
+		fallthrough
+	case 2:
+		if validDeviceMode(arr[1]) {
+			permissions = arr[1]
+		} else {
+			dst = arr[1]
+		}
+		fallthrough
+	case 1:
+		src = arr[0]
+	default:
+		return container.DeviceMapping{}, fmt.Errorf("invalid device specification: %s", device)
+	}
+
+	if dst == "" {
+		dst = src
+	}
+
+	deviceMapping := container.DeviceMapping{
+		PathOnHost:        src,
+		PathInContainer:   dst,
+		CgroupPermissions: permissions,
+	}
+	return deviceMapping, nil
+}
+
+// validDeviceMode checks if the mode for device is valid or not.
+// Valid mode is a composition of r (read), w (write), and m (mknod).
+func validDeviceMode(mode string) bool {
+	var legalDeviceMode = map[rune]bool{
+		'r': true,
+		'w': true,
+		'm': true,
+	}
+	if mode == "" {
+		return false
+	}
+	for _, c := range mode {
+		if !legalDeviceMode[c] {
+			return false
+		}
+		legalDeviceMode[c] = false
+	}
+	return true
+}

docker/service/name.go

@@ -54,8 +54,8 @@ func NewNamer(ctx context.Context, client client.ContainerAPIClient, project, se
 	}
 
 	containers, err := client.ContainerList(ctx, types.ContainerListOptions{
-		All:    true,
-		Filter: filter,
+		All:     true,
+		Filters: filter,
 	})
 	if err != nil {
 		return nil, err