GNU bug report logs - #64910
[PATCH 0/3] gnu: docker: Update to 20.10.25.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 64910 in the body.
You can then email your comments to 64910 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Hilton Chain <hako <at> ultrarare.space>
To: guix-patches <at> gnu.org
Cc: Hilton Chain <hako <at> ultrarare.space>
Subject: [PATCH 0/3] gnu: docker: Update to 20.10.25.
Date: Fri, 28 Jul 2023 11:11:24 +0800

Hello Guix!

This patchset updates docker & docker-cil to 20.10.25, runc to latest version,
and containerd to latest 1.6 version.

It's only a patch version update and I haven't looked into the major version
update.

Thanks

Hilton Chain (3):
  gnu: runc: Update to 1.1.8.
  gnu: containerd: Update to 1.6.22.
  gnu: docker: Update to 20.10.25.

 gnu/packages/docker.scm         | 18 +++++++++---------
 gnu/packages/virtualization.scm |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)


base-commit: 35c8d631d2bd63c64e863b5509f29fdcb7f856e6
--
2.41.0

Message #8 received at 64910 <at> debbugs.gnu.org (full text, mbox):

From: Hilton Chain <hako <at> ultrarare.space>
To: 64910 <at> debbugs.gnu.org
Cc: Hilton Chain <hako <at> ultrarare.space>
Subject: [PATCH 1/3] gnu: runc: Update to 1.1.8.
Date: Fri, 28 Jul 2023 11:13:43 +0800

