diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-14 00:20:28 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-14 00:20:28 +0100 |
| commit | 6901878894e9c6405fa811c512a32f448e8b9fa2 (patch) | |
| tree | 5b04c4234f4022533692c36a83047ec9801aada9 /gnu/packages/docker.scm | |
| parent | baf766a7ff9db45c707b4539176f2143fbd90efd (diff) | |
| parent | 58c6a93d9d60660d8425d8c52d4b73a42d4a5b55 (diff) | |
| download | patches-6901878894e9c6405fa811c512a32f448e8b9fa2.tar patches-6901878894e9c6405fa811c512a32f448e8b9fa2.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/docker.scm')
| -rw-r--r-- | gnu/packages/docker.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 992eb0dcc1..b340f8d4a0 100644 --- 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)) -(define %docker-version "18.09.0") +(define %docker-version "18.09.2") (define-public python-docker-py (package @@ -241,7 +241,7 @@ network attachments.") (file-name (git-file-name name version)) (sha256 (base32 - "1liqbx58grqih6m8hz9y20y5waflv19pv15l3wl64skap2bsn21c")) + "1zfpk2n8j6gnwbrxrh6d6pj24y60dhbanpf55shrm2yxz54ka36c")) (patches (search-patches "docker-engine-test-noinstall.patch" "docker-fix-tests.patch")))) @@ -337,6 +337,7 @@ network attachments.") (substitute-LookPath "blkid" "util-linux" "/sbin/blkid") (substitute-LookPath "unpigz" "pigz" "/bin/unpigz") (substitute-LookPath "iptables" "iptables" "/sbin/iptables") + (substitute-LookPath "iptables-legacy" "iptables" "/sbin/iptables") (substitute-LookPath "ip" "iproute2" "/sbin/ip") (substitute-Command "modprobe" "kmod" "/bin/modprobe") (substitute-Command "pvcreate" "lvm2" "/sbin/pvcreate") @@ -483,7 +484,7 @@ provisioning etc.") (file-name (git-file-name name version)) (sha256 (base32 - "1ivisys20kphvbqlazc3bsg7pk0ykj9gjx5d4yg439x4n13jxwvb")))) + "0jzcqh1kqbfyj6ax7z67gihaqgjiz6ddz6rq6k458l68v7zn77r8")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" |