Merge remote-tracking branch 'origin/master' into core-updates

1 files changed, 16 insertions, 16 deletions

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index eb092808f6..5c6292c122 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -52,7 +52,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 "19.03.13")
+(define %docker-version "19.03.15")
 
 (define-public python-docker
   (package
@@ -177,18 +177,16 @@ Python without keeping their credentials in a Docker configuration file.")
 (define-public containerd
   (package
     (name "containerd")
-    (version "1.2.5")
+    (version "1.3.10")
     (source
      (origin
-      (method git-fetch)
-      (uri (git-reference
-            (url "https://github.com/containerd/containerd")
-            (commit (string-append "v" version))))
-      (file-name (git-file-name name version))
-      (sha256
-       (base32 "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0"))
-      (patches
-        (search-patches "containerd-test-with-go1.13.patch"))))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/containerd/containerd")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "10fz7359aydbz0yb01qkrsq2diypayfal618lvvb1x0gvgkp526i"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/containerd/containerd"
@@ -252,7 +250,7 @@ network attachments.")
   ;; 'hack/dockerfile/install/proxy.installer'. NOTE - It is important that
   ;; this version is kept in sync with the version of Docker being used.
   ;; This commit is the "bump_19.03" branch, as mentioned in Docker's vendor.conf.
-  (let ((commit "026aabaa659832804b01754aaadd2c0f420c68b6")
+  (let ((commit "55e924b8a84231a065879156c0de95aefc5f5435")
         (version (version-major+minor %docker-version))
         (revision "1"))
     (package
@@ -267,7 +265,7 @@ network attachments.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0bli21vn5v7bssw3ydym4jfdjsldhb47fld88kng7d138wl70lkw"))
+                  "19syb3scwiykn44gqfaqrgqv8a0df4ps0ykf3za9xkjc5cyi99mp"))
                 ;; Delete bundled ("vendored") free software source code.
                 (modules '((guix build utils)))
                 (snippet '(begin
@@ -316,11 +314,11 @@ built-in registry server of Docker.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/docker/engine")
+             (url "https://github.com/moby/moby")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1mg3jjisdbqrqrrhyslj3715lslial2kcgjrpprb6q63i52963gj"))
+        (base32 "0419iha9zmwlhzhnbfxlsa13vgd04yifnsr8qqnj2ks5dxrcajl8"))
        (patches
         (search-patches "docker-fix-tests.patch"))))
     (build-system gnu-build-system)
@@ -517,6 +515,8 @@ built-in registry server of Docker.")
              (delete-file "runconfig/config_test.go")
              ;; This file uses /var.
              (delete-file "daemon/oci_linux_test.go")
+             ;; Signal tests fail in bizarre ways
+             (delete-file "pkg/signal/signal_linux_test.go")
              #t))
          (replace 'configure
            (lambda _
@@ -611,7 +611,7 @@ provisioning etc.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-       (base32 "0wm5x8b8jll78h2zzncfdpxj0y3gv571z0nd39f036wsy7r23dsi"))))
+       (base32 "1asapjj8brvbkd5irgdq82fx1ihrc14qaq30jxvjwflfm5yb7lv0"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/docker/cli"