all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Danny Milosavljevic <dannym@scratchpost.org>
To: 33893@debbugs.gnu.org
Subject: [bug#33893] [PATCH 2/2] gnu: Add docker-cli.
Date: Fri, 28 Dec 2018 11:17:51 +0100	[thread overview]
Message-ID: <20181228101751.676-2-dannym@scratchpost.org> (raw)
In-Reply-To: <20181228101751.676-1-dannym@scratchpost.org>

* gnu/packages/docker.scm (docker-cli): New variable.  Export it.
---
 gnu/packages/docker.scm | 61 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 3d1a90fc7..caf70cbc9 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -24,8 +24,10 @@
   #: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 autotools)
   #:use-module (gnu packages check)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages linux)
@@ -225,3 +227,62 @@ 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")
+             (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)))

  reply	other threads:[~2018-12-28 11:01 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   ` Danny Milosavljevic [this message]
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   ` [bug#33893] [PATCH v2 2/3] gnu: Add docker-engine Danny Milosavljevic
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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181228101751.676-2-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 external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.