Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #398 from ertugerata/master

Browse Source 
docker update to 1.8.2 close #392
This commit is contained in:
Ertuğrul Erata
2015-09-12 00:43:48 +03:00
parent 3cb07977d1 0782167949
commit 7e158109bf
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/docker/actions.py
+5 -5
View File
@@ -10,7 +10,7 @@ from pisi.actionsapi import shelltools
from pisi.actionsapi import get from pisi.actionsapi import get
shelltools.export("AUTO_GOPATH", "1") shelltools.export("AUTO_GOPATH", "1")
shelltools.export("DOCKER_GITCOMMIT", "d12ea79") shelltools.export("DOCKER_GITCOMMIT", "0a8c2e3")
shelltools.export("GOPATH", "%s" % get.workDIR()) shelltools.export("GOPATH", "%s" % get.workDIR())
shelltools.export("CGO_CFLAGS", "-I/usr/include") shelltools.export("CGO_CFLAGS", "-I/usr/include")
@@ -24,10 +24,10 @@ def build():
shelltools.system("./hack/make.sh dynbinary") shelltools.system("./hack/make.sh dynbinary")
def install(): def install():
pisitools.dobin("bundles/1.8.1/dynbinary/docker") pisitools.dobin("bundles/1.8.2/dynbinary/docker")
pisitools.dobin("bundles/1.8.1/dynbinary/docker-1.8.1") pisitools.dobin("bundles/1.8.2/dynbinary/docker-1.8.2")
pisitools.doexe("bundles/1.8.1/dynbinary/dockerinit", "/usr/lib/docker") pisitools.doexe("bundles/1.8.2/dynbinary/dockerinit", "/usr/lib/docker")
pisitools.doexe("bundles/1.8.1/dynbinary/dockerinit-1.8.1", "/usr/lib/docker") pisitools.doexe("bundles/1.8.2/dynbinary/dockerinit-1.8.2", "/usr/lib/docker")
# insert udev rules # insert udev rules
pisitools.insinto("/etc/udev/rules.d", "contrib/udev/*.rules") pisitools.insinto("/etc/udev/rules.d", "contrib/udev/*.rules")
hardware/virtualization/docker/pspec.xml
+8 -1
View File
@@ -13,7 +13,7 @@
<Summary>Pack, ship and run any application as a lightweight container</Summary> <Summary>Pack, ship and run any application as a lightweight container</Summary>
<Description>An open platform for distributed applications for developers and sysadmins</Description> <Description>An open platform for distributed applications for developers and sysadmins</Description>
<!--fix sha1sum--> <!--fix sha1sum-->
<Archive sha1sum="5f18bfae488279afc02b05df73231f8974c3b00e" type="targz">https://github.com/docker/docker/archive/v1.8.1.tar.gz</Archive> <Archive sha1sum="e76aa88ab831f0e26e2c1d3d21f9606a14e5ecce" type="targz">https://github.com/docker/docker/archive/v1.8.2.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>git</Dependency> <Dependency>git</Dependency>
<Dependency>golang</Dependency> <Dependency>golang</Dependency>
@@ -54,6 +54,13 @@
</Package> </Package>
<History> <History>
<Update release="8">
<Date>2015-09-12</Date>
<Version>1.8.2</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="7"> <Update release="7">
<Date>2015-09-06</Date> <Date>2015-09-06</Date>
<Version>1.8.1</Version> <Version>1.8.1</Version>