amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: docker: Provide version string to docker service.

Browse source 
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.
This commit is contained in:
Danny Milosavljevic 2020-04-02 12:10:35 +02:00
parent 1ea9d1e187
commit 451c38b7d6
No known key found for this signature in database
GPG key ID: E71A35542C30BAA5
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/docker.scm
View file

@ -503,6 +503,7 @@ built-in registry server of Docker.")
(replace 'configure (replace 'configure
(lambda _ (lambda _
(setenv "DOCKER_GITCOMMIT" (string-append "v" ,%docker-version)) (setenv "DOCKER_GITCOMMIT" (string-append "v" ,%docker-version))
(setenv "VERSION" (string-append ,%docker-version "-ce"))
;; Automatically use bundled dependencies. ;; Automatically use bundled dependencies.
;; TODO: Unbundle - see file "vendor.conf". ;; TODO: Unbundle - see file "vendor.conf".
(setenv "AUTO_GOPATH" "1") (setenv "AUTO_GOPATH" "1")
@ -540,7 +541,9 @@ built-in registry server of Docker.")
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(out-bin (string-append out "/bin"))) (out-bin (string-append out "/bin")))
(install-file "bundles/dynbinary-daemon/dockerd" 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)))))) #t))))))
(inputs (inputs
`(("btrfs-progs" ,btrfs-progs) `(("btrfs-progs" ,btrfs-progs)