diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-02-20 17:01:39 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-20 17:01:39 +0100 |
commit | 2c76e19df4b0b4aa0171f1edd9f240f7b6ba5b84 (patch) | |
tree | c2e7a7f27dd9c7e704f2e78655328c903a6934d1 /gnu/packages/docker.scm | |
parent | e6a668ec7303a71f87e4c9354b1458e555058c63 (diff) | |
parent | 78b2eb1ad3dcf05c25e0ee4980c97aa52de03a2d (diff) | |
download | guix-2c76e19df4b0b4aa0171f1edd9f240f7b6ba5b84.tar guix-2c76e19df4b0b4aa0171f1edd9f240f7b6ba5b84.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/docker.scm')
-rw-r--r-- | gnu/packages/docker.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b340f8d4a0..7cb8f96258 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -162,7 +162,7 @@ Python without keeping their credentials in a Docker configuration file.") (define-public containerd (package (name "containerd") - (version "1.2.2") + (version "1.2.4") (source (origin (method git-fetch) @@ -171,8 +171,7 @@ Python without keeping their credentials in a Docker configuration file.") (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" @@ -397,6 +396,7 @@ network attachments.") ;; 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)) |