Skip to content

Commit

Permalink
Merge pull request #33311 from msabansal/dnssearch
Browse files Browse the repository at this point in the history
Adding support for DNS search on RS1
  • Loading branch information
thaJeztah committed May 30, 2017
2 parents 599f207 + b8e8dcd commit 4bf8714
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions daemon/start_windows.go
Expand Up @@ -9,7 +9,6 @@ import (
"github.com/docker/docker/container"
"github.com/docker/docker/layer"
"github.com/docker/docker/libcontainerd"
"github.com/docker/docker/pkg/system"
"golang.org/x/sys/windows/registry"
)

Expand All @@ -32,12 +31,6 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain
}

dnsSearch := daemon.getDNSSearchSettings(container)
if dnsSearch != nil {
osv := system.GetOSVersion()
if osv.Build < 14997 {
return nil, fmt.Errorf("dns-search option is not supported on the current platform")
}
}

// Generate the layer folder of the layer options
layerOpts := &libcontainerd.LayerOption{}
Expand Down

0 comments on commit 4bf8714

Please sign in to comment.