HCoop
/
jackhill
/
guix
/
guix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gnu: quilt: Update to 0.66.
[jackhill/guix/guix.git]
/
gnu
/
packages
/
docker.scm
diff --git
a/gnu/packages/docker.scm
b/gnu/packages/docker.scm
index
4b6d04f
..
a11ce26
100644
(file)
--- a/
gnu/packages/docker.scm
+++ b/
gnu/packages/docker.scm
@@
-43,7
+43,7
@@
#:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization))
#:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization))
-(define %docker-version "18.09.
2
")
+(define %docker-version "18.09.
3
")
(define-public python-docker-py
(package
(define-public python-docker-py
(package
@@
-162,7
+162,7
@@
Python without keeping their credentials in a Docker configuration file.")
(define-public containerd
(package
(name "containerd")
(define-public containerd
(package
(name "containerd")
- (version "1.2.
4
")
+ (version "1.2.
5
")
(source
(origin
(method git-fetch)
(source
(origin
(method git-fetch)
@@
-171,7
+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
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "
1rw7f0y3iv0mapxid1rgpns80dcy8nhgmxmw27x8qzrzic5viivy
"))))
+ (base32 "
0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0
"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/containerd/containerd"
(build-system go-build-system)
(arguments
`(#:import-path "github.com/containerd/containerd"
@@
-227,6
+227,8
@@
network attachments.")
(home-page "http://containerd.io/")
(license license:asl2.0)))
(home-page "http://containerd.io/")
(license license:asl2.0)))
+;; TODO: Patch out modprobes for ip_vs, nf_conntrack,
+;; brige, nf_conntrack_netlink, aufs.
(define-public docker
(package
(name "docker")
(define-public docker
(package
(name "docker")
@@
-239,11
+241,11
@@
network attachments.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32
- "1zfpk2n8j6gnwbrxrh6d6pj24y60dhbanpf55shrm2yxz54ka36c"))
+ (base32 "06yr5xwr181lalh8z1lk07nxlp7hn38aq8cyqjk617dfy4lz0ixx"))
(patches
(search-patches "docker-engine-test-noinstall.patch"
(patches
(search-patches "docker-engine-test-noinstall.patch"
- "docker-fix-tests.patch"))))
+ "docker-fix-tests.patch"
+ "docker-use-fewer-modprobes.patch"))))
(build-system gnu-build-system)
(arguments
`(#:modules
(build-system gnu-build-system)
(arguments
`(#:modules
@@
-485,8
+487,7
@@
provisioning etc.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32
- "0jzcqh1kqbfyj6ax7z67gihaqgjiz6ddz6rq6k458l68v7zn77r8"))))
+ (base32 "09j1i668p330gjz5vw5pss8ghxh1mz7rl2q9ykp02q9p112zhy4j"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/docker/cli"
(build-system go-build-system)
(arguments
`(#:import-path "github.com/docker/cli"