Merge pull request #405 from joshwget/isolation

Add isolation

Author: vdemeester

config/types.go

@@ -40,6 +40,7 @@ type ServiceConfigV1 struct {
 	GroupAdd      []string             `yaml:"group_add,omitempty"`
 	Hostname      string               `yaml:"hostname,omitempty"`
 	Image         string               `yaml:"image,omitempty"`
+	Isolation     string               `yaml:"isolation,omitempty"`
 	Labels        yaml.SliceorMap      `yaml:"labels,omitempty"`
 	Links         yaml.MaporColonSlice `yaml:"links,omitempty"`
 	LogDriver     string               `yaml:"log_driver,omitempty"`
@@ -107,6 +108,7 @@ type ServiceConfig struct {
 	ExtraHosts    []string             `yaml:"extra_hosts,omitempty"`
 	GroupAdd      []string             `yaml:"group_add,omitempty"`
 	Image         string               `yaml:"image,omitempty"`
+	Isolation     string               `yaml:"isolation,omitempty"`
 	Hostname      string               `yaml:"hostname,omitempty"`
 	Ipc           string               `yaml:"ipc,omitempty"`
 	Labels        yaml.SliceorMap      `yaml:"labels,omitempty"`

docker/service/convert.go

@@ -253,6 +253,7 @@ func Convert(c *config.ServiceConfig, ctx project.Context, clientFactory compose
 		DNS:         utils.CopySlice(c.DNS),
 		DNSOptions:  utils.CopySlice(c.DNSOpts),
 		DNSSearch:   utils.CopySlice(c.DNSSearch),
+		Isolation:   container.Isolation(c.Isolation),
 		LogConfig: container.LogConfig{
 			Type:   c.Logging.Driver,
 			Config: utils.CopyMap(c.Logging.Options),

docker/service/convert_test.go

@@ -5,6 +5,7 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/docker/docker/api/types/container"
 	"github.com/docker/libcompose/config"
 	"github.com/docker/libcompose/docker/ctx"
 	"github.com/docker/libcompose/lookup"
@@ -115,6 +116,17 @@ func TestGroupAdd(t *testing.T) {
 	}, hostCfg.GroupAdd))
 }
 
+func TestIsolation(t *testing.T) {
+	ctx := &ctx.Context{}
+	sc := &config.ServiceConfig{
+		Isolation: "default",
+	}
+	_, hostCfg, err := Convert(sc, ctx.Context, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, container.Isolation("default"), hostCfg.Isolation)
+}
+
 func TestMemSwappiness(t *testing.T) {
 	ctx := &ctx.Context{}
 	sc := &config.ServiceConfig{