diff --git a/hardware/virtualization/containerd/actions.py b/hardware/virtualization/containerd/actions.py
index 7ddafa5903..b603cdd1c4 100644
--- a/hardware/virtualization/containerd/actions.py
+++ b/hardware/virtualization/containerd/actions.py
@@ -16,12 +16,15 @@ def build():
shelltools.cd("%s" % get.workDIR())
shelltools.move("containerd-*", "containerd")
- shelltools.makedirs("src/github.com/docker")
- shelltools.system("ln -rsf containerd* src/github.com/docker")
-
- shelltools.cd("src/github.com/docker/containerd")
+ shelltools.cd("containerd")
+ shelltools.move("vendor", "src")
- shelltools.system("LDFLAGS= make")
+ shelltools.makedirs("src/github.com/containerd")
+ shelltools.system("ln -rsf %s/containerd* src/github.com/containerd" % get.workDIR())
+
+ shelltools.cd("src/github.com/containerd/containerd")
+
+ shelltools.system("LDFLAGS= GOPATH=%s make GIT_COMMIT=209a7fc" % get.curDIR())
def install():
shelltools.cd("%s/containerd" % get.workDIR())
diff --git a/hardware/virtualization/containerd/pspec.xml b/hardware/virtualization/containerd/pspec.xml
index 5471b1cd65..eb754b5e64 100644
--- a/hardware/virtualization/containerd/pspec.xml
+++ b/hardware/virtualization/containerd/pspec.xml
@@ -11,10 +11,12 @@
Apache-2.0
A daemon to control runC, built for performance and density.
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.
- https://github.com/docker/containerd/archive/v0.2.2.tar.gz
+ https://github.com/containerd/containerd/archive/v1.1.0.tar.gz
- golang
+ golang
git
+ libseccomp-devel
+ btrfs-progs-devel
@@ -22,6 +24,7 @@
containerd
runc
+ libseccomp
/usr/bin
@@ -30,6 +33,13 @@
+
+ 2018-06-17
+ 1.1.0
+ Version bump.
+ Ertuğrul Erata
+ ertugrulerata@gmail.com
+
2017-03-20
0.2.2
diff --git a/hardware/virtualization/docker/actions.py b/hardware/virtualization/docker/actions.py
index 2730c9c4da..e692925543 100644
--- a/hardware/virtualization/docker/actions.py
+++ b/hardware/virtualization/docker/actions.py
@@ -10,30 +10,45 @@ 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")
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.dodoc("VERSION", "LICENSE", "README.md", "AUTHORS", "CONTRIBUTING.md", "CHANGELOG.md", "NOTICE")
+ pisitools.insinto("/usr/share/doc/docker", "components/cli/contrib")
+
+ pisitools.dobin("components/engine/contrib/check-config.sh")
+ pisitools.dodoc("VERSION", "README.md","CONTRIBUTING.md", "CHANGELOG.md")
diff --git a/hardware/virtualization/docker/comar/service.py b/hardware/virtualization/docker/comar/service.py
index 882c0c1434..9be0696b08 100644
--- a/hardware/virtualization/docker/comar/service.py
+++ b/hardware/virtualization/docker/comar/service.py
@@ -14,15 +14,14 @@ 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",
- args="daemon -p %s %s" % (pidfile, config.get("DOCKER_OPTS")),
+ startService(command="/usr/bin/dockerd",
detach=True,
pidfile=pidfile,
donotify=True)
@synchronized
def stop():
- stopService(command="/usr/bin/docker",
+ stopService(command="/usr/bin/dockerd",
donotify=True)
def status():
diff --git a/hardware/virtualization/docker/files/docker.confd b/hardware/virtualization/docker/files/docker.confd
index ed14f85949..89183de46b 100644
--- a/hardware/virtualization/docker/files/docker.confd
+++ b/hardware/virtualization/docker/files/docker.confd
@@ -1,13 +1,23 @@
# /etc/conf.d/docker: config file for /etc/init.d/docker
# where the docker daemon output gets piped
-DOCKER_LOGFILE="/var/log/docker.log"
+# this contains both stdout and stderr. If you need to separate them,
+# see the settings below
+#DOCKER_LOGFILE="/var/log/docker.log"
+
+# where the docker daemon stdout gets piped
+# if this is not set, DOCKER_LOGFILE is used
+#DOCKER_OUTFILE="/var/log/docker-out.log"
+
+# where the docker daemon stderr gets piped
+# if this is not set, DOCKER_LOGFILE is used
+#DOCKER_ERRFILE="/var/log/docker-err.log"
# where docker's pid get stored
-DOCKER_PIDFILE="/var/run/docker.pid"
+#DOCKER_PIDFILE="/run/docker.pid"
# where the docker daemon itself is run from
-DOCKER_BINARY="/usr/bin/docker"
+#DOCKERD_BINARY="/usr/bin/dockerd"
# any other random options you want to pass to docker
DOCKER_OPTS=""
diff --git a/hardware/virtualization/docker/pspec.xml b/hardware/virtualization/docker/pspec.xml
index 555097bd0f..7519db58d0 100644
--- a/hardware/virtualization/docker/pspec.xml
+++ b/hardware/virtualization/docker/pspec.xml
@@ -13,14 +13,15 @@
Pack, ship and run any application as a lightweight container
An open platform for distributed applications for developers and sysadmins
- https://github.com/docker/docker/archive/v1.11.2.tar.gz
+ https://github.com/docker/docker-ce/archive/v18.05.0-ce.tar.gz
git
- golang
+ golang
btrfs-progs-devel
device-mapper-devel
sqlite-devel
libseccomp-devel
+ libtool-ltdl
@@ -39,8 +40,10 @@
iproute2
iptables
libseccomp
- runc
- containerd
+ libtool-ltdl
+ runc
+ containerd
+ tini
/etc
@@ -61,6 +64,13 @@
+
+ 2018-06-10
+ 18.05.0
+ Version bump.
+ Ertuğrul Erata
+ ertugrulerata@gmail.com
+
2017-03-20
1.11.2
diff --git a/hardware/virtualization/libnetwork/actions.py b/hardware/virtualization/libnetwork/actions.py
new file mode 100644
index 0000000000..11ad2c6afa
--- /dev/null
+++ b/hardware/virtualization/libnetwork/actions.py
@@ -0,0 +1,37 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Copyright 2018 TUBITAK/UEKAE
+# Licensed under the GNU General Public License, version 2.
+# See the file http://www.gnu.org/copyleft/gpl.txt.
+
+from pisi.actionsapi import autotools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
+from pisi.actionsapi import get
+
+# WorkDir = ""
+NoStrip = "/"
+
+def setup():
+ shelltools.move("vendor", "src")
+
+ shelltools.makedirs("src/github.com/docker")
+
+ shelltools.cd("src/github.com/docker")
+ shelltools.system("ln -rsf %s/libnetwork ./libnetwork" % get.workDIR())
+
+def build():
+ shelltools.cd("src/github.com/docker/libnetwork")
+
+ shelltools.system("GOPATH=%s/libnetwork make build-local" % get.workDIR())
+
+def install():
+ pisitools.dobin("bin/dnet")
+ pisitools.dobin("bin/docker-proxy")
+
+ pisitools.dodoc("MAINTAINERS", "LICENSE", "README*", "ROADMAP.md")
+
+ shelltools.unlinkDir("docs/vagrant-systemd")
+
+ pisitools.insinto("/usr/share/doc/libnetwork", "docs/*")
diff --git a/hardware/virtualization/libnetwork/pspec.xml b/hardware/virtualization/libnetwork/pspec.xml
new file mode 100644
index 0000000000..6c55752b61
--- /dev/null
+++ b/hardware/virtualization/libnetwork/pspec.xml
@@ -0,0 +1,41 @@
+
+
+
+
+ libnetwork
+ https://github.com/docker/libnetwork
+
+ Ertuğrul Erata
+ ertugrulerata@gmail.com
+
+ Apache-2.0
+ app:console
+ Docker Networking
+ Libnetwork provides a native Go implementation for connecting containers The goal of libnetwork is to deliver a robust Container Network Model that provides a consistent programming interface and the required network abstractions for applications.
+ https://sourceforge.net/projects/pisilinux/files/source/libnetwork-0.8.0_dbc11cc.tar.gz
+
+ golang
+
+
+
+
+ libnetwork
+
+ docker
+
+
+ /usr/bin
+ /usr/share/doc
+
+
+
+
+
+ 2018-06-18
+ 0.8.0_pre1
+ First release
+ Ertuğrul Erata
+ ertugrulerata@gmail.com
+
+
+
diff --git a/hardware/virtualization/runc/actions.py b/hardware/virtualization/runc/actions.py
index 8e852353bc..593de8ff6b 100644
--- a/hardware/virtualization/runc/actions.py
+++ b/hardware/virtualization/runc/actions.py
@@ -10,12 +10,29 @@ from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
-shelltools.export("GOPATH", "%s" % get.workDIR())
+#shelltools.export("GOPATH", "%s" % get.curDIR())
shelltools.export("DOCKER_BUILDTAGS","seccomp")
+shelltools.export("COMMIT","4fc53a8")
shelltools.export("BINDIR","/usr/bin")
+def setup():
+ shelltools.cd("%s" % get.workDIR())
+ shelltools.move("runc-*", "runc")
+
+ shelltools.cd("runc")
+ shelltools.move("vendor", "src")
+
+ shelltools.makedirs("src/github.com/opencontainers")
+ shelltools.cd("src/github.com/opencontainers")
+
+ shelltools.system("ln -rsf %s/runc ./runc" % get.workDIR())
+
def build():
- autotools.make()
+ shelltools.cd("%s/runc/src/github.com/opencontainers/runc" % get.workDIR())
+
+ build_runc = "GOPATH=%s/runc make COMMIT=4fc53a8" % get.workDIR()
+
+ shelltools.system(build_runc)
def install():
pisitools.dobin("runc")
diff --git a/hardware/virtualization/runc/pspec.xml b/hardware/virtualization/runc/pspec.xml
index c8693392f5..9aebf91a54 100644
--- a/hardware/virtualization/runc/pspec.xml
+++ b/hardware/virtualization/runc/pspec.xml
@@ -11,9 +11,9 @@
Apache-2.0
container cli tools
CLI tool for managing OCI compliant containers
- https://github.com/opencontainers/runc/archive/v0.1.1.tar.gz
+ https://github.com/opencontainers/runc/archive/v1.0.0-rc5.tar.gz
- golang
+ golang
libseccomp-devel
@@ -30,6 +30,13 @@
+
+ 2018-06-10
+ 1.0.0_rc5
+ Version bump.
+ Ertuğrul Erata
+ ertugrulerata@gmail.com
+
2017-03-20
0.1.1
diff --git a/hardware/virtualization/tini/actions.py b/hardware/virtualization/tini/actions.py
new file mode 100644
index 0000000000..82a0bba0d8
--- /dev/null
+++ b/hardware/virtualization/tini/actions.py
@@ -0,0 +1,30 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Copyright 2018 TUBITAK/UEKAE
+# Licensed under the GNU General Public License, version 2.
+# See the file http://www.gnu.org/copyleft/gpl.txt.
+
+from pisi.actionsapi import autotools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
+from pisi.actionsapi import cmaketools
+from pisi.actionsapi import get
+
+# WorkDir = ""
+# NoStrip = "/"
+
+def setup():
+ cmaketools.configure()
+
+def build():
+ cmaketools.make()
+
+def install():
+ pisitools.dobin("tini")
+ pisitools.dobin("tini-static")
+
+ # symlink docker-init (nice integration with docker)
+ pisitools.dosym("/usr/bin/tini-static", "/usr/bin/docker-init")
+
+ pisitools.dodoc("LICENSE", "README*", "VERSION")
diff --git a/hardware/virtualization/tini/files/tini-cmake-fixes.patch b/hardware/virtualization/tini/files/tini-cmake-fixes.patch
new file mode 100644
index 0000000000..dfd2a749bd
--- /dev/null
+++ b/hardware/virtualization/tini/files/tini-cmake-fixes.patch
@@ -0,0 +1,78 @@
+From a8f82ea60cde15cbbd0ebcf729062de6bad9859c Mon Sep 17 00:00:00 2001
+From: Thomas Orozco
+Date: Tue, 28 Mar 2017 21:59:07 +0200
+Subject: [PATCH] Allow setting VERSION_GIT
+
+Fixes: #79
+---
+ CMakeLists.txt | 48 +++++++++++++++++++++++++++++-------------------
+ 1 file changed, 29 insertions(+), 19 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8936f18..06c180c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,34 +6,44 @@ set (tini_VERSION_MAJOR 0)
+ set (tini_VERSION_MINOR 14)
+ set (tini_VERSION_PATCH 0)
+
++set (GIT_PREFIX " - git.")
++
+ # Build options
+ option(MINIMAL "Disable argument parsing and verbose output" OFF)
+
++# Set VERSION_GIT to INTERNAL so it does not persist across runs of CMake, just
++# like the auto-discovery would.
++set(VERSION_GIT "" CACHE INTERNAL "Override the git revision")
++
+ if(MINIMAL)
+ add_definitions(-DTINI_MINIMAL=1)
+ endif()
+
+ # Extract git version and dirty-ness
+-execute_process (
+- COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" log -n 1 --date=local --pretty=format:%h
+- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
+- RESULT_VARIABLE git_version_check_ret
+- OUTPUT_VARIABLE tini_VERSION_GIT
+-)
+-
+-execute_process(
+- COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" status --porcelain --untracked-files=no
+- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
+- OUTPUT_VARIABLE git_dirty_check_out
+-)
+-
+-if("${git_version_check_ret}" EQUAL 0)
+- set(tini_VERSION_GIT " - git.${tini_VERSION_GIT}")
+- if(NOT "${git_dirty_check_out}" STREQUAL "")
+- set(tini_VERSION_GIT "${tini_VERSION_GIT}-dirty")
+- endif()
++if(VERSION_GIT)
++ set(tini_VERSION_GIT "${GIT_PREFIX}${VERSION_GIT}")
+ else()
+- set(tini_VERSION_GIT "")
++ execute_process (
++ COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" log -n 1 --date=local --pretty=format:%h
++ WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
++ RESULT_VARIABLE git_version_check_ret
++ OUTPUT_VARIABLE tini_VERSION_GIT
++ )
++
++ execute_process(
++ COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" status --porcelain --untracked-files=no
++ WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
++ OUTPUT_VARIABLE git_dirty_check_out
++ )
++
++ if("${git_version_check_ret}" EQUAL 0)
++ set(tini_VERSION_GIT "${GIT_PREFIX}${tini_VERSION_GIT}")
++ if(NOT "${git_dirty_check_out}" STREQUAL "")
++ set(tini_VERSION_GIT "${tini_VERSION_GIT}-dirty")
++ endif()
++ else()
++ set(tini_VERSION_GIT "")
++ endif()
+ endif()
+
+ # Flags
diff --git a/hardware/virtualization/tini/pspec.xml b/hardware/virtualization/tini/pspec.xml
new file mode 100644
index 0000000000..3c77b36f51
--- /dev/null
+++ b/hardware/virtualization/tini/pspec.xml
@@ -0,0 +1,42 @@
+
+
+
+
+ tini
+ https://github.com/krallin/tini
+
+ Ertuğrul Erata
+ ertugrulerata@gmail.com
+
+ GPLv2
+ app:console
+ A tiny but valid `init` for containers
+ A tiny but valid `init` for containers
+ https://github.com/krallin/tini/archive/v0.18.0.tar.gz
+
+
+ cmake
+
+
+ tini-cmake-fixes.patch
+
+
+
+
+ tini
+
+ /usr/bin
+ /usr/share/doc
+
+
+
+
+
+ 2018-06-17
+ 0.18.0
+ First release
+ Ertuğrul Erata
+ ertugrulerata@gmail.com
+
+
+