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

Merge pull request #748 from ertugerata/master

Browse Source 
docker-1.9.0 ready for test
This commit is contained in:
Ertuğrul Erata
2015-11-04 20:02:39 +02:00
parent 88dda59de8 7dd5a3a96e
commit 0a359d0db5
2 changed files with 14 additions and 7 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", "f4bf5c7") shelltools.export("DOCKER_GITCOMMIT", "76d6bc9")
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.3/dynbinary/docker") pisitools.dobin("bundles/1.9.0/dynbinary/docker")
pisitools.dobin("bundles/1.8.3/dynbinary/docker-1.8.3") pisitools.dobin("bundles/1.9.0/dynbinary/docker-1.9.0")
pisitools.doexe("bundles/1.8.3/dynbinary/dockerinit", "/usr/lib/docker") pisitools.doexe("bundles/1.9.0/dynbinary/dockerinit", "/usr/lib/docker")
pisitools.doexe("bundles/1.8.3/dynbinary/dockerinit-1.8.3", "/usr/lib/docker") pisitools.doexe("bundles/1.9.0/dynbinary/dockerinit-1.9.0", "/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
+9 -2
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="b0f5a9e214c327f13309b591717bf651a1d63412" type="targz">https://github.com/docker/docker/archive/v1.8.3.tar.gz</Archive> <Archive sha1sum="f5881be416de335b44561d9522c0d5fd671d133b" type="targz">https://github.com/docker/docker/archive/v1.9.0.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>git</Dependency> <Dependency>git</Dependency>
<Dependency>golang</Dependency> <Dependency>golang</Dependency>
@@ -37,7 +37,7 @@
<Dependency>iptables</Dependency> <Dependency>iptables</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="config">/etc</Path> <Path fileType="config">/etc</Path>
<Path fileType="executable">/usr/bin/</Path> <Path fileType="executable">/usr/bin/</Path>
<Path fileType="library">/usr/lib/docker</Path> <Path fileType="library">/usr/lib/docker</Path>
<Path fileType="data">/usr/share/</Path> <Path fileType="data">/usr/share/</Path>
@@ -54,6 +54,13 @@
</Package> </Package>
<History> <History>
<Update release="10">
<Date>2015-11-04</Date>
<Version>1.9.0</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="9"> <Update release="9">
<Date>2015-10-28</Date> <Date>2015-10-28</Date>
<Version>1.8.3</Version> <Version>1.8.3</Version>