@@ -6,26 +6,26 @@ import (

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/filters"

 	"github.com/docker/docker/api/types/swarm"

+	"github.com/docker/docker/cli/compose/convert"

 	"github.com/docker/docker/client"

 	"github.com/docker/docker/opts"

-	"github.com/docker/docker/pkg/composetransform"

 )

 func getStackFilter(namespace string) filters.Args {

 	filter := filters.NewArgs()

-	filter.Add("label", composetransform.LabelNamespace+"="+namespace)

+	filter.Add("label", convert.LabelNamespace+"="+namespace)

 	return filter

 }

 func getStackFilterFromOpt(namespace string, opt opts.FilterOpt) filters.Args {

 	filter := opt.Value()

-	filter.Add("label", composetransform.LabelNamespace+"="+namespace)

+	filter.Add("label", convert.LabelNamespace+"="+namespace)

 	return filter

 }

 func getAllStacksFilter() filters.Args {

 	filter := filters.NewArgs()

-	filter.Add("label", composetransform.LabelNamespace)

+	filter.Add("label", convert.LabelNamespace)

 	return filter

 }

@@ -14,8 +14,8 @@ import (

 	"github.com/docker/docker/api/types/swarm"

 	"github.com/docker/docker/cli"

 	"github.com/docker/docker/cli/command"

+	"github.com/docker/docker/cli/compose/convert"

 	dockerclient "github.com/docker/docker/client"

-	"github.com/docker/docker/pkg/composetransform"

 	"github.com/spf13/cobra"

 	"golang.org/x/net/context"

 )

@@ -114,17 +114,17 @@ func deployCompose(ctx context.Context, dockerCli *command.DockerCli, opts deplo

 		return err

 	}

-	namespace := composetransform.NewNamespace(opts.namespace)

+	namespace := convert.NewNamespace(opts.namespace)

 	serviceNetworks := getServicesDeclaredNetworks(config.Services)

-	networks, externalNetworks := composetransform.ConvertNetworks(namespace, config.Networks, serviceNetworks)

+	networks, externalNetworks := convert.Networks(namespace, config.Networks, serviceNetworks)

 	if err := validateExternalNetworks(ctx, dockerCli, externalNetworks); err != nil {

 		return err

 	}

 	if err := createNetworks(ctx, dockerCli, namespace, networks); err != nil {

 		return err

 	}

-	services, err := composetransform.ConvertServices(namespace, config)

+	services, err := convert.Services(namespace, config)

 	if err != nil {

 		return err

 	}

