[bug#74746,5/5] gnu: docker: Remove docker-<version> from out-bin
Commit Message
Change-Id: Ib6739014c275a00336de4a2c108fbd916b59224b
---
gnu/packages/docker.scm | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
@@ -504,27 +504,21 @@ (define-public docker
(lambda _
;; Needs internet access.
(delete-file "builder/remotecontext/git/gitutils_test.go")
- ;; Permission denied.
- (delete-file "daemon/graphdriver/devmapper/devmapper_test.go")
;; Operation not permitted (idtools.MkdirAllAndChown).
(delete-file "daemon/graphdriver/vfs/vfs_test.go")
;; Timeouts after 5 min.
(delete-file "plugin/manager_linux_test.go")
;; Operation not permitted.
- (delete-file "daemon/graphdriver/aufs/aufs_test.go")
(delete-file "daemon/graphdriver/btrfs/btrfs_test.go")
- (delete-file "daemon/graphdriver/overlay/overlay_test.go")
(delete-file "daemon/graphdriver/overlay2/overlay_test.go")
- (delete-file "pkg/chrootarchive/archive_unix_test.go")
(delete-file "daemon/container_unix_test.go")
+ (delete-file "internal/safepath/join_test.go")
;; This file uses cgroups and /proc.
(delete-file "pkg/sysinfo/sysinfo_linux_test.go")
;; This file uses cgroups.
(delete-file "runconfig/config_test.go")
;; This file uses /var.
- (delete-file "daemon/oci_linux_test.go")
- ;; Signal tests fail in bizarre ways
- (delete-file "pkg/signal/signal_linux_test.go")))
+ (delete-file "daemon/oci_linux_test.go")))
(replace 'configure
(lambda _
(setenv "DOCKER_BUILDTAGS" "seccomp")
@@ -566,10 +560,7 @@ (define-public docker
(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 (string-append "bundles/dynbinary-daemon/dockerd-"
- (getenv "VERSION"))
- out-bin)))))))
+ (install-file "bundles/dynbinary-daemon/dockerd" out-bin)))))))
(inputs
(list btrfs-progs
containerd ; for containerd-shim