From patchwork Sun Dec 30 23:39:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 613 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1B5CE169DD; Sun, 30 Dec 2018 23:40:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id 42E9C169DC for ; Sun, 30 Dec 2018 23:40:09 +0000 (GMT) Received: from localhost ([127.0.0.1]:47175 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdkgi-0003XS-HM for patchwork@mira.cbaines.net; Sun, 30 Dec 2018 18:40:08 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38217) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdkgf-0003Wv-Qo for guix-patches@gnu.org; Sun, 30 Dec 2018 18:40:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gdkgc-0003so-Rx for guix-patches@gnu.org; Sun, 30 Dec 2018 18:40:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:42711) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gdkgc-0003sk-Oj for guix-patches@gnu.org; Sun, 30 Dec 2018 18:40:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gdkgc-0003MB-LJ for guix-patches@gnu.org; Sun, 30 Dec 2018 18:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33893] [PATCH v5 1/4] gnu: Add containerd. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Dec 2018 23:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33893 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33893@debbugs.gnu.org Received: via spool by 33893-submit@debbugs.gnu.org id=B33893.154621315312800 (code B ref 33893); Sun, 30 Dec 2018 23:40:02 +0000 Received: (at 33893) by debbugs.gnu.org; 30 Dec 2018 23:39:13 +0000 Received: from localhost ([127.0.0.1]:42702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdkfp-0003KN-Hx for submit@debbugs.gnu.org; Sun, 30 Dec 2018 18:39:13 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:53256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdkfl-0003Jp-Fi for 33893@debbugs.gnu.org; Sun, 30 Dec 2018 18:39:10 -0500 Received: from dayas.3.home (77.116.200.150.wireless.dyn.drei.com [77.116.200.150]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 8019533601DE; Mon, 31 Dec 2018 00:39:08 +0100 (CET) From: Danny Milosavljevic Date: Mon, 31 Dec 2018 00:39:00 +0100 Message-Id: <20181230233903.23426-2-dannym@scratchpost.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181230233903.23426-1-dannym@scratchpost.org> References: <20181230121754.775-1-dannym@scratchpost.org> <20181230233903.23426-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docker.scm (containerd): New variable. --- gnu/packages/docker.scm | 68 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index c58f3f3ca..877800042 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -23,9 +23,13 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #: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 golang) + #:use-module (gnu packages linux) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-web)) @@ -142,3 +146,67 @@ created and all the services are started as specified in the configuration.") store API. It allows programmers to interact with a Docker registry using Python without keeping their credentials in a Docker configuration file.") (license license:asl2.0))) + +(define-public containerd + (package + (name "containerd") + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containerd/containerd.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16zn6p1ky3yrgn53z8h9wza53ch91fj47wj5xgz6w4c57j30f66p")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/containerd/containerd" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'chdir + (lambda _ + (chdir "src/github.com/containerd/containerd") + #t)) + (add-after 'chdir 'patch-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; TODO: Patch "socat", "unpigz". + (substitute* "./runtime/v1/linux/runtime.go" + (("defaultRuntime[ \t]*=.*") + (string-append "defaultRuntime = \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n")) + (("defaultShim[ \t]*=.*") + (string-append "defaultShim = \"" + (assoc-ref outputs "out") + "/bin/containerd-shim\"\n"))) + (substitute* "./vendor/github.com/containerd/go-runc/runc.go" + (("DefaultCommand[ \t]*=.*") + (string-append "DefaultCommand = \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n"))) + #t)) + (replace 'build + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply invoke "make" make-flags))) + (replace 'install + (lambda* (#:key outputs (make-flags '()) #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (apply invoke "make" (string-append "DESTDIR=" out) "install" + make-flags))))))) + (inputs + `(("btrfs-progs" ,btrfs-progs) + ("libseccomp" ,libseccomp) + ("runc" ,runc))) + (native-inputs + `(("go" ,go) + ("pkg-config" ,pkg-config))) + (synopsis "Container runtime") + (description "This package provides the container daemon for Docker. +It includes image transfer and storage, container execution and supervision, +network attachments.") + (home-page "http://containerd.io/") + (license license:asl2.0))) From patchwork Sun Dec 30 23:39:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 615 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 990FF169DD; Sun, 30 Dec 2018 23:40:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id E3942169DA for ; Sun, 30 Dec 2018 23:40:25 +0000 (GMT) Received: from localhost ([127.0.0.1]:47184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdkgz-0003kI-Gi for patchwork@mira.cbaines.net; Sun, 30 Dec 2018 18:40:25 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38212) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdkgf-0003Wr-Py for guix-patches@gnu.org; Sun, 30 Dec 2018 18:40:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gdkgd-0003t1-DC for guix-patches@gnu.org; Sun, 30 Dec 2018 18:40:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:58352) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gdkgd-0003sx-9j for guix-patches@gnu.org; Sun, 30 Dec 2018 18:40:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gdkgd-0003MI-5L for guix-patches@gnu.org; Sun, 30 Dec 2018 18:40:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33893] [PATCH v5 2/4] gnu: Add docker-engine. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Dec 2018 23:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33893 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33893@debbugs.gnu.org Received: via spool by 33893-submit@debbugs.gnu.org id=B33893.154621315412815 (code B ref 33893); Sun, 30 Dec 2018 23:40:03 +0000 Received: (at 33893) by debbugs.gnu.org; 30 Dec 2018 23:39:14 +0000 Received: from localhost ([127.0.0.1]:42705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdkfp-0003KP-SN for submit@debbugs.gnu.org; Sun, 30 Dec 2018 18:39:14 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:53266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdkfn-0003K4-Ec for 33893@debbugs.gnu.org; Sun, 30 Dec 2018 18:39:12 -0500 Received: from dayas.3.home (77.116.200.150.wireless.dyn.drei.com [77.116.200.150]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 4EFAC3360EEB; Mon, 31 Dec 2018 00:39:10 +0100 (CET) From: Danny Milosavljevic Date: Mon, 31 Dec 2018 00:39:01 +0100 Message-Id: <20181230233903.23426-3-dannym@scratchpost.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181230233903.23426-1-dannym@scratchpost.org> References: <20181230121754.775-1-dannym@scratchpost.org> <20181230233903.23426-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docker.scm (docker-engine): New variable. (%docker-version): New variable. --- gnu/packages/docker.scm | 168 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 167 insertions(+), 1 deletion(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 877800042..a3510529a 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 @@ -210,3 +215,164 @@ 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* "vendor/github.com/containerd/containerd/runtime/v1/linux/runtime.go" + (("defaultRuntime[ \t]*=.*") + (string-append "defaultRuntime = \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n")) + (("defaultShim[ \t]*=.*") + (string-append "defaultShim = \"" + (assoc-ref inputs "containerd") + "/bin/containerd-shim\"\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")) + (("DefaultRuntimeName = .*") + (string-append "DefaultRuntimeName = \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n"))) + (substitute* "daemon/config/config.go" + (("StockRuntimeName = .*") + (string-append "StockRuntimeName = \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n"))) + ; TODO DefaultInitBinary + + (substitute* "vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go" + (("var defaultCommandCandidates = .*") + (string-append "var defaultCommandCandidates = []string{\"" + (assoc-ref inputs "runc") "/sbin/runc\"}"))) + (let ((source-files (filter (lambda (name) + (not (string-contains name "test"))) + (find-files "." "\\.go$")))) + (let-syntax ((substitute-LookPath + (lambda (x) + (syntax-case x () + ((substitute-LookPath source-text package + relative-path) + #`(substitute* source-files + ((#,(string-append "exec\\.LookPath\\(\"" + (syntax->datum + #'source-text) + "\")")) + (string-append "\"" + (assoc-ref inputs package) + relative-path + "\", error(nil)")))))))) + (substitute-LookPath "ps" "procps" "/bin/ps") + (substitute-LookPath "mkfs.xfs" "xfsprogs" "/bin/mkfs.xfs") + (substitute-LookPath "lvmdiskscan" "lvm2" "/sbin/lvmdiskscan") + (substitute-LookPath "pvdisplay" "lvm2" "/sbin/pvdisplay") + (substitute-LookPath "blkid" "util-linux" "/sbin/blkid") + (substitute-LookPath "unpigz" "pigz" "/bin/unpigz") + (substitute-LookPath "iptables" "iptables" "/sbin/iptables") + (substitute-LookPath "ip" "iproute2" "/sbin/ip") + ; TODO: zfs ? +; TODO: getPlatformContainerdDaemonOpts ./cmd/dockerd/daemon_unix.go +; TODO: --init-path for docker-init [./cmd/dockerd/config_unix.go InitPath]; + ;(("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") + #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' + ;; Our LD doesn't like the statically linked relocatable things + ;; that go produces, so install the dynamic version of + ;; dockerd instead. + (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) + ("xfsprogs" ,xfsprogs))) + (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))) From patchwork Sun Dec 30 23:39:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 616 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 342AC169DD; Sun, 30 Dec 2018 23:40:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id AAA46169DA for ; Sun, 30 Dec 2018 23:40:28 +0000 (GMT) Received: from localhost ([127.0.0.1]:47188 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdkh2-0003s8-92 for patchwork@mira.cbaines.net; Sun, 30 Dec 2018 18:40:28 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdkgf-0003Wt-Qf for guix-patches@gnu.org; Sun, 30 Dec 2018 18:40:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gdkgd-0003tI-UU for guix-patches@gnu.org; Sun, 30 Dec 2018 18:40:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:60999) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gdkgd-0003tC-R3 for guix-patches@gnu.org; Sun, 30 Dec 2018 18:40:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gdkgd-0003MQ-NX for guix-patches@gnu.org; Sun, 30 Dec 2018 18:40:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33893] [PATCH v5 3/4] services: Add docker. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Dec 2018 23:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33893 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33893@debbugs.gnu.org Received: via spool by 33893-submit@debbugs.gnu.org id=B33893.154621315512821 (code B ref 33893); Sun, 30 Dec 2018 23:40:03 +0000 Received: (at 33893) by debbugs.gnu.org; 30 Dec 2018 23:39:15 +0000 Received: from localhost ([127.0.0.1]:42707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdkfq-0003Ke-Fu for submit@debbugs.gnu.org; Sun, 30 Dec 2018 18:39:14 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:53274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdkfo-0003KD-Kk for 33893@debbugs.gnu.org; Sun, 30 Dec 2018 18:39:13 -0500 Received: from dayas.3.home (77.116.200.150.wireless.dyn.drei.com [77.116.200.150]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 9603433601DE; Mon, 31 Dec 2018 00:39:11 +0100 (CET) From: Danny Milosavljevic Date: Mon, 31 Dec 2018 00:39:02 +0100 Message-Id: <20181230233903.23426-4-dannym@scratchpost.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181230233903.23426-1-dannym@scratchpost.org> References: <20181230121754.775-1-dannym@scratchpost.org> <20181230233903.23426-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/docker.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * doc/guix.texi (Miscellaneous Services): Document the service. --- doc/guix.texi | 10 +++++ gnu/local.mk | 1 + gnu/services/docker.scm | 93 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100644 gnu/services/docker.scm diff --git a/doc/guix.texi b/doc/guix.texi index fcb5b8c08..b129b1bd1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -22115,6 +22115,16 @@ The following is an example @code{dicod-service} configuration. %dicod-database:gcide)))) @end example +@cindex docker +@subsubheading Docker Service + +The @code{(gnu services docker)} module provides the following service. + +@defvr {Scheme Variable} docker-service-type + +This is a service that runs @url{http://www.docker.com,Docker}, a daemon that +provides container functionality. + @node Setuid Programs @subsection Setuid Programs diff --git a/gnu/local.mk b/gnu/local.mk index 925d955a6..f6c91dcc7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -482,6 +482,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/desktop.scm \ %D%/services/dict.scm \ %D%/services/dns.scm \ + %D%/services/docker.scm \ %D%/services/authentication.scm \ %D%/services/games.scm \ %D%/services/kerberos.scm \ diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm new file mode 100644 index 000000000..19d7e598f --- /dev/null +++ b/gnu/services/docker.scm @@ -0,0 +1,93 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Danny Milosavljevic +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu services docker) + #:use-module (gnu services) + #:use-module (gnu services configuration) + #:use-module (gnu services base) + #:use-module (gnu services dbus) + #:use-module (gnu services shepherd) + #:use-module (gnu system shadow) + #:use-module (gnu packages docker) + #:use-module (guix records) + #:use-module (guix gexp) + #:use-module (guix packages) + + #:export (docker-configuration + docker-service-type)) + +(define-configuration docker-configuration + (docker + (package docker-engine) + "Docker daemon package.") + (containerd + (package containerd) + "containerd package.")) + +(define %docker-accounts + (list (user-group (name "docker") (system? #t)))) + +(define (%containerd-activation config) + (let ((state-dir "/var/lib/containerd")) + #~(begin + (use-modules (guix build utils)) + (mkdir-p #$state-dir)))) + +(define (%docker-activation config) + (%containerd-activation config) + (let ((state-dir "/var/lib/docker")) + #~(begin + (use-modules (guix build utils)) + (mkdir-p #$state-dir)))) + +;; TODO: Refactor out into its own module? How to depend on it then? +(define (containerd-shepherd-service config) + (let* ((package (docker-configuration-containerd config))) + (shepherd-service + (documentation "containerd daemon.") + (provision '(containerd)) + (start #~(make-forkexec-constructor + (list (string-append #$package "/bin/containerd")))) + (stop #~(make-kill-destructor))))) + +(define (docker-shepherd-service config) + (let* ((docker (docker-configuration-docker config))) + (shepherd-service + (documentation "Docker daemon.") + (provision '(dockerd)) + (requirement '(containerd)) + (start #~(make-forkexec-constructor + (list (string-append #$docker "/bin/dockerd") + "-p" "/var/run/docker.pid") + #:pid-file "/var/run/docker.pid" + #:log-file "/var/log/docker.log")) + (stop #~(make-kill-destructor))))) + +(define docker-service-type + (service-type (name 'docker) + (extensions + (list + (service-extension activation-service-type + %docker-activation) + (service-extension shepherd-root-service-type + (lambda args + (list (apply containerd-shepherd-service args) + (apply docker-shepherd-service args)))) + (service-extension account-service-type + (const %docker-accounts)))) + (default-value (docker-configuration)))) From patchwork Sun Dec 30 23:39:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 614 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 715B7169DF; Sun, 30 Dec 2018 23:40:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id 040D8169DC for ; Sun, 30 Dec 2018 23:40:26 +0000 (GMT) Received: from localhost ([127.0.0.1]:47186 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdkgz-0003kR-Hu for patchwork@mira.cbaines.net; Sun, 30 Dec 2018 18:40:25 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38214) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdkgf-0003Ws-QU for guix-patches@gnu.org; Sun, 30 Dec 2018 18:40:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gdkge-0003tS-H0 for guix-patches@gnu.org; Sun, 30 Dec 2018 18:40:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:52656) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gdkge-0003tO-Dk for guix-patches@gnu.org; Sun, 30 Dec 2018 18:40:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gdkge-0003MZ-8k for guix-patches@gnu.org; Sun, 30 Dec 2018 18:40:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33893] [PATCH v5 4/4] gnu: Add docker-cli. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Dec 2018 23:40:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33893 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33893@debbugs.gnu.org Received: via spool by 33893-submit@debbugs.gnu.org id=B33893.154621316112835 (code B ref 33893); Sun, 30 Dec 2018 23:40:04 +0000 Received: (at 33893) by debbugs.gnu.org; 30 Dec 2018 23:39:21 +0000 Received: from localhost ([127.0.0.1]:42709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdkfx-0003Kw-09 for submit@debbugs.gnu.org; Sun, 30 Dec 2018 18:39:21 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:53278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdkfp-0003KG-Gd for 33893@debbugs.gnu.org; Sun, 30 Dec 2018 18:39:14 -0500 Received: from dayas.3.home (77.116.200.150.wireless.dyn.drei.com [77.116.200.150]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 93C2433624F8; Mon, 31 Dec 2018 00:39:12 +0100 (CET) From: Danny Milosavljevic Date: Mon, 31 Dec 2018 00:39:03 +0100 Message-Id: <20181230233903.23426-5-dannym@scratchpost.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181230233903.23426-1-dannym@scratchpost.org> References: <20181230121754.775-1-dannym@scratchpost.org> <20181230233903.23426-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docker.scm (docker-cli): New variable. --- gnu/packages/docker.scm | 63 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index a3510529a..19b4d504f 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -27,6 +27,7 @@ #:use-module (guix build-system go) #:use-module (guix build-system python) #:use-module (guix utils) + #:use-module (gnu packages autotools) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages golang) @@ -376,3 +377,65 @@ management, secret management, configuration management, networking, provisioning etc.") (home-page "https://mobyproject.org/") (license license:asl2.0))) + +(define-public docker-cli + (package + (name "docker-cli") + (version %docker-version) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/docker/cli.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ivisys20kphvbqlazc3bsg7pk0ykj9gjx5d4yg439x4n13jxwvb")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/docker/cli" + ;; TODO: Tests require a running Docker daemon. + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'setup-environment-2 + (lambda _ + ;; Respectively, strip the symbol table and debug + ;; information, and the DWARF symbol table. + (setenv "LDFLAGS" "-s -w") + + ;; Make build reproducible. + (setenv "BUILDTIME" "1970-01-01 00:00:01.000000000+00:00") + (symlink "src/github.com/docker/cli/scripts" "./scripts") + (symlink "src/github.com/docker/cli/docker.Makefile" "./docker.Makefile") + #t)) + (replace 'build + (lambda _ + (invoke "./scripts/build/dynbinary"))) + (replace 'check + (lambda* (#:key make-flags tests? #:allow-other-keys) + (setenv "PATH" (string-append (getcwd) "/build:" (getenv "PATH"))) + (if tests? + ;; Use the newly-built docker client for the tests. + (with-directory-excursion "src/github.com/docker/cli" + ;; TODO: Run test-e2e as well? + (apply invoke "make" "-f" "docker.Makefile" "test-unit" + (or make-flags '()))) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (out-bin (string-append out "/bin"))) + (chdir "build") + (install-file (readlink "docker") out-bin) + (install-file "docker" out-bin) + #t)))))) + (native-inputs + `(("go" ,go) + ("libltdl" ,libltdl) + ("pkg-config" ,pkg-config))) + (synopsis "Command line interface to Docker") + (description "This package provides a command line interface to Docker.") + (home-page "http://www.docker.com/") + (license license:asl2.0)))