@@ -211,7 +211,7 @@ func validateExternalNetworks(

 func createNetworks(

 	ctx context.Context,

 	dockerCli *command.DockerCli,

-	namespace composetransform.Namespace,

+	namespace convert.Namespace,

 	networks map[string]types.NetworkCreate,

 ) error {

 	client := dockerCli.Client()

@@ -249,7 +249,7 @@ func deployServices(

 	ctx context.Context,

 	dockerCli *command.DockerCli,

 	services map[string]swarm.ServiceSpec,

-	namespace composetransform.Namespace,

+	namespace convert.Namespace,

 	sendAuth bool,

 ) error {

 	apiClient := dockerCli.Client()

@@ -6,7 +6,7 @@ import (

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/swarm"

 	"github.com/docker/docker/cli/command"

-	"github.com/docker/docker/pkg/composetransform"

+	"github.com/docker/docker/cli/compose/convert"

 )

 func deployBundle(ctx context.Context, dockerCli *command.DockerCli, opts deployOptions) error {

@@ -19,13 +19,13 @@ func deployBundle(ctx context.Context, dockerCli *command.DockerCli, opts deploy

 		return err

 	}

-	namespace := composetransform.NewNamespace(opts.namespace)

+	namespace := convert.NewNamespace(opts.namespace)

 	networks := make(map[string]types.NetworkCreate)

 	for _, service := range bundle.Services {

 		for _, networkName := range service.Networks {

 			networks[networkName] = types.NetworkCreate{

-				Labels: composetransform.AddStackLabel(namespace, nil),

+				Labels: convert.AddStackLabel(namespace, nil),

 			}

 		}

 	}

@@ -53,7 +53,7 @@ func deployBundle(ctx context.Context, dockerCli *command.DockerCli, opts deploy

 		serviceSpec := swarm.ServiceSpec{

 			Annotations: swarm.Annotations{

 				Name:   name,

-				Labels: composetransform.AddStackLabel(namespace, service.Labels),

+				Labels: convert.AddStackLabel(namespace, service.Labels),

 			},

 			TaskTemplate: swarm.TaskSpec{

 				ContainerSpec: swarm.ContainerSpec{

@@ -64,7 +64,7 @@ func deployBundle(ctx context.Context, dockerCli *command.DockerCli, opts deploy

 					// Service Labels will not be copied to Containers

 					// automatically during the deployment so we apply

 					// it here.

-					Labels: composetransform.AddStackLabel(namespace, nil),

+					Labels: convert.AddStackLabel(namespace, nil),

 				},

 			},

 			EndpointSpec: &swarm.EndpointSpec{

@@ -11,8 +11,8 @@ import (

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/cli"

 	"github.com/docker/docker/cli/command"

+	"github.com/docker/docker/cli/compose/convert"

 	"github.com/docker/docker/client"

-	"github.com/docker/docker/pkg/composetransform"

 	"github.com/spf13/cobra"

 )

@@ -90,10 +90,10 @@ func getStacks(

 	m := make(map[string]*stack, 0)

 	for _, service := range services {

 		labels := service.Spec.Labels

-		name, ok := labels[composetransform.LabelNamespace]

+		name, ok := labels[convert.LabelNamespace]

 		if !ok {

 			return nil, fmt.Errorf("cannot get label %s for service %s",

-				composetransform.LabelNamespace, service.ID)

+				convert.LabelNamespace, service.ID)

 		}

 		ztack, ok := m[name]

 		if !ok {

new file mode 100644

@@ -0,0 +1,88 @@

+package convert

+

+import (

+	composetypes "github.com/aanand/compose-file/types"

+	"github.com/docker/docker/api/types"

+	networktypes "github.com/docker/docker/api/types/network"

+)

+

+const (

+	// LabelNamespace is the label used to track stack resources

+	LabelNamespace = "com.docker.stack.namespace"

+)

+

+// Namespace mangles names by prepending the name

+type Namespace struct {

+	name string

+}

+

+// Scope prepends the namespace to a name

+func (n Namespace) Scope(name string) string {

+	return n.name + "_" + name

+}

+

+// Name returns the name of the namespace

+func (n Namespace) Name() string {

+	return n.name

+}

+

+// NewNamespace returns a new Namespace for scoping of names

+func NewNamespace(name string) Namespace {

+	return Namespace{name: name}

+}

+

+// AddStackLabel returns labels with the namespace label added

+func AddStackLabel(namespace Namespace, labels map[string]string) map[string]string {

+	if labels == nil {

+		labels = make(map[string]string)

+	}

+	labels[LabelNamespace] = namespace.name

+	return labels

+}

+

+type networkMap map[string]composetypes.NetworkConfig

+

+// Networks converts networks from the compose-file type to the engine API type

+func Networks(

+	namespace Namespace,

+	networks networkMap,

+	servicesNetworks map[string]struct{},

+) (map[string]types.NetworkCreate, []string) {

+	if networks == nil {

+		networks = make(map[string]composetypes.NetworkConfig)

+	}

+

+	externalNetworks := []string{}

+	result := make(map[string]types.NetworkCreate)

+

+	for internalName := range servicesNetworks {

+		network := networks[internalName]

+		if network.External.External {

+			externalNetworks = append(externalNetworks, network.External.Name)

+			continue

+		}

+

+		createOpts := types.NetworkCreate{

+			Labels:  AddStackLabel(namespace, network.Labels),

+			Driver:  network.Driver,

+			Options: network.DriverOpts,

+		}

+

+		if network.Ipam.Driver != "" || len(network.Ipam.Config) > 0 {

+			createOpts.IPAM = &networktypes.IPAM{}

+		}

+

+		if network.Ipam.Driver != "" {

+			createOpts.IPAM.Driver = network.Ipam.Driver

+		}

+		for _, ipamConfig := range network.Ipam.Config {

+			config := networktypes.IPAMConfig{

+				Subnet: ipamConfig.Subnet,

+			}

+			createOpts.IPAM.Config = append(createOpts.IPAM.Config, config)

+		}

+		result[internalName] = createOpts

+	}

+

+	return result, externalNetworks

+}

new file mode 100644

@@ -0,0 +1,90 @@

+package convert

+

+import (

+	"testing"

+

+	composetypes "github.com/aanand/compose-file/types"

+	"github.com/docker/docker/api/types"

+	"github.com/docker/docker/api/types/network"

+	"github.com/docker/docker/pkg/testutil/assert"

+)

+

+func TestNamespaceScope(t *testing.T) {

+	scoped := Namespace{name: "foo"}.Scope("bar")

+	assert.Equal(t, scoped, "foo_bar")

+}

+

+func TestAddStackLabel(t *testing.T) {

+	labels := map[string]string{

+		"something": "labeled",

+	}

+	actual := AddStackLabel(Namespace{name: "foo"}, labels)

+	expected := map[string]string{

+		"something":    "labeled",

+		LabelNamespace: "foo",

+	}

+	assert.DeepEqual(t, actual, expected)

+}

+

+func TestNetworks(t *testing.T) {

+	namespace := Namespace{name: "foo"}

+	source := networkMap{

+		"normal": composetypes.NetworkConfig{

+			Driver: "overlay",

+			DriverOpts: map[string]string{

+				"opt": "value",

+			},

+			Ipam: composetypes.IPAMConfig{

+				Driver: "driver",

+				Config: []*composetypes.IPAMPool{

+					{

+						Subnet: "10.0.0.0",

+					},

+				},

+			},

+			Labels: map[string]string{

+				"something": "labeled",

+			},

+		},

+		"outside": composetypes.NetworkConfig{

+			External: composetypes.External{

+				External: true,

+				Name:     "special",

+			},

+		},

+	}

+	expected := map[string]types.NetworkCreate{

+		"default": {

+			Labels: map[string]string{

+				LabelNamespace: "foo",

+			},

+		},

+		"normal": {

+			Driver: "overlay",

+			IPAM: &network.IPAM{

+				Driver: "driver",

+				Config: []network.IPAMConfig{

+					{

+						Subnet: "10.0.0.0",

+					},

+				},

+			},

+			Options: map[string]string{

+				"opt": "value",

+			},

+			Labels: map[string]string{

+				LabelNamespace: "foo",

+				"something":    "labeled",

+			},

+		},

+	}

+

+	serviceNetworks := map[string]struct{}{

+		"default": {},

+		"normal":  {},

+		"outside": {},

+	}

+	networks, externals := Networks(namespace, source, serviceNetworks)

+	assert.DeepEqual(t, networks, expected)

+	assert.DeepEqual(t, externals, []string{"special"})

+}

new file mode 100644

@@ -0,0 +1,338 @@

+package convert

+

+import (

+	"fmt"

+	"time"

+

+	composetypes "github.com/aanand/compose-file/types"

+	"github.com/docker/docker/api/types/container"

+	"github.com/docker/docker/api/types/swarm"

+	"github.com/docker/docker/opts"

+	runconfigopts "github.com/docker/docker/runconfig/opts"

+	"github.com/docker/go-connections/nat"

+)

+

+// Services from compose-file types to engine API types

+func Services(

+	namespace Namespace,

+	config *composetypes.Config,

+) (map[string]swarm.ServiceSpec, error) {

+	result := make(map[string]swarm.ServiceSpec)

+

+	services := config.Services

+	volumes := config.Volumes

+	networks := config.Networks

+

+	for _, service := range services {

+		serviceSpec, err := convertService(namespace, service, networks, volumes)

+		if err != nil {

+			return nil, err

+		}

+		result[service.Name] = serviceSpec

+	}

+

+	return result, nil

+}

+

+func convertService(

+	namespace Namespace,

+	service composetypes.ServiceConfig,

+	networkConfigs map[string]composetypes.NetworkConfig,

+	volumes map[string]composetypes.VolumeConfig,

+) (swarm.ServiceSpec, error) {

+	name := namespace.Scope(service.Name)

+

+	endpoint, err := convertEndpointSpec(service.Ports)

+	if err != nil {

+		return swarm.ServiceSpec{}, err

+	}

+

+	mode, err := convertDeployMode(service.Deploy.Mode, service.Deploy.Replicas)

+	if err != nil {

+		return swarm.ServiceSpec{}, err

+	}

+

+	mounts, err := Volumes(service.Volumes, volumes, namespace)

+	if err != nil {

+		// TODO: better error message (include service name)

+		return swarm.ServiceSpec{}, err

+	}

+

+	resources, err := convertResources(service.Deploy.Resources)

+	if err != nil {

+		return swarm.ServiceSpec{}, err

+	}

+

+	restartPolicy, err := convertRestartPolicy(

+		service.Restart, service.Deploy.RestartPolicy)

+	if err != nil {

+		return swarm.ServiceSpec{}, err

+	}

+

+	healthcheck, err := convertHealthcheck(service.HealthCheck)

+	if err != nil {

+		return swarm.ServiceSpec{}, err

+	}

+

+	networks, err := convertServiceNetworks(service.Networks, networkConfigs, namespace, service.Name)

+	if err != nil {

+		return swarm.ServiceSpec{}, err

+	}

+

+	var logDriver *swarm.Driver

+	if service.Logging != nil {

+		logDriver = &swarm.Driver{

+			Name:    service.Logging.Driver,

+			Options: service.Logging.Options,

+		}

+	}

+

+	serviceSpec := swarm.ServiceSpec{

+		Annotations: swarm.Annotations{

+			Name:   name,

+			Labels: AddStackLabel(namespace, service.Deploy.Labels),

+		},

+		TaskTemplate: swarm.TaskSpec{

+			ContainerSpec: swarm.ContainerSpec{

+				Image:           service.Image,

+				Command:         service.Entrypoint,

+				Args:            service.Command,

+				Hostname:        service.Hostname,

+				Hosts:           convertExtraHosts(service.ExtraHosts),

+				Healthcheck:     healthcheck,

+				Env:             convertEnvironment(service.Environment),

+				Labels:          AddStackLabel(namespace, service.Labels),

+				Dir:             service.WorkingDir,

+				User:            service.User,

+				Mounts:          mounts,

+				StopGracePeriod: service.StopGracePeriod,

+				TTY:             service.Tty,

+				OpenStdin:       service.StdinOpen,

+			},

+			LogDriver:     logDriver,

+			Resources:     resources,

+			RestartPolicy: restartPolicy,

+			Placement: &swarm.Placement{

+				Constraints: service.Deploy.Placement.Constraints,

+			},

+		},

+		EndpointSpec: endpoint,

+		Mode:         mode,

+		Networks:     networks,

+		UpdateConfig: convertUpdateConfig(service.Deploy.UpdateConfig),

+	}

+

+	return serviceSpec, nil

+}

+

+func convertServiceNetworks(

+	networks map[string]*composetypes.ServiceNetworkConfig,

+	networkConfigs networkMap,

+	namespace Namespace,

+	name string,

+) ([]swarm.NetworkAttachmentConfig, error) {

+	if len(networks) == 0 {

+		return []swarm.NetworkAttachmentConfig{

+			{

+				Target:  namespace.Scope("default"),

+				Aliases: []string{name},

+			},

+		}, nil

+	}

+

+	nets := []swarm.NetworkAttachmentConfig{}

+	for networkName, network := range networks {

+		networkConfig, ok := networkConfigs[networkName]

+		if !ok {

+			return []swarm.NetworkAttachmentConfig{}, fmt.Errorf(

+				"service %q references network %q, which is not declared", name, networkName)

+		}

+		var aliases []string

+		if network != nil {

+			aliases = network.Aliases

+		}

+		target := namespace.Scope(networkName)

+		if networkConfig.External.External {

+			target = networkConfig.External.Name

+		}

+		nets = append(nets, swarm.NetworkAttachmentConfig{

+			Target:  target,

+			Aliases: append(aliases, name),

+		})

+	}

+	return nets, nil

+}

+

+func convertExtraHosts(extraHosts map[string]string) []string {

+	hosts := []string{}

+	for host, ip := range extraHosts {

+		hosts = append(hosts, fmt.Sprintf("%s %s", ip, host))

+	}

+	return hosts

+}

+

+func convertHealthcheck(healthcheck *composetypes.HealthCheckConfig) (*container.HealthConfig, error) {

+	if healthcheck == nil {

+		return nil, nil

+	}

+	var (

+		err               error

+		timeout, interval time.Duration

+		retries           int

+	)

+	if healthcheck.Disable {

+		if len(healthcheck.Test) != 0 {

+			return nil, fmt.Errorf("test and disable can't be set at the same time")

+		}

+		return &container.HealthConfig{

+			Test: []string{"NONE"},

+		}, nil

+

+	}

+	if healthcheck.Timeout != "" {

+		timeout, err = time.ParseDuration(healthcheck.Timeout)

+		if err != nil {

+			return nil, err

+		}

+	}

+	if healthcheck.Interval != "" {

+		interval, err = time.ParseDuration(healthcheck.Interval)

+		if err != nil {

+			return nil, err

+		}

+	}

+	if healthcheck.Retries != nil {

+		retries = int(*healthcheck.Retries)

+	}

+	return &container.HealthConfig{

+		Test:     healthcheck.Test,

+		Timeout:  timeout,

+		Interval: interval,

+		Retries:  retries,

+	}, nil

+}

+

+func convertRestartPolicy(restart string, source *composetypes.RestartPolicy) (*swarm.RestartPolicy, error) {

+	// TODO: log if restart is being ignored

+	if source == nil {

+		policy, err := runconfigopts.ParseRestartPolicy(restart)

+		if err != nil {

+			return nil, err

+		}

+		switch {

+		case policy.IsNone():

+			return nil, nil

+		case policy.IsAlways(), policy.IsUnlessStopped():

+			return &swarm.RestartPolicy{

+				Condition: swarm.RestartPolicyConditionAny,

+			}, nil

+		case policy.IsOnFailure():

+			attempts := uint64(policy.MaximumRetryCount)

+			return &swarm.RestartPolicy{

+				Condition:   swarm.RestartPolicyConditionOnFailure,

+				MaxAttempts: &attempts,

+			}, nil

+		default:

+			return nil, fmt.Errorf("unknown restart policy: %s", restart)

+		}

+	}

+	return &swarm.RestartPolicy{

+		Condition:   swarm.RestartPolicyCondition(source.Condition),

+		Delay:       source.Delay,

+		MaxAttempts: source.MaxAttempts,

+		Window:      source.Window,

+	}, nil

+}

+

+func convertUpdateConfig(source *composetypes.UpdateConfig) *swarm.UpdateConfig {

+	if source == nil {

+		return nil

+	}

+	parallel := uint64(1)

+	if source.Parallelism != nil {

+		parallel = *source.Parallelism

+	}

+	return &swarm.UpdateConfig{

+		Parallelism:     parallel,

+		Delay:           source.Delay,

+		FailureAction:   source.FailureAction,

+		Monitor:         source.Monitor,

+		MaxFailureRatio: source.MaxFailureRatio,

+	}

+}

+

+func convertResources(source composetypes.Resources) (*swarm.ResourceRequirements, error) {

+	resources := &swarm.ResourceRequirements{}

+	var err error

+	if source.Limits != nil {

+		var cpus int64

+		if source.Limits.NanoCPUs != "" {

+			cpus, err = opts.ParseCPUs(source.Limits.NanoCPUs)

+			if err != nil {

+				return nil, err

+			}

+		}

+		resources.Limits = &swarm.Resources{

+			NanoCPUs:    cpus,

+			MemoryBytes: int64(source.Limits.MemoryBytes),

+		}

+	}

+	if source.Reservations != nil {

+		var cpus int64

+		if source.Reservations.NanoCPUs != "" {

+			cpus, err = opts.ParseCPUs(source.Reservations.NanoCPUs)

+			if err != nil {

+				return nil, err

+			}

+		}

+		resources.Reservations = &swarm.Resources{

+			NanoCPUs:    cpus,

+			MemoryBytes: int64(source.Reservations.MemoryBytes),

+		}

+	}

+	return resources, nil

+

+}

+

+func convertEndpointSpec(source []string) (*swarm.EndpointSpec, error) {

+	portConfigs := []swarm.PortConfig{}

+	ports, portBindings, err := nat.ParsePortSpecs(source)

+	if err != nil {

+		return nil, err

+	}

+

+	for port := range ports {

+		portConfigs = append(

+			portConfigs,

+			opts.ConvertPortToPortConfig(port, portBindings)...)

+	}

+

+	return &swarm.EndpointSpec{Ports: portConfigs}, nil

+}

+

+func convertEnvironment(source map[string]string) []string {

+	var output []string

+

+	for name, value := range source {

+		output = append(output, fmt.Sprintf("%s=%s", name, value))

+	}

+

+	return output

+}

+

+func convertDeployMode(mode string, replicas *uint64) (swarm.ServiceMode, error) {

+	serviceMode := swarm.ServiceMode{}

+

+	switch mode {

+	case "global":

+		if replicas != nil {

+			return serviceMode, fmt.Errorf("replicas can only be used with replicated mode")

+		}

+		serviceMode.Global = &swarm.GlobalService{}

+	case "replicated", "":

+		serviceMode.Replicated = &swarm.ReplicatedService{Replicas: replicas}

+	default:

+		return serviceMode, fmt.Errorf("Unknown mode: %s", mode)

+	}

+	return serviceMode, nil

+}

new file mode 100644

@@ -0,0 +1,193 @@

+package convert

+

+import (

+	"sort"

+	"strings"

+	"testing"

+	"time"

+

+	composetypes "github.com/aanand/compose-file/types"

+	"github.com/docker/docker/api/types/container"

+	"github.com/docker/docker/api/types/swarm"

+	"github.com/docker/docker/pkg/testutil/assert"

+)

+

+func TestConvertRestartPolicyFromNone(t *testing.T) {

+	policy, err := convertRestartPolicy("no", nil)

+	assert.NilError(t, err)

+	assert.Equal(t, policy, (*swarm.RestartPolicy)(nil))

+}

+

+func TestConvertRestartPolicyFromUnknown(t *testing.T) {

+	_, err := convertRestartPolicy("unknown", nil)

+	assert.Error(t, err, "unknown restart policy: unknown")

+}

+

+func TestConvertRestartPolicyFromAlways(t *testing.T) {

+	policy, err := convertRestartPolicy("always", nil)

+	expected := &swarm.RestartPolicy{

+		Condition: swarm.RestartPolicyConditionAny,

+	}

+	assert.NilError(t, err)

+	assert.DeepEqual(t, policy, expected)

+}

+

+func TestConvertRestartPolicyFromFailure(t *testing.T) {

+	policy, err := convertRestartPolicy("on-failure:4", nil)

+	attempts := uint64(4)

+	expected := &swarm.RestartPolicy{

+		Condition:   swarm.RestartPolicyConditionOnFailure,

+		MaxAttempts: &attempts,

+	}

+	assert.NilError(t, err)

+	assert.DeepEqual(t, policy, expected)

+}

+

+func TestConvertEnvironment(t *testing.T) {

+	source := map[string]string{

+		"foo": "bar",

+		"key": "value",

+	}

+	env := convertEnvironment(source)

+	sort.Strings(env)

+	assert.DeepEqual(t, env, []string{"foo=bar", "key=value"})

+}

+

+func TestConvertResourcesFull(t *testing.T) {

+	source := composetypes.Resources{

+		Limits: &composetypes.Resource{

+			NanoCPUs:    "0.003",

+			MemoryBytes: composetypes.UnitBytes(300000000),

+		},

+		Reservations: &composetypes.Resource{

+			NanoCPUs:    "0.002",

+			MemoryBytes: composetypes.UnitBytes(200000000),

+		},

+	}

+	resources, err := convertResources(source)

+	assert.NilError(t, err)

+

+	expected := &swarm.ResourceRequirements{

+		Limits: &swarm.Resources{

+			NanoCPUs:    3000000,

+			MemoryBytes: 300000000,

+		},

+		Reservations: &swarm.Resources{

+			NanoCPUs:    2000000,

+			MemoryBytes: 200000000,

+		},

+	}

+	assert.DeepEqual(t, resources, expected)

+}

+

+func TestConvertHealthcheck(t *testing.T) {

+	retries := uint64(10)

+	source := &composetypes.HealthCheckConfig{

+		Test:     []string{"EXEC", "touch", "/foo"},

+		Timeout:  "30s",

+		Interval: "2ms",

+		Retries:  &retries,

+	}

+	expected := &container.HealthConfig{

+		Test:     source.Test,

+		Timeout:  30 * time.Second,

+		Interval: 2 * time.Millisecond,

+		Retries:  10,

+	}

+

+	healthcheck, err := convertHealthcheck(source)

+	assert.NilError(t, err)

+	assert.DeepEqual(t, healthcheck, expected)

+}

+

+func TestConvertHealthcheckDisable(t *testing.T) {

+	source := &composetypes.HealthCheckConfig{Disable: true}

+	expected := &container.HealthConfig{

+		Test: []string{"NONE"},

+	}

+

+	healthcheck, err := convertHealthcheck(source)

+	assert.NilError(t, err)

+	assert.DeepEqual(t, healthcheck, expected)

+}

+

+func TestConvertHealthcheckDisableWithTest(t *testing.T) {

+	source := &composetypes.HealthCheckConfig{

+		Disable: true,

+		Test:    []string{"EXEC", "touch"},

+	}

+	_, err := convertHealthcheck(source)

+	assert.Error(t, err, "test and disable can't be set")

+}

+

+func TestConvertServiceNetworksOnlyDefault(t *testing.T) {

+	networkConfigs := networkMap{}

+	networks := map[string]*composetypes.ServiceNetworkConfig{}

+

+	configs, err := convertServiceNetworks(

+		networks, networkConfigs, NewNamespace("foo"), "service")

+

+	expected := []swarm.NetworkAttachmentConfig{

+		{

+			Target:  "foo_default",

+			Aliases: []string{"service"},

+		},

+	}

+

+	assert.NilError(t, err)

+	assert.DeepEqual(t, configs, expected)

+}

+

+func TestConvertServiceNetworks(t *testing.T) {

+	networkConfigs := networkMap{

+		"front": composetypes.NetworkConfig{

+			External: composetypes.External{

+				External: true,

+				Name:     "fronttier",

+			},

+		},

+		"back": composetypes.NetworkConfig{},

+	}

+	networks := map[string]*composetypes.ServiceNetworkConfig{

+		"front": {

+			Aliases: []string{"something"},

+		},

+		"back": {

+			Aliases: []string{"other"},

+		},

+	}

+

+	configs, err := convertServiceNetworks(

+		networks, networkConfigs, NewNamespace("foo"), "service")

+

+	expected := []swarm.NetworkAttachmentConfig{

+		{

+			Target:  "foo_back",

+			Aliases: []string{"other", "service"},

+		},

+		{

+			Target:  "fronttier",

+			Aliases: []string{"something", "service"},

+		},

+	}

+

+	sortedConfigs := byTargetSort(configs)

+	sort.Sort(&sortedConfigs)

+

+	assert.NilError(t, err)

+	assert.DeepEqual(t, []swarm.NetworkAttachmentConfig(sortedConfigs), expected)

+}

+

+type byTargetSort []swarm.NetworkAttachmentConfig

+

+func (s byTargetSort) Len() int {

+	return len(s)

+}

+

+func (s byTargetSort) Less(i, j int) bool {

+	return strings.Compare(s[i].Target, s[j].Target) < 0

+}

+

+func (s byTargetSort) Swap(i, j int) {

+	s[i], s[j] = s[j], s[i]

+}

new file mode 100644

@@ -0,0 +1,120 @@

+package convert

+

+import (

+	"fmt"

+	"strings"

+