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

runc and containerd not ready

Browse Source
This commit is contained in:
Ertuğrul Erata
2018-06-10 17:22:32 +03:00
parent 809d2cd207
commit a72b4fbc76
5 changed files with 57 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/containerd/pspec.xml
+8 -1
View File
@@ -11,7 +11,7 @@
<License>Apache-2.0</License>
<Summary>A daemon to control runC, built for performance and density.</Summary>
<Description>is a daemon with an API and a command line client, to manage containers on one machine. It uses runC to run containers according to the OCI specification.</Description>
<Archive sha1sum="db3ec28d045109952e0615f5a3bea39816dfac17" type="targz">https://github.com/docker/containerd/archive/v0.2.2.tar.gz</Archive>
<Archive sha1sum="4e976a4365c44a30f89aeae4d31b00eca914bfb5" type="targz">https://github.com/containerd/containerd/archive/v1.1.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>golang</Dependency>
<Dependency>git</Dependency>
@@ -30,6 +30,13 @@
</Package>
<History>
<Update release="3">
<Date>2018-06-10</Date>
<Version>1.1.0</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="2">
<Date>2017-03-20</Date>
<Version>0.2.2</Version>
hardware/virtualization/docker/actions.py
+29 -10
View File
@@ -10,30 +10,49 @@ from pisi.actionsapi import shelltools
from pisi.actionsapi import get
shelltools.export("AUTO_GOPATH", "1")
shelltools.export("DOCKER_GITCOMMIT", "b9f10c9")
shelltools.export("DOCKER_GITCOMMIT","f150324")
shelltools.export("IAMSTATIC", "false")
shelltools.export("VERSION", "18.05.0")
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_LDFLAGS", "-L/usr/lib")
shelltools.export("DOCKER_BUILDTAGS","seccomp")
#shelltools.export("DOCKER_INITPATH", "/usr/lib/docker/dockerinit")
shelltools.export("GOWORK","src/github.com/docker")
NoStrip=["/"]
def setup():
shelltools.makedirs("components/cli/src/github.com/docker")
shelltools.cd("components/cli/src/github.com/docker")
shelltools.system("ln -s ../../../../cli . ")
def build():
#shelltools.cd("docker")
shelltools.system("hack/make.sh dynbinary")
shelltools.cd("%s" % get.workDIR())
shelltools.cd("docker-ce-%s-ce/components/engine" % get.srcVERSION())
shelltools.system("hack/make.sh dynbinary-daemon")
# build cli
shelltools.cd("%s" % get.workDIR())
shelltools.cd("docker-ce-%s-ce/components/cli" % get.srcVERSION())
shelltools.system("LDFLAGS='' GOPATH=%s/docker-ce-%s-ce/components/cli ./scripts/build/dynbinary" % (get.workDIR(), get.srcVERSION()))
def install():
pisitools.dobin("bundles/1.11.2/dynbinary/docker")
pisitools.dobin("bundles/1.11.2/dynbinary/docker-1.11.2")
shelltools.cd("%s/docker-ce-%s-ce" % (get.workDIR(), get.srcVERSION()))
pisitools.dobin("components/cli/build/docker*")
pisitools.dobin("components/engine/bundles/dynbinary-daemon/*")
# insert udev rules
pisitools.insinto("/lib/udev/rules.d", "contrib/udev/*.rules")
pisitools.insinto("/lib/udev/rules.d", "components/engine/contrib/udev/*.rules")
#insert contrib in docs
pisitools.insinto("/usr/share/doc/docker", "contrib")
pisitools.insinto("/usr/share/doc/docker", "components/cli/contrib")
pisitools.dobin("components/engine/contrib/check-config.sh")
pisitools.dodoc("VERSION", "LICENSE", "README.md", "AUTHORS", "CONTRIBUTING.md", "CHANGELOG.md", "NOTICE")
pisitools.dodoc("VERSION", "README.md","CONTRIBUTING.md", "CHANGELOG.md")
hardware/virtualization/docker/comar/service.py
+2 -2
View File
@@ -14,7 +14,7 @@ def start():
os.environ["PATH"] = "/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/sbin:/usr/local/bin"
os.system("/sbin/modprobe -va bridge nf_nat br_netfilter")
startService(command="/usr/bin/docker",
startService(command="/usr/bin/dockerd",
args="daemon -p %s %s" % (pidfile, config.get("DOCKER_OPTS")),
detach=True,
pidfile=pidfile,
@@ -22,7 +22,7 @@ def start():
@synchronized
def stop():
stopService(command="/usr/bin/docker",
stopService(command="/usr/bin/dockerd",
donotify=True)
def status():
hardware/virtualization/docker/pspec.xml
+10 -1
View File
@@ -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="3725a90651a4eabb4784fc252f3090af53a91339" type="targz">https://github.com/docker/docker/archive/v1.11.2.tar.gz</Archive>
<Archive sha1sum="089556da40a9438d963cca9bf8ddfc6800d5c619" type="targz">https://github.com/docker/docker-ce/archive/v18.05.0-ce.tar.gz</Archive>
<BuildDependencies>
<Dependency>git</Dependency>
<Dependency versionFrom="1.6.2">golang</Dependency>
@@ -21,6 +21,7 @@
<Dependency>device-mapper-devel</Dependency>
<Dependency>sqlite-devel</Dependency>
<Dependency>libseccomp-devel</Dependency>
<Dependency>libtool-ltdl</Dependency>
<!--Dependency>runc</Dependency>
<Dependency>containerd</Dependency-->
</BuildDependencies>
@@ -39,6 +40,7 @@
<Dependency>iproute2</Dependency>
<Dependency>iptables</Dependency>
<Dependency>libseccomp</Dependency>
<Dependency>libtool-ltdl</Dependency>
<Dependency>runc</Dependency>
<Dependency>containerd</Dependency>
</RuntimeDependencies>
@@ -61,6 +63,13 @@
</Package>
<History>
<Update release="7">
<Date>2018-06-10</Date>
<Version>18.05.0</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="6">
<Date>2017-03-20</Date>
<Version>1.11.2</Version>
hardware/virtualization/runc/pspec.xml
+8 -1
View File
@@ -11,7 +11,7 @@
<License>Apache-2.0</License>
<Summary>container cli tools</Summary>
<Description>CLI tool for managing OCI compliant containers</Description>
<Archive sha1sum="ca70c97c9211462f774e22f03fec2fe61f45f1ba" type="targz">https://github.com/opencontainers/runc/archive/v0.1.1.tar.gz</Archive>
<Archive sha1sum="dcc87b404034fff66f9d4c4e2983f3483157ad71" type="targz">https://github.com/opencontainers/runc/archive/v1.0.0-rc5.tar.gz</Archive>
<BuildDependencies>
<Dependency>golang</Dependency>
<Dependency>libseccomp-devel</Dependency>
@@ -30,6 +30,13 @@
</Package>
<History>
<Update release="3">
<Date>2018-06-10</Date>
<Version>1.0.0_rc5</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="2">
<Date>2017-03-20</Date>
<Version>0.1.1</Version>