diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-04-01 00:02:39 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-04-01 00:02:39 +0200 |
| commit | 571fb008a576378883c053be186d2c620290ea39 (patch) | |
| tree | 5279a2c2772a9b76299a48d697d568f208a89722 /gnu/packages/docker.scm | |
| parent | 7c86fdda7ceed11377b0e17b47c91598be59be52 (diff) | |
| parent | f125c5a5ea03d53749f45d310694b79241d5888d (diff) | |
| download | guix-571fb008a576378883c053be186d2c620290ea39.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/docker.scm')
| -rw-r--r-- | gnu/packages/docker.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 88fc7fc6ec..a11ce266d2 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -227,6 +227,8 @@ network attachments.") (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") @@ -242,7 +244,8 @@ network attachments.") (base32 "06yr5xwr181lalh8z1lk07nxlp7hn38aq8cyqjk617dfy4lz0ixx")) (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 |