From: Danny Milosavljevic <dannym@scratchpost.org>
To: 33893@debbugs.gnu.org
Subject: [bug#33893] [PATCH v2 2/3] gnu: Add docker-engine.
Date: Sat, 29 Dec 2018 02:32:44 +0100 [thread overview]
Message-ID: <20181229013245.12853-3-dannym@scratchpost.org> (raw)
In-Reply-To: <20181229013245.12853-1-dannym@scratchpost.org>
* gnu/packages/docker.scm (docker-engine): New variable.
(%docker-version): New variable.
---
gnu/packages/docker.scm | 152 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 151 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index f4e676a9f..3ca2fadfd 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -23,15 +23,20 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system python)
#:use-module (guix utils)
#:use-module (gnu packages check)
+ #:use-module (gnu packages compression)
#:use-module (gnu packages golang)
#:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
- #:use-module (gnu packages python-web))
+ #:use-module (gnu packages python-web)
+ #:use-module (gnu packages virtualization))
+
+(define %docker-version "18.09.0")
(define-public python-docker-py
(package
@@ -191,3 +196,148 @@ It includes image transfer and storage, container execution and supervision,
network attachments.")
(home-page "http://containerd.io/")
(license license:asl2.0)))
+
+(define-public docker-engine
+ (package
+ (name "docker-engine")
+ (version %docker-version)
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/docker/engine.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1liqbx58grqih6m8hz9y20y5waflv19pv15l3wl64skap2bsn21c"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:modules
+ ((guix build gnu-build-system)
+ ((guix build go-build-system) #:prefix go:)
+ (guix build utils))
+ #:imported-modules
+ (,@%gnu-build-system-modules
+ (guix build go-build-system))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;(substitute* "vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go"
+ ; (("") ""))
+ (substitute* "builder/builder-next/executor_unix.go"
+ (("CommandCandidates:.*runc.*")
+ (string-append "CommandCandidates: []string{\""
+ (assoc-ref inputs "runc")
+ "/sbin/runc\"},\n")))
+ (substitute* "vendor/github.com/containerd/go-runc/runc.go"
+ (("DefaultCommand = .*")
+ (string-append "DefaultCommand = \""
+ (assoc-ref inputs "runc")
+ "/sbin/runc\"\n")))
+ (substitute* "daemon/daemon_unix.go"
+ (("DefaultShimBinary = .*")
+ (string-append "DefaultShimBinary = \""
+ (assoc-ref inputs "containerd")
+ "/bin/containerd-shim\"\n"))
+ (("DefaultRuntimeBinary = .*")
+ (string-append "DefaultRuntimeBinary = \""
+ (assoc-ref inputs "runc")
+ "/sbin/runc\"\n")))
+ (substitute* "vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go"
+ (("var defaultCommandCandidates = .*")
+ (string-append "var defaultCommandCandidates = []string{\""
+ (assoc-ref inputs "runc") "/sbin/runc\"}")))
+ (substitute* (filter (lambda (name)
+ (not (string-contains name "test")))
+ (find-files "\\.go$"))
+ (("\"ps\"")
+ (string-append "\"" (assoc-ref inputs "procps") "/bin/ps\""))
+ ; TODO: zfs ?
+;getPlatformContainerdDaemonOpts ./cmd/dockerd/daemon_unix.go
+; TODO --init-path for docker-init
+; ./cmd/dockerd/config_unix.go InitPath
+;./daemon/config/config.go DefaultInitBinary
+ (("exec\\.LookPath\\(\"mkfs\\.xfs\"\\)")
+ (string-append "\"" (assoc-ref inputs "xfsprogs")
+ "/bin/mkfs.xfs\""))
+ (("exec\\.LookPath\\(\"lvmdiskscan\"\\)")
+ (string-append "\"" (assoc-ref inputs "lvm2")
+ "/sbin/lvmdiskscan\""))
+ (("exec\\.LookPath\\(\"pvdisplay\"\\)")
+ (string-append "\"" (assoc-ref inputs "lvm2")
+ "/sbin/pvdisplay\""))
+ (("exec\\.LookPath\\(\"blkid\"\\)")
+ (string-append "\"" (assoc-ref inputs "util-linux")
+ "/sbin/blkid\""))
+ (("exec\\.LookPath\\(\"unpigz\"\\)")
+ (string-append "\"" (assoc-ref inputs "pigz")
+ "/bin/unpigz\""))
+ (("exec\\.LookPath\\(\"iptables\"\\)")
+ (string-append "\"" (assoc-ref inputs "iptables")
+ "/sbin/iptables\""))
+ (("exec\\.LookPath\\(\"ip\"\\)")
+ (string-append "\"" (assoc-ref inputs "iproute2")
+ "/sbin/ip\""))
+ ;(("LookPath") "Guix_doesnt_want_LookPath")
+ )
+ #t))
+ (replace 'configure
+ (lambda _
+ (setenv "DOCKER_GITCOMMIT" (string-append "v" ,%docker-version))
+ (setenv "AUTO_GOPATH" "1")
+ ;; Respectively, strip the symbol table and debug
+ ;; information, and the DWARF symbol table.
+ (setenv "LDFLAGS" "-s -w")
+ ;; Our LD doesn't like the statically linked relocatable things
+ ;; that go produces, so install the dynamic version of
+ ;; dockerd instead.
+ ;(substitute* "hack/make/install-binary"
+ ; (("/binary-daemon") "/dynbinary-daemon"))
+ #t))
+ (add-before 'build 'setup-environment
+ (assoc-ref go:%standard-phases 'setup-environment))
+ (replace 'build
+ (lambda _
+ ;(invoke "hack/make.sh" "binary")
+ ; FIXME: bash -c 'hack/validate/default && hack/make.sh'
+ (invoke "hack/make.sh" "dynbinary")))
+ (replace 'check
+ (lambda _
+ ; FIXME: Those don't find any of the go packages
+ ; needed. Probably GOPATH/GOROOT related.
+ ;(invoke "hack/test/unit")
+ #t))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (out-bin (string-append out "/bin")))
+ (install-file "bundles/dynbinary-daemon/dockerd" out-bin)
+ (install-file "bundles/dynbinary-daemon/dockerd-dev" out-bin))
+ ;(setenv "DOCKER_MAKE_INSTALL_PREFIX" (assoc-ref outputs "out"))
+ ; TODO: KEEPBUNDLE=1
+ ;./source/bundles/dynbinary-daemon/dockerd
+ ;(invoke "hack/make.sh" "install-binary")
+ #t)))))
+ (inputs
+ `(("btrfs-progs" ,btrfs-progs)
+ ("containerd" ,containerd) ; for containerd-shim
+ ("runc" ,runc)
+ ("iproute2" ,iproute)
+ ("iptables" ,iptables)
+ ("pigz" ,pigz)
+ ("procps" ,procps)
+ ("util-linux" ,util-linux)
+ ("lvm2" ,lvm2)))
+ (native-inputs
+ `(("eudev" ,eudev) ; TODO: Should be propagated by lvm2 (.pc -> .pc)
+ ("go" ,go)
+ ("pkg-config" ,pkg-config)))
+ (synopsis "Docker container component library")
+ (description "This package provides a framework to assemble specialized
+container systems. It includes components for orchestration, image
+management, secret management, configuration management, networking,
+provisioning etc.")
+ (home-page "https://mobyproject.org/")
+ (license license:asl2.0)))
next prev parent reply other threads:[~2018-12-29 1:35 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-28 10:13 [bug#33893] [PATCH 0/2] Add docker Danny Milosavljevic
2018-12-28 10:17 ` [bug#33893] [PATCH 1/2] gnu: Add docker-engine Danny Milosavljevic
2018-12-28 10:17 ` [bug#33893] [PATCH 2/2] gnu: Add docker-cli Danny Milosavljevic
2018-12-29 1:32 ` [bug#33893] [PATCH v2 0/3] Add docker Danny Milosavljevic
2018-12-29 1:32 ` [bug#33893] [PATCH v2 1/3] gnu: Add containerd Danny Milosavljevic
2018-12-29 1:32 ` Danny Milosavljevic [this message]
2018-12-29 1:32 ` [bug#33893] [PATCH v2 3/3] services: Add docker Danny Milosavljevic
2018-12-29 1:39 ` [bug#33893] [PATCH v3 0/4] " Danny Milosavljevic
2018-12-29 1:39 ` [bug#33893] [PATCH v3 1/4] gnu: Add containerd Danny Milosavljevic
2018-12-29 1:39 ` [bug#33893] [PATCH v3 2/4] gnu: Add docker-engine Danny Milosavljevic
2018-12-29 1:39 ` [bug#33893] [PATCH v3 3/4] services: Add docker Danny Milosavljevic
2018-12-30 9:50 ` Danny Milosavljevic
2018-12-29 1:39 ` [bug#33893] [PATCH v3 4/4] gnu: Add docker-cli Danny Milosavljevic
2018-12-30 12:17 ` [bug#33893] [PATCH v4 0/4] Add docker Danny Milosavljevic
2018-12-30 12:17 ` [bug#33893] [PATCH v4 1/4] gnu: Add containerd Danny Milosavljevic
2018-12-30 12:17 ` [bug#33893] [PATCH v4 2/4] gnu: Add docker-engine Danny Milosavljevic
2018-12-30 12:17 ` [bug#33893] [PATCH v4 3/4] services: Add docker Danny Milosavljevic
2018-12-30 12:17 ` [bug#33893] [PATCH v4 4/4] gnu: Add docker-cli Danny Milosavljevic
2018-12-30 23:38 ` [bug#33893] [PATCH v5 0/4] Add docker Danny Milosavljevic
2018-12-30 23:39 ` [bug#33893] [PATCH v5 1/4] gnu: Add containerd Danny Milosavljevic
2019-01-06 20:14 ` Ludovic Courtès
2018-12-30 23:39 ` [bug#33893] [PATCH v5 2/4] gnu: Add docker-engine Danny Milosavljevic
2019-01-06 20:20 ` Ludovic Courtès
2019-01-07 18:44 ` Danny Milosavljevic
2019-01-08 8:42 ` Ludovic Courtès
2019-01-10 2:22 ` Danny Milosavljevic
2019-01-10 8:50 ` bug#33893: " Ludovic Courtès
2019-01-10 13:15 ` [bug#33893] " Danny Milosavljevic
2019-01-10 20:31 ` Leo Famulari
2018-12-30 23:39 ` [bug#33893] [PATCH v5 3/4] services: Add docker Danny Milosavljevic
2019-01-06 20:31 ` Ludovic Courtès
2018-12-30 23:39 ` [bug#33893] [PATCH v5 4/4] gnu: Add docker-cli Danny Milosavljevic
2019-01-06 20:33 ` Ludovic Courtès
2019-01-14 3:20 ` Meiyo Peng
2019-01-15 12:34 ` Danny Milosavljevic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181229013245.12853-3-dannym@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=33893@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).