From 10c97f4113cb889e1c0947833bc65a6da663ceca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= <ertugrulerata@gmail.com>
Date: Wed, 12 Aug 2015 19:37:05 +0300
Subject: [PATCH] docker-1.8.0 in main

---
 hardware/virtualization/docker/actions.py       | 8 ++++----
 hardware/virtualization/docker/comar/service.py | 2 +-
 hardware/virtualization/docker/pspec.xml        | 9 ++++++++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/hardware/virtualization/docker/actions.py b/hardware/virtualization/docker/actions.py
index 6f38db4394..92a217bf42 100644
--- a/hardware/virtualization/docker/actions.py
+++ b/hardware/virtualization/docker/actions.py
@@ -24,10 +24,10 @@ def build():
     shelltools.system("./hack/make.sh dynbinary")
 
 def install():
-    pisitools.dobin("bundles/1.7.1/dynbinary/docker")
-    pisitools.dobin("bundles/1.7.1/dynbinary/docker-1.7.1")
-    pisitools.doexe("bundles/1.7.1/dynbinary/dockerinit", "/usr/lib/docker")
-    pisitools.doexe("bundles/1.7.1/dynbinary/dockerinit-1.7.1", "/usr/lib/docker")
+    pisitools.dobin("bundles/1.8.0/dynbinary/docker")
+    pisitools.dobin("bundles/1.8.0/dynbinary/docker-1.8.0")
+    pisitools.doexe("bundles/1.8.0/dynbinary/dockerinit", "/usr/lib/docker")
+    pisitools.doexe("bundles/1.8.0/dynbinary/dockerinit-1.8.0", "/usr/lib/docker")
 
     # insert udev rules
     pisitools.insinto("/etc/udev/rules.d", "contrib/udev/*.rules")
diff --git a/hardware/virtualization/docker/comar/service.py b/hardware/virtualization/docker/comar/service.py
index 86a6325a87..3d2e99b632 100644
--- a/hardware/virtualization/docker/comar/service.py
+++ b/hardware/virtualization/docker/comar/service.py
@@ -16,7 +16,7 @@ def start():
     os.system("/sbin/modprobe -va bridge nf_nat br_netfilter")
     
     startService(command="/usr/bin/docker",
-                args="-d %s" % (config.get("DOCKER_OPTS", "")),
+                args="daemon %s" % (config.get("DOCKER_OPTS", "")),
                 chuid="root:docker",
                 pidfile="/var/run/docker.pid",
                 donotify=True)
diff --git a/hardware/virtualization/docker/pspec.xml b/hardware/virtualization/docker/pspec.xml
index 1227df184e..7fee3ba732 100644
--- a/hardware/virtualization/docker/pspec.xml
+++ b/hardware/virtualization/docker/pspec.xml
@@ -13,7 +13,7 @@
         <Summary>Pack, ship and run any application as a lightweight container</Summary>
         <Description>An open platform for distributed applications for developers and sysadmins</Description>
         <!--fix sha1sum-->
-        <Archive sha1sum="93a7dffdc434af3ba38104a1d3ae445212ae8c0d" type="targz">https://github.com/docker/docker/archive/v1.7.1.tar.gz</Archive>
+        <Archive sha1sum="670f6ef2b8d03c11985fadfde09e1cfbe17fa8ec" type="targz">https://github.com/docker/docker/archive/v1.8.0.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>git</Dependency>
             <Dependency>golang</Dependency>
@@ -54,6 +54,13 @@
     </Package>
 
     <History>
+        <Update release="6">
+            <Date>2015-08-12</Date>
+            <Version>1.8.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="5">
             <Date>2015-07-24</Date>
             <Version>1.7.1</Version>