From 74bf1b5da5dfd1e52be971c09203d5c514873fc1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 09:52:40 +0100 Subject: gnu: docker: Fix build on btrfs. * gnu/packages/docker.scm (docker)[arguments]: Skip another test that requires root privileges. --- gnu/packages/docker.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/docker.scm') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b340f8d4a0..8c2582a86e 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -397,6 +397,7 @@ (define-public docker ;; Timeouts after 5 min. (delete-file "plugin/manager_linux_test.go") ;; Operation not permitted. + (delete-file "daemon/graphdriver/btrfs/btrfs_test.go") (delete-file "daemon/graphdriver/overlay/overlay_test.go") (delete-file "daemon/graphdriver/overlay2/overlay_test.go") #t)) -- cgit v1.2.3 From 6c77b5a9f7856d44e7405ff3fd6458629004d555 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 22:12:19 +0100 Subject: gnu: containerd: Update to 1.2.4. * gnu/packages/docker.scm (containerd): Update to 1.2.4. --- gnu/packages/docker.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/docker.scm') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 8c2582a86e..7cb8f96258 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -162,7 +162,7 @@ (define-public python-docker-pycreds (define-public containerd (package (name "containerd") - (version "1.2.2") + (version "1.2.4") (source (origin (method git-fetch) @@ -171,8 +171,7 @@ (define-public containerd (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya")))) + (base32 "1rw7f0y3iv0mapxid1rgpns80dcy8nhgmxmw27x8qzrzic5viivy")))) (build-system go-build-system) (arguments `(#:import-path "github.com/containerd/containerd" -- cgit v1.2.3