* gnu/packages/virtualization.scm (runc): Update to 1.1.8.
---
 gnu/packages/virtualization.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index db7df83524..698d7242c9 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1999,7 +1999,7 @@ (define-public looking-glass-client
 (define-public runc
   (package
     (name "runc")
-    (version "1.1.1")
+    (version "1.1.8")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2008,7 +2008,7 @@ (define-public runc
               (file-name (string-append name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0jx56x49dgkygdbrfb3pmxycy1n37arj97jra8n422dj36xz1hbm"))))
+                "1w6d2prsb0kgfrcc2m1w0vi8g6qhggr7wfgn4as6nckaymav1i7s"))))
     (build-system go-build-system)
     (arguments
      '(#:import-path "github.com/opencontainers/runc"
-- 
2.41.0

Message #11 received at 64910 <at> debbugs.gnu.org (full text, mbox):

From: Hilton Chain <hako <at> ultrarare.space>
To: 64910 <at> debbugs.gnu.org
Cc: Hilton Chain <hako <at> ultrarare.space>
Subject: [PATCH 2/3] gnu: containerd: Update to 1.6.22.
Date: Fri, 28 Jul 2023 11:13:44 +0800

* gnu/packages/docker.scm (containerd): Update to 1.6.22.
---
 gnu/packages/docker.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 0b2a18d661..3fe7c6ca2c 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -177,7 +177,7 @@ (define-public python-docker-pycreds
 (define-public containerd
   (package
     (name "containerd")
-    (version "1.6.6")
+    (version "1.6.22")
     (source
      (origin
        (method git-fetch)
@@ -186,7 +186,7 @@ (define-public containerd
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1vsl747i3wyy68j4lp4nprwxadbyga8qxlrk892afcd2990zp5mr"))
+        (base32 "1m31y00sq2m76m1jiq4znws8gxbgkh5adklvqibxiz1b96vvwjk8"))
        (patches
         (search-patches "containerd-create-pid-file.patch"))))
     (build-system go-build-system)
-- 
2.41.0

Message #14 received at 64910 <at> debbugs.gnu.org (full text, mbox):

From: Hilton Chain <hako <at> ultrarare.space>
To: 64910 <at> debbugs.gnu.org
Cc: Hilton Chain <hako <at> ultrarare.space>
Subject: [PATCH 3/3] gnu: docker: Update to 20.10.25.
Date: Fri, 28 Jul 2023 11:13:45 +0800

* gnu/packages/docker.scm (%docker-version): Update to 20.10.25.
(docker-libnetwork): Update to 20.10-2.3f00484.
(docker)[native-inputs]: Replace go with go-1.19.
---
 gnu/packages/docker.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 3fe7c6ca2c..f6c417187c 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -54,7 +54,7 @@ (define-module (gnu packages docker)
 
 ;; 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.17")
+(define %docker-version "20.10.25")
 
 (define-public python-docker
   (package
@@ -259,9 +259,9 @@ (define docker-libnetwork
   ;; 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 "f6ccccb1c082a432c2a5814aaedaca56af33d9ea")
+  (let ((commit "3f0048413d95802b9c6c836eba06bfc54f9dbd03")
         (version (version-major+minor %docker-version))
-        (revision "1"))
+        (revision "2"))
     (package
       (name "docker-libnetwork")
       (version (git-version version revision commit))
@@ -274,7 +274,7 @@ (define docker-libnetwork
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0nxpr0h0smv4n641g41vxibr5r85ixfcvs9cp3c4fc7zvrhjc49s"))
+                  "185i5ji7dwkv41zmb8s3d7i5gg72wivcj1l4bhr1lb3a1vy2hcxc"))
                 ;; Delete bundled ("vendored") free software source code.
                 (modules '((guix build utils)))
                 (snippet '(delete-file-recursively "vendor"))))
@@ -325,7 +325,7 @@ (define-public docker
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0hn7fg717rggwk6dbicrwa7aglqp7dp0jp5rvn6p9gfcnrp2w97d"))))
+        (base32 "1q5vc6f5fzzxsvv1kwdky56fr1jiy9199m3vxqh4mz85qr067cmn"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -586,7 +586,7 @@ (define-public docker
            xz))
     (native-inputs
      (list eudev ; TODO: Should be propagated by lvm2 (.pc -> .pc)
-           go gotestsum pkg-config))
+           go-1.19 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
@@ -607,7 +607,7 @@ (define-public docker-cli
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0ksicj4iqvgp9jabd4xmhkf3vax6dwn4f5dsr73bdqj4mf3ahav0"))))
+        (base32 "0qy35vvnl4lf9w6dr9n7yfqvzhzm7m3sl2ai275apbhygwgcsbss"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/docker/cli"
-- 
2.41.0

Message #17 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Hilton Chain <hako <at> ultrarare.space>
To: guix-patches <at> gnu.org
Cc: Hilton Chain <hako <at> ultrarare.space>
Subject: Re: [PATCH 0/3] gnu: docker: Update to 20.10.25.
Date: Fri, 11 Aug 2023 16:01:27 +0800

tags 64910 moreinfo
thanks

> Hilton Chain (3):
>   gnu: runc: Update to 1.1.8.
>   gnu: containerd: Update to 1.6.22.
>   gnu: docker: Update to 20.10.25.
> 
>  gnu/packages/docker.scm         | 18 +++++++++---------
>  gnu/packages/virtualization.scm |  4 ++--
>  2 files changed, 11 insertions(+), 11 deletions(-)
> 
> 
> base-commit: 35c8d631d2bd63c64e863b5509f29fdcb7f856e6
> --
> 2.41.0


There's an issue that containerd fails to start, I'll address it.

Message #20 received at 64910 <at> debbugs.gnu.org (full text, mbox):

From: Hilton Chain <hako <at> ultrarare.space>
To: 64910 <at> debbugs.gnu.org
Cc: Hilton Chain <hako <at> ultrarare.space>
Subject: [PATCH v2 0/3] gnu: docker: Update to 20.10.25.
Date: Fri, 11 Aug 2023 18:45:05 +0800

V1 -> V2:
  - runc <at> 1.1.9
  - Fix containerd starting issue.

`make check-system TESTS=docker' passes.


Details on the issue:

Error message:
--8<---------------cut here---------------start------------->8---
msg="failed to load plugin io.containerd.grpc.v1.cri"
error="invalid plugin config: no corresponding runtime configured in `containerd.runtimes` for `containerd` `default_runtime_name` = \"/gnu/store/...-runc-1.1.9/sbin/runc\""
--8<---------------cut here---------------end--------------->8---

The message comes from pkg/cri/config/config.go:
--8<---------------cut here---------------start------------->8---
if _, ok := c.ContainerdConfig.Runtimes[c.ContainerdConfig.DefaultRuntimeName]; !ok {
	return fmt.Errorf("no corresponding runtime configured in `containerd.runtimes` for `containerd` `default_runtime_name = \"%s\"", c.ContainerdConfig.DefaultRuntimeName)
}
--8<---------------cut here---------------end--------------->8---

It expects there's `ContainerdConfig.DefaultRuntimeName' within
`ContainerdConfig.Runtimes'.

And from the relevant code in pkg/cri/config/config_unix.go and the
package definion, "runc" the `DefaultRuntimeName' was substituted to a
store path, but not "runc" in `Runtimes'.

So [...].Runtimes["/gnu/store/...-runc-1.1.9/sbin/runc"] fails.
--8<---------------cut here---------------start------------->8---
func DefaultConfig() PluginConfig {
	[...]
	return PluginConfig{
		[...]
		ContainerdConfig: ContainerdConfig{
			[...]
			DefaultRuntimeName: "runc",
			Runtimes: map[string]Runtime{
				"runc": {
					[...]
				},
			},
			[...]
		},
		[...]
	}
}
--8<---------------cut here---------------end--------------->8---

There's no functional change in those two files between 1.6.6 and
1.6.22, I wonder why this wasn't an issue before...

Thanks

Hilton Chain (3):
  gnu: runc: Update to 1.1.9.
  gnu: containerd: Update to 1.6.22.
  gnu: docker: Update to 20.10.25.

 gnu/packages/docker.scm         | 25 +++++++++++++++----------
 gnu/packages/virtualization.scm |  4 ++--
 2 files changed, 17 insertions(+), 12 deletions(-)


base-commit: ad4520b92662e42d7d0b1e648b2068300dbb95c8
--
2.41.0

Message #23 received at 64910 <at> debbugs.gnu.org (full text, mbox):

From: Hilton Chain <hako <at> ultrarare.space>
To: 64910 <at> debbugs.gnu.org
Cc: Hilton Chain <hako <at> ultrarare.space>
Subject: [PATCH v2 1/3] gnu: runc: Update to 1.1.9.
Date: Fri, 11 Aug 2023 18:46:27 +0800

* gnu/packages/virtualization.scm (runc): Update to 1.1.9.
---
 gnu/packages/virtualization.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 9556fbc61e..9410b674a3 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2002,7 +2002,7 @@ (define-public looking-glass-client
 (define-public runc
   (package
     (name "runc")
-    (version "1.1.1")
+    (version "1.1.9")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2011,7 +2011,7 @@ (define-public runc
               (file-name (string-append name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0jx56x49dgkygdbrfb3pmxycy1n37arj97jra8n422dj36xz1hbm"))))
+                "1hhxqwg0mblrgv2aim3scfd9xg13l6i22j124sdma5sf2fzgx5bn"))))
     (build-system go-build-system)
     (arguments
      '(#:import-path "github.com/opencontainers/runc"
-- 
2.41.0

Message #26 received at 64910 <at> debbugs.gnu.org (full text, mbox):

From: Hilton Chain <hako <at> ultrarare.space>
To: 64910 <at> debbugs.gnu.org
Cc: Hilton Chain <hako <at> ultrarare.space>
Subject: [PATCH v2 2/3] gnu: containerd: Update to 1.6.22.
Date: Fri, 11 Aug 2023 18:46:28 +0800

* gnu/packages/docker.scm (containerd): Update to 1.6.22.
[#:phases]<patch-paths>: Patch Runtime name.
---
 gnu/packages/docker.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 0b2a18d661..3815824202 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -177,7 +177,7 @@ (define-public python-docker-pycreds
 (define-public containerd
   (package
     (name "containerd")
-    (version "1.6.6")
+    (version "1.6.22")
     (source
      (origin
        (method git-fetch)
@@ -186,7 +186,7 @@ (define-public containerd
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1vsl747i3wyy68j4lp4nprwxadbyga8qxlrk892afcd2990zp5mr"))
+        (base32 "1m31y00sq2m76m1jiq4znws8gxbgkh5adklvqibxiz1b96vvwjk8"))
        (patches
         (search-patches "containerd-create-pid-file.patch"))))
     (build-system go-build-system)
@@ -215,7 +215,12 @@ (define-public containerd
                     (("DefaultRuntimeName: \"runc\"")
                      (string-append "DefaultRuntimeName: \""
                                     (search-input-file inputs "/sbin/runc")
-                                    "\"")))
+                                    "\""))
+                    ;; ContainerdConfig.Runtimes
+                    (("\"runc\":")
+                     (string-append "\""
+                                    (search-input-file inputs "/sbin/runc")
+                                    "\":")))
                   (substitute* "vendor/github.com/containerd/go-runc/runc.go"
                     (("DefaultCommand[ \t]*=.*")
                      (string-append "DefaultCommand = \""
-- 
2.41.0

Message #29 received at 64910 <at> debbugs.gnu.org (full text, mbox):

From: Hilton Chain <hako <at> ultrarare.space>
To: 64910 <at> debbugs.gnu.org
Cc: Hilton Chain <hako <at> ultrarare.space>
Subject: [PATCH v2 3/3] gnu: docker: Update to 20.10.25.
Date: Fri, 11 Aug 2023 18:46:29 +0800

* gnu/packages/docker.scm (%docker-version): Update to 20.10.25.
(docker-libnetwork): Update to 20.10-2.3f00484.
(docker)[native-inputs]: Replace go with go-1.19.
---
 gnu/packages/docker.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 3815824202..3b809feb67 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -54,7 +54,7 @@ (define-module (gnu packages docker)
 
 ;; 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.17")
+(define %docker-version "20.10.25")
 
 (define-public python-docker
   (package
@@ -264,9 +264,9 @@ (define docker-libnetwork
   ;; 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 "f6ccccb1c082a432c2a5814aaedaca56af33d9ea")
+  (let ((commit "3f0048413d95802b9c6c836eba06bfc54f9dbd03")
         (version (version-major+minor %docker-version))
-        (revision "1"))
+        (revision "2"))
     (package
       (name "docker-libnetwork")
       (version (git-version version revision commit))
@@ -279,7 +279,7 @@ (define docker-libnetwork
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0nxpr0h0smv4n641g41vxibr5r85ixfcvs9cp3c4fc7zvrhjc49s"))
+                  "185i5ji7dwkv41zmb8s3d7i5gg72wivcj1l4bhr1lb3a1vy2hcxc"))
                 ;; Delete bundled ("vendored") free software source code.
                 (modules '((guix build utils)))
                 (snippet '(delete-file-recursively "vendor"))))
@@ -330,7 +330,7 @@ (define-public docker
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0hn7fg717rggwk6dbicrwa7aglqp7dp0jp5rvn6p9gfcnrp2w97d"))))
+        (base32 "1q5vc6f5fzzxsvv1kwdky56fr1jiy9199m3vxqh4mz85qr067cmn"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -591,7 +591,7 @@ (define-public docker
            xz))
     (native-inputs
      (list eudev ; TODO: Should be propagated by lvm2 (.pc -> .pc)
-           go gotestsum pkg-config))
+           go-1.19 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 +612,7 @@ (define-public docker-cli
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0ksicj4iqvgp9jabd4xmhkf3vax6dwn4f5dsr73bdqj4mf3ahav0"))))
+        (base32 "0qy35vvnl4lf9w6dr9n7yfqvzhzm7m3sl2ai275apbhygwgcsbss"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/docker/cli"
-- 
2.41.0

Message #32 received at 64910 <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Hilton Chain <hako <at> ultrarare.space>
Cc: 64910 <at> debbugs.gnu.org
Subject: Re: [bug#64910] [PATCH v2 0/3] gnu: docker: Update to 20.10.25.
Date: Sun, 27 Aug 2023 18:57:43 +0100

[Message part 1 (text/plain, inline)]

Hilton Chain via Guix-patches via <guix-patches <at> gnu.org> writes:

> Hilton Chain (3):
>   gnu: runc: Update to 1.1.9.
>   gnu: containerd: Update to 1.6.22.
>   gnu: docker: Update to 20.10.25.
>
>  gnu/packages/docker.scm         | 25 +++++++++++++++----------
>  gnu/packages/virtualization.scm |  4 ++--
>  2 files changed, 17 insertions(+), 12 deletions(-)

I haven't tried this out, but it seems like QA [1] is OK with the
changes. There are some red bits, but I think that's just some blocked
builds being counted as unknown.

1: https://qa.guix.gnu.org/issue/64910

[signature.asc (application/pgp-signature, inline)]

Message #37 received at 64910-done <at> debbugs.gnu.org (full text, mbox):

From: Hilton Chain <hako <at> ultrarare.space>
To: Christopher Baines <mail <at> cbaines.net>
Cc: 64910-done <at> debbugs.gnu.org
Subject: Re: [bug#64910] [PATCH v2 0/3] gnu: docker: Update to 20.10.25.
Date: Tue, 29 Aug 2023 23:16:39 +0800

On Mon, 28 Aug 2023 01:57:43 +0800,
Christopher Baines wrote:
> 
> [1  <text/plain (7bit)>]
> 
> Hilton Chain via Guix-patches via <guix-patches <at> gnu.org> writes:
> 
> > Hilton Chain (3):
> >   gnu: runc: Update to 1.1.9.
> >   gnu: containerd: Update to 1.6.22.
> >   gnu: docker: Update to 20.10.25.
> >
> >  gnu/packages/docker.scm         | 25 +++++++++++++++----------
> >  gnu/packages/virtualization.scm |  4 ++--
> >  2 files changed, 17 insertions(+), 12 deletions(-)
> 
> I haven't tried this out, but it seems like QA [1] is OK with the
> changes. There are some red bits, but I think that's just some blocked
> builds being counted as unknown.

Thanks for taking a look!  I have checked it again and pushed it to
master.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.