Merge pull request #404 from joshwget/dns-opt

Add dns_opt

Author: vdemeester

config/types.go

@@ -30,6 +30,7 @@ type ServiceConfigV1 struct {
 	ContainerName string               `yaml:"container_name,omitempty"`
 	Devices       []string             `yaml:"devices,omitempty"`
 	DNS           yaml.Stringorslice   `yaml:"dns,omitempty"`
+	DNSOpts       []string             `yaml:"dns_opt,omitempty"`
 	DNSSearch     yaml.Stringorslice   `yaml:"dns_search,omitempty"`
 	Dockerfile    string               `yaml:"dockerfile,omitempty"`
 	DomainName    string               `yaml:"domainname,omitempty"`
@@ -94,6 +95,7 @@ type ServiceConfig struct {
 	Devices       []string             `yaml:"devices,omitempty"`
 	DependsOn     []string             `yaml:"depends_on,omitempty"`
 	DNS           yaml.Stringorslice   `yaml:"dns,omitempty"`
+	DNSOpts       []string             `yaml:"dns_opt,omitempty"`
 	DNSSearch     yaml.Stringorslice   `yaml:"dns_search,omitempty"`
 	DomainName    string               `yaml:"domainname,omitempty"`
 	Entrypoint    yaml.Command         `yaml:"entrypoint,flow,omitempty"`

docker/service/convert.go

@@ -251,6 +251,7 @@ func Convert(c *config.ServiceConfig, ctx project.Context, clientFactory compose
 		Privileged:  c.Privileged,
 		Binds:       Filter(vols, isBind),
 		DNS:         utils.CopySlice(c.DNS),
+		DNSOptions:  utils.CopySlice(c.DNSOpts),
 		DNSSearch:   utils.CopySlice(c.DNSSearch),
 		LogConfig: container.LogConfig{
 			Type:   c.Logging.Driver,

docker/service/convert_test.go

@@ -81,6 +81,23 @@ func TestParseLabels(t *testing.T) {
 	assert.Equal(t, []string{"less"}, []string(cfg.Entrypoint))
 }
 
+func TestDNSOpt(t *testing.T) {
+	ctx := &ctx.Context{}
+	sc := &config.ServiceConfig{
+		DNSOpts: []string{
+			"use-vc",
+			"no-tld-query",
+		},
+	}
+	_, hostCfg, err := Convert(sc, ctx.Context, nil)
+	assert.Nil(t, err)
+
+	assert.True(t, reflect.DeepEqual([]string{
+		"use-vc",
+		"no-tld-query",
+	}, hostCfg.DNSOptions))
+}
+
 func TestGroupAdd(t *testing.T) {
 	ctx := &ctx.Context{}
 	sc := &config.ServiceConfig{