branch master updated: gnu: docker: Provide version string to docker service.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

dannym pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 451c38b  gnu: docker: Provide version string to docker service.
451c38b is described below

commit 451c38b7d6017434a2a06646f1da6ef1e6ca4614
Author: Danny Milosavljevic <address@hidden>
AuthorDate: Thu Apr 2 12:10:35 2020 +0200

    gnu: docker: Provide version string to docker service.
    
    Fixes <https://bugs.gnu.org/40368>.
    Reported by Pierre Neidhardt <address@hidden>.
    
    * gnu/packages/docker.scm (docker)[configure]: Provide version string.
    [install]: Install versioned binary.
---
 gnu/packages/docker.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 69dee2b..c95ca3f 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -503,6 +503,7 @@ built-in registry server of Docker.")
          (replace 'configure
            (lambda _
              (setenv "DOCKER_GITCOMMIT" (string-append "v" ,%docker-version))
+             (setenv "VERSION" (string-append ,%docker-version "-ce"))
              ;; Automatically use bundled dependencies.
              ;; TODO: Unbundle - see file "vendor.conf".
              (setenv "AUTO_GOPATH" "1")
@@ -540,7 +541,9 @@ built-in registry server of Docker.")
              (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)
+               (install-file (string-append "bundles/dynbinary-daemon/dockerd-"
+                                            (getenv "VERSION"))
+                             out-bin)
                #t))))))
     (inputs
      `(("btrfs-progs" ,btrfs-progs)