diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2020-04-02 12:10:35 +0200 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2020-04-02 12:46:52 +0200 |
| commit | 451c38b7d6017434a2a06646f1da6ef1e6ca4614 (patch) | |
| tree | 5f66f71e3bcdebd3e1d763f3133197b624a727ff /gnu/packages/docker.scm | |
| parent | 1ea9d1e1879f6f2d4e9d2c5b9661408a5d4b63a8 (diff) | |
| download | guix-451c38b7d6017434a2a06646f1da6ef1e6ca4614.tar.gz | |
gnu: docker: Provide version string to docker service.
Fixes <https://bugs.gnu.org/40368>. Reported by Pierre Neidhardt <mail@ambrevar.xyz>. * gnu/packages/docker.scm (docker)[configure]: Provide version string. [install]: Install versioned binary.
Diffstat (limited to 'gnu/packages/docker.scm')
| -rw-r--r-- | gnu/packages/docker.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 69dee2b856..c95ca3f9d7 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) |