docker

2016-01-30 12:47:24 +02:00
parent e661e25f86
commit 48a882109a
2 changed files with 11 additions and 4 deletions
@@ -15,15 +15,15 @@ def start():
    os.system("/sbin/modprobe -va bridge nf_nat br_netfilter")

    startService(command="/usr/bin/docker",
-                args="daemon -p %s -s overlay --dns 8.8.8.8 --dns 8.8.4.4" % (pidfile),
+                args="daemon -p %s -s overlay %s" % (pidfile, config.get("DOCKER_OPTS", "")),
                detach=True,
                pidfile=pidfile,
-                donotify=False)
+                donotify=True)

@synchronized
 def stop():
    stopService(command="/usr/bin/docker",
-                donotify=False)
+                donotify=True)

 def status():
    return isServiceRunning(pidfile)