diff options
| author | Solomon Hykes <solomon@docker.com> | 2014-04-08 13:44:26 -0700 |
|---|---|---|
| committer | Solomon Hykes <solomon@docker.com> | 2014-04-08 13:44:26 -0700 |
| commit | 795d6b8b150db03c62403ab5fbefa5ca7488c2bf (patch) | |
| tree | 080d97e2c2fdc9e5dd7b41db95b6c0f15e36e78a /server/server.go | |
| parent | 00e080fef695cb6bf9cc2704d0c9a3ccc3081495 (diff) | |
| parent | 919dbbe44df0722ca35538223a9c89e71856ec88 (diff) | |
| download | docker-795d6b8b150db03c62403ab5fbefa5ca7488c2bf.tar.gz | |
Merge pull request #5066 from crosbymichael/remove-dns-conf
Move DNS options to hostconfig
Diffstat (limited to 'server/server.go')
| -rw-r--r-- | server/server.go | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/server/server.go b/server/server.go index 9cabf17889..0feaff4eac 100644 --- a/server/server.go +++ b/server/server.go @@ -1731,15 +1731,6 @@ func (srv *Server) ContainerCreate(job *engine.Job) engine.Status { job.Errorf("Your kernel does not support swap limit capabilities. Limitation discarded.\n") config.MemorySwap = -1 } - resolvConf, err := utils.GetResolvConf() - if err != nil { - return job.Error(err) - } - if !config.NetworkDisabled && len(config.Dns) == 0 && len(srv.runtime.Config().Dns) == 0 && utils.CheckLocalDns(resolvConf) { - job.Errorf("Local (127.0.0.1) DNS resolver found in resolv.conf and containers can't use it. Using default external servers : %v\n", runtime.DefaultDns) - config.Dns = runtime.DefaultDns - } - container, buildWarnings, err := srv.runtime.Create(config, name) if err != nil { if srv.runtime.Graph().IsNotExist(err) { |