diff options
| author | Marius Bakke <[email protected]> | 2020-06-14 16:24:34 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2020-06-14 16:24:34 +0200 |
| commit | 4193095e18b602705df94e38a8d60ef1fe380e49 (patch) | |
| tree | 2500f31bcfae9b4cb5a23d633395f6892a7bd8a7 /gnu/packages/docker.scm | |
| parent | a48a3f0640d76cb5e5945557c9aae6dabce39d93 (diff) | |
| parent | e88745a655b220b4047f7db5175c828ef9c33e11 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/docker.scm')
| -rw-r--r-- | gnu/packages/docker.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index c95ca3f9d7..cdde807046 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Thompson <[email protected]> ;;; Copyright © 2018 Efraim Flashner <[email protected]> -;;; Copyright © 2019 Tobias Geerinckx-Rice <[email protected]> +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2019 Maxim Cournoyer <[email protected]> ;;; Copyright © 2020 Michael Rohleder <[email protected]> ;;; @@ -47,7 +47,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization)) -(define %docker-version "19.03.7") +(define %docker-version "19.03.11") (define-public python-docker-py (package @@ -314,7 +314,7 @@ built-in registry server of Docker.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1sik109lxmiwgrsnvfip1nnal1xkh8z1mlvys6aknjyh29ll1iq8")) + (base32 "1pmbggxbazipl24hxiaccbj32379zv79xba76l78v5131ihx922h")) (patches (search-patches "docker-fix-tests.patch")))) (build-system gnu-build-system) @@ -544,7 +544,9 @@ built-in registry server of Docker.") (install-file (string-append "bundles/dynbinary-daemon/dockerd-" (getenv "VERSION")) out-bin) - #t)))))) + #t))) + (add-after 'install 'remove-go-references + (assoc-ref go:%standard-phases 'remove-go-references))))) (inputs `(("btrfs-progs" ,btrfs-progs) ("containerd" ,containerd) ; for containerd-shim @@ -590,7 +592,7 @@ provisioning etc.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "164l33npy8acdbbrz8vcyiwx18vi55wwwikkasg0w43b5bdhz8sx")))) + (base32 "1y9ymv70r1hndblr64h19q34arxl2f3dqqi2qcrai5zfimcml6lr")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" |