diff options
Diffstat (limited to 'gnu/packages/docker.scm')
| -rw-r--r-- | gnu/packages/docker.scm | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 3b809feb67..fbe8edeef0 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Thompson <davet@gnu.org> -;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2018, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2020, 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> @@ -54,7 +54,7 @@ ;; Note - when changing Docker versions it is important to update the versions ;; of several associated packages (docker-libnetwork and go-sctp). -(define %docker-version "20.10.25") +(define %docker-version "20.10.27") (define-public python-docker (package @@ -264,9 +264,9 @@ network attachments.") ;; the branch that Docker uses, as can be seen in the 'vendor.conf' Docker ;; source file. NOTE - It is important that this version is kept in sync ;; with the version of Docker being used. - (let ((commit "3f0048413d95802b9c6c836eba06bfc54f9dbd03") + (let ((commit "3797618f9a38372e8107d8c06f6ae199e1133ae8") (version (version-major+minor %docker-version)) - (revision "2")) + (revision "3")) (package (name "docker-libnetwork") (version (git-version version revision commit)) @@ -279,7 +279,7 @@ network attachments.") (file-name (git-file-name name version)) (sha256 (base32 - "185i5ji7dwkv41zmb8s3d7i5gg72wivcj1l4bhr1lb3a1vy2hcxc")) + "1km3p6ya9az0ax2zww8wb5vbifr1gj5n9l82i273m9f3z9f2mq2p")) ;; Delete bundled ("vendored") free software source code. (modules '((guix build utils))) (snippet '(delete-file-recursively "vendor")))) @@ -299,7 +299,10 @@ the required network abstractions for applications.") (inherit docker-libnetwork) (name "docker-libnetwork-cmd-proxy") (arguments - `(#:import-path "github.com/docker/libnetwork/cmd/proxy" + ;; The tests are unsupported on all architectures except x86_64-linux. + `(#:tests? ,(and (not (%current-target-system)) + (target-x86-64?)) + #:import-path "github.com/docker/libnetwork/cmd/proxy" #:unpack-path "github.com/docker/libnetwork" #:install-source? #f)) (native-inputs @@ -330,7 +333,7 @@ built-in registry server of Docker.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1q5vc6f5fzzxsvv1kwdky56fr1jiy9199m3vxqh4mz85qr067cmn")))) + (base32 "017frilx35w3m4dz3n6m2f293q4fq4jrk6hl8f7wg5xs3r8hswvq")))) (build-system gnu-build-system) (arguments (list @@ -591,7 +594,7 @@ runcexecutor/executor.go" xz)) (native-inputs (list eudev ; TODO: Should be propagated by lvm2 (.pc -> .pc) - go-1.19 gotestsum pkg-config)) + go-1.20 gotestsum pkg-config)) (synopsis "Container component library and daemon") (description "This package provides a framework to assemble specialized container systems. It includes components for orchestration, image @@ -612,7 +615,7 @@ provisioning etc.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qy35vvnl4lf9w6dr9n7yfqvzhzm7m3sl2ai275apbhygwgcsbss")))) + (base32 "0szwaxiasy77mm90wj2qg747zb9lyiqndg5halg7qbi41ng6ry0h")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" |