diff --git a/hardware/virtualization/docker/actions.py b/hardware/virtualization/docker/actions.py index 7c12eee1e6..dbde31c0f6 100644 --- a/hardware/virtualization/docker/actions.py +++ b/hardware/virtualization/docker/actions.py @@ -10,7 +10,7 @@ from pisi.actionsapi import shelltools from pisi.actionsapi import get shelltools.export("AUTO_GOPATH", "1") -shelltools.export("DOCKER_GITCOMMIT", "0d03096") +shelltools.export("DOCKER_GITCOMMIT", "d12ea79") shelltools.export("GOPATH", "%s" % get.workDIR()) shelltools.export("CGO_CFLAGS", "-I/usr/include") @@ -24,10 +24,10 @@ def build(): shelltools.system("./hack/make.sh dynbinary") def install(): - 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") + pisitools.dobin("bundles/1.8.1/dynbinary/docker") + pisitools.dobin("bundles/1.8.1/dynbinary/docker-1.8.1") + pisitools.doexe("bundles/1.8.1/dynbinary/dockerinit", "/usr/lib/docker") + pisitools.doexe("bundles/1.8.1/dynbinary/dockerinit-1.8.1", "/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 3d2e99b632..04c8813aa5 100644 --- a/hardware/virtualization/docker/comar/service.py +++ b/hardware/virtualization/docker/comar/service.py @@ -17,14 +17,13 @@ def start(): startService(command="/usr/bin/docker", args="daemon %s" % (config.get("DOCKER_OPTS", "")), - chuid="root:docker", - pidfile="/var/run/docker.pid", + pidfile=pidfile, donotify=True) @synchronized def stop(): stopService(command="/usr/bin/docker", - pidfile="/var/run/docker.pid", + pidfile=pidfile, donotify=True) def status(): diff --git a/hardware/virtualization/docker/pspec.xml b/hardware/virtualization/docker/pspec.xml index 7fee3ba732..bdee77af29 100644 --- a/hardware/virtualization/docker/pspec.xml +++ b/hardware/virtualization/docker/pspec.xml @@ -13,7 +13,7 @@ Pack, ship and run any application as a lightweight container An open platform for distributed applications for developers and sysadmins - https://github.com/docker/docker/archive/v1.8.0.tar.gz + https://github.com/docker/docker/archive/v1.8.1.tar.gz git golang @@ -54,6 +54,13 @@ + + 2015-09-06 + 1.8.1 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2015-08-12 1.8.0