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

Merge pull request #4909 from ertugerata/docker-ce

Browse Source 
Docker new version (docker-ce)
This commit is contained in:
Ertuğrul Erata
2018-07-08 18:51:21 +03:00
committed by GitHub
parent da4200dc9f 9af6a87560
commit fd0b0b089d
13 changed files with 331 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/containerd/actions.py
+8 -5
View File
@@ -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())
hardware/virtualization/containerd/pspec.xml
+12 -2
View File
@@ -11,10 +11,12 @@
<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 versionFrom="1.10.3">golang</Dependency>
<Dependency>git</Dependency>
<Dependency>libseccomp-devel</Dependency>
<Dependency>btrfs-progs-devel</Dependency>
</BuildDependencies>
</Source>
@@ -22,6 +24,7 @@
<Name>containerd</Name>
<RuntimeDependencies>
<Dependency>runc</Dependency>
<Dependency>libseccomp</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -30,6 +33,13 @@
</Package>
<History>
<Update release="3">
<Date>2018-06-17</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
+26 -11
View File
@@ -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")
hardware/virtualization/docker/comar/service.py
+2 -3
View File
@@ -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():
hardware/virtualization/docker/files/docker.confd
+13 -3
View File
@@ -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=""
hardware/virtualization/docker/pspec.xml
+14 -4
View File
@@ -13,14 +13,15 @@
<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>
<Dependency versionFrom="1.10.3">golang</Dependency>
<Dependency>btrfs-progs-devel</Dependency>
<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,8 +40,10 @@
<Dependency>iproute2</Dependency>
<Dependency>iptables</Dependency>
<Dependency>libseccomp</Dependency>
<Dependency>runc</Dependency>
<Dependency>containerd</Dependency>
<Dependency>libtool-ltdl</Dependency>
<Dependency versionFrom="1.0.0_rc5">runc</Dependency>
<Dependency versionFrom="1.1.0">containerd</Dependency>
<Dependency versionFrom="0.18.0">tini</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
@@ -61,6 +64,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/libnetwork/actions.py
+37
View File
@@ -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/*")
hardware/virtualization/libnetwork/pspec.xml
+41
View File
@@ -0,0 +1,41 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pardus.org.tr/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libnetwork</Name>
<Homepage>https://github.com/docker/libnetwork</Homepage>
<Packager>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Packager>
<License>Apache-2.0</License>
<IsA>app:console</IsA>
<Summary>Docker Networking</Summary>
<Description>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.</Description>
<Archive sha1sum="a15422974a5aceb4f41cd7ced4643975a2c1d549" type="targz">https://sourceforge.net/projects/pisilinux/files/source/libnetwork-0.8.0_dbc11cc.tar.gz</Archive>
<BuildDependencies>
<Dependency versionFrom="1.10.3">golang</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>libnetwork</Name>
<RuntimeDependencies>
<Dependency>docker</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2018-06-18</Date>
<Version>0.8.0_pre1</Version>
<Comment>First release</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
</History>
</PISI>
hardware/virtualization/runc/actions.py
+19 -2
View File
@@ -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")
hardware/virtualization/runc/pspec.xml
+9 -2
View File
@@ -11,9 +11,9 @@
<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 versionFrom="1.10.3">golang</Dependency>
<Dependency>libseccomp-devel</Dependency>
</BuildDependencies>
</Source>
@@ -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>
hardware/virtualization/tini/actions.py
+30
View File
@@ -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")
hardware/virtualization/tini/files/tini-cmake-fixes.patch
+78
View File
@@ -0,0 +1,78 @@
From a8f82ea60cde15cbbd0ebcf729062de6bad9859c Mon Sep 17 00:00:00 2001
From: Thomas Orozco <thomas@orozco.fr>
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
hardware/virtualization/tini/pspec.xml
+42
View File
@@ -0,0 +1,42 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pardus.org.tr/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>tini</Name>
<Homepage>https://github.com/krallin/tini</Homepage>
<Packager>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Packager>
<License>GPLv2</License>
<IsA>app:console</IsA>
<Summary>A tiny but valid `init` for containers </Summary>
<Description>A tiny but valid `init` for containers </Description>
<Archive sha1sum="27b7529ae87ea688e21d0a061b6d9299ff9362f6" type="targz">https://github.com/krallin/tini/archive/v0.18.0.tar.gz</Archive>
<BuildDependencies>
<!--Dependency versionFrom="1.10.3">golang</Dependency-->
<Dependency>cmake</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">tini-cmake-fixes.patch</Patch>
</Patches>
</Source>
<Package>
<Name>tini</Name>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2018-06-17</Date>
<Version>0.18.0</Version>
<Comment>First release</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
</History>
</PISI>