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

last fixes

Browse Source
This commit is contained in:
Ertuğrul Erata
2016-07-12 23:08:45 +03:00
parent 2b81cc9c50
commit b6684affbe
4 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/containerd/actions.py
+5
View File
@@ -26,4 +26,9 @@ def build():
def install(): def install():
pisitools.dobin("bin/*") pisitools.dobin("bin/*")
# symlink containerd/run (nice integration with docker)
pisitools.dosym("/usr/bin/containerd" "/usr/bin/docker-containerd")
pisitools.dosym("/usr/bin/containerd-shim", "/usr/bin/docker-containerd-shim")
pisitools.dosym("/usr/bin/ctr", "/usr/bin/docker-containerd-ctr")
pisitools.dodoc("MAINTAINERS", "README*") pisitools.dodoc("MAINTAINERS", "README*")
hardware/virtualization/docker/actions.py
+7 -8
View File
@@ -10,25 +10,24 @@ 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", "20f81dd") shelltools.export("DOCKER_GITCOMMIT", "b9f10c9")
shelltools.export("GOROOT","/usr/lib/go") shelltools.export("GOROOT","/usr/lib/go")
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")
shelltools.export("CGO_LDFLAGS", "-L/usr/lib") shelltools.export("CGO_LDFLAGS", "-L/usr/lib")
shelltools.export("DOCKER_BUILDTAGS","exclude_graphdriver_aufs") shelltools.export("DOCKER_BUILDTAGS","seccomp")
shelltools.export("DOCKER_INITPATH", "/usr/lib/docker/dockerinit") #shelltools.export("DOCKER_INITPATH", "/usr/lib/docker/dockerinit")
NoStrip=["/"] NoStrip=["/"]
def build(): def build():
shelltools.system("./hack/make.sh dynbinary") #shelltools.cd("docker")
shelltools.system("hack/make.sh dynbinary")
def install(): def install():
pisitools.dobin("bundles/1.10.3/dynbinary/docker") pisitools.dobin("bundles/1.11.2/dynbinary/docker")
pisitools.dobin("bundles/1.10.3/dynbinary/docker-1.10.3") pisitools.dobin("bundles/1.11.2/dynbinary/docker-1.11.2")
pisitools.doexe("bundles/1.10.3/dynbinary/dockerinit", "/usr/lib/docker")
pisitools.doexe("bundles/1.10.3/dynbinary/dockerinit-1.10.3", "/usr/lib/docker")
# insert udev rules # insert udev rules
pisitools.insinto("/lib/udev/rules.d", "contrib/udev/*.rules") pisitools.insinto("/lib/udev/rules.d", "contrib/udev/*.rules")
hardware/virtualization/docker/pspec.xml
+15 -2
View File
@@ -13,13 +13,16 @@
<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="b7ef450c17df31d48bbfd9198b8eeb2dda4e97d1" type="targz">https://github.com/docker/docker/archive/v1.10.3.tar.gz</Archive> <Archive sha1sum="3725a90651a4eabb4784fc252f3090af53a91339" type="targz">https://github.com/docker/docker/archive/v1.11.2.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>git</Dependency> <Dependency>git</Dependency>
<Dependency versionFrom="1.4.3">golang</Dependency> <Dependency versionFrom="1.6.2">golang</Dependency>
<Dependency>btrfs-progs-devel</Dependency> <Dependency>btrfs-progs-devel</Dependency>
<Dependency>device-mapper-devel</Dependency> <Dependency>device-mapper-devel</Dependency>
<Dependency>sqlite-devel</Dependency> <Dependency>sqlite-devel</Dependency>
<Dependency>libseccomp-devel</Dependency>
<!--Dependency>runc</Dependency>
<Dependency>containerd</Dependency-->
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
</Patches> </Patches>
@@ -35,6 +38,9 @@
<Dependency>bridge-utils</Dependency> <Dependency>bridge-utils</Dependency>
<Dependency>iproute2</Dependency> <Dependency>iproute2</Dependency>
<Dependency>iptables</Dependency> <Dependency>iptables</Dependency>
<Dependency>libseccomp</Dependency>
<Dependency>runc</Dependency>
<Dependency>containerd</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="config">/etc</Path> <Path fileType="config">/etc</Path>
@@ -55,6 +61,13 @@
</Package> </Package>
<History> <History>
<Update release="4">
<Date>2016-07-11</Date>
<Version>1.11.2</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="3"> <Update release="3">
<Date>2016-06-28</Date> <Date>2016-06-28</Date>
<Version>1.10.3</Version> <Version>1.10.3</Version>
hardware/virtualization/runc/actions.py
+3 -1
View File
@@ -20,8 +20,10 @@ def build():
def install(): def install():
pisitools.dobin("runc") pisitools.dobin("runc")
# symlink containerd/run (nice integration with docker)
pisitools.dosym("/usr/bin/runc" "/usr/bin/docker-runc")
#insert completions in doc #insert completions in doc
pisitools.insinto("/usr/share/doc/runc", "contrib") pisitools.insinto("/usr/share/doc/runc", "contrib")
pisitools.dodoc("MAINTAINERS", "VERSION", "README*") pisitools.dodoc("MAINTAINERS", "VERSION", "README*")