Merge pull request #706 from ertugerata/master

docker some fix
This commit is contained in:
Ertuğrul Erata
2015-10-28 09:23:38 +02:00
+5 -5
View File
@@ -10,7 +10,7 @@ from pisi.actionsapi import shelltools
from pisi.actionsapi import get
shelltools.export("AUTO_GOPATH", "1")
shelltools.export("DOCKER_GITCOMMIT", "0a8c2e3")
shelltools.export("DOCKER_GITCOMMIT", "f4bf5c7")
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.2/dynbinary/docker")
pisitools.dobin("bundles/1.8.2/dynbinary/docker-1.8.2")
pisitools.doexe("bundles/1.8.2/dynbinary/dockerinit", "/usr/lib/docker")
pisitools.doexe("bundles/1.8.2/dynbinary/dockerinit-1.8.2", "/usr/lib/docker")
pisitools.dobin("bundles/1.8.3/dynbinary/docker")
pisitools.dobin("bundles/1.8.3/dynbinary/docker-1.8.3")
pisitools.doexe("bundles/1.8.3/dynbinary/dockerinit", "/usr/lib/docker")
pisitools.doexe("bundles/1.8.3/dynbinary/dockerinit-1.8.3", "/usr/lib/docker")
# insert udev rules
pisitools.insinto("/etc/udev/rules.d", "contrib/udev/*.rules")