Merge pull request #1133 from aydemir/master

docker

hardware/virtualization/docker/comar/service.py

@@ -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)

hardware/virtualization/docker/pspec.xml

@@ -54,6 +54,13 @@
     </Package>
 
     <History>
+        <Update release="13">
+            <Date>2016-01-30</Date>
+            <Version>1.9.1</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="12">
             <Date>2016-01-09</Date>
             <Version>1.9.1</Version>
@@ -140,4 +147,4 @@
             <Email>ertugrulerata@gmail.com</Email>
         </Update>
     </History>
-</PISI>
+</PISI>