Merge pull request #748 from ertugerata/master
docker-1.9.0 ready for test
This commit is contained in:
@@ -10,7 +10,7 @@ from pisi.actionsapi import shelltools
|
||||
from pisi.actionsapi import get
|
||||
|
||||
shelltools.export("AUTO_GOPATH", "1")
|
||||
shelltools.export("DOCKER_GITCOMMIT", "f4bf5c7")
|
||||
shelltools.export("DOCKER_GITCOMMIT", "76d6bc9")
|
||||
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.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")
|
||||
pisitools.dobin("bundles/1.9.0/dynbinary/docker")
|
||||
pisitools.dobin("bundles/1.9.0/dynbinary/docker-1.9.0")
|
||||
pisitools.doexe("bundles/1.9.0/dynbinary/dockerinit", "/usr/lib/docker")
|
||||
pisitools.doexe("bundles/1.9.0/dynbinary/dockerinit-1.9.0", "/usr/lib/docker")
|
||||
|
||||
# insert udev rules
|
||||
pisitools.insinto("/etc/udev/rules.d", "contrib/udev/*.rules")
|
||||
|
||||
@@ -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="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>
|
||||
<Dependency>git</Dependency>
|
||||
<Dependency>golang</Dependency>
|
||||
@@ -37,7 +37,7 @@
|
||||
<Dependency>iptables</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="config">/etc</Path>
|
||||
<Path fileType="config">/etc</Path>
|
||||
<Path fileType="executable">/usr/bin/</Path>
|
||||
<Path fileType="library">/usr/lib/docker</Path>
|
||||
<Path fileType="data">/usr/share/</Path>
|
||||
@@ -54,6 +54,13 @@
|
||||
</Package>
|
||||
|
||||
<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">
|
||||
<Date>2015-10-28</Date>
|
||||
<Version>1.8.3</Version>
|
||||
|
||||
Reference in New Issue
Block a user