From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gd4j4-0000Ci-P3 for guix-patches@gnu.org; Fri, 28 Dec 2018 21:51:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gd4Sb-000785-Jw for guix-patches@gnu.org; Fri, 28 Dec 2018 21:34:48 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:42589) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gd3bf-0001ip-I8 for guix-patches@gnu.org; Fri, 28 Dec 2018 20:40:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gd3bf-0004sx-ET for guix-patches@gnu.org; Fri, 28 Dec 2018 20:40:03 -0500 Subject: [bug#33893] [PATCH v3 2/4] gnu: Add docker-engine. Resent-Message-ID: From: Danny Milosavljevic Date: Sat, 29 Dec 2018 02:39:04 +0100 Message-Id: <20181229013906.17705-3-dannym@scratchpost.org> In-Reply-To: <20181229013906.17705-1-dannym@scratchpost.org> References: <20181229013245.12853-1-dannym@scratchpost.org> <20181229013906.17705-1-dannym@scratchpost.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33893@debbugs.gnu.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)))