clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 15:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add -dns to docker daemon

Browse Source
This commit is contained in:
Guillaume J. Charmes
2013-06-05 14:20:54 -07:00
parent 068076f775
commit 84d68007cb
5 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/docker.go
+8 -3
View File
@@ -33,6 +33,11 @@ func main() {
bridgeName := flag.String("b", "", "Attach containers to a pre-existing network bridge")
pidfile := flag.String("p", "/var/run/docker.pid", "File containing process PID")
flHost := flag.String("H", fmt.Sprintf("%s:%d", host, port), "Host:port to bind/connect to")
flags := flag.NewFlagSet("docker", flag.ContinueOnError)
var flDns docker.ListOpts
flags.Var(&flDns, "dns", "Set custom dns servers")
flag.Parse()
if *bridgeName != "" {
docker.NetworkBridgeIface = *bridgeName
@@ -65,7 +70,7 @@ func main() {
flag.Usage()
return
}
if err := daemon(*pidfile, host, port, *flAutoRestart); err != nil {
if err := daemon(*pidfile, host, port, *flAutoRestart, flDns); err != nil {
log.Fatal(err)
os.Exit(-1)
}
@@ -104,7 +109,7 @@ func removePidFile(pidfile string) {
}
}
func daemon(pidfile, addr string, port int, autoRestart bool) error {
func daemon(pidfile, addr string, port int, autoRestart bool, flDns docker.ListOpts) error {
if addr != "127.0.0.1" {
log.Println("/!\\ DON'T BIND ON ANOTHER IP ADDRESS THAN 127.0.0.1 IF YOU DON'T KNOW WHAT YOU'RE DOING /!\\")
}
@@ -122,7 +127,7 @@ func daemon(pidfile, addr string, port int, autoRestart bool) error {
os.Exit(0)
}()
server, err := docker.NewServer(autoRestart)
server, err := docker.NewServer(autoRestart, flDns)
if err != nil {
return err
}