GNU bug report logs - #66887
Subject: [PATCH 0/3] catatonit for podman

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 66887 in the body.
You can then email your comments to 66887 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: Wilke Schwiedop <wilke.schwiedop <at> agfa.com>
To: "guix-patches <at> gnu.org" <guix-patches <at> gnu.org>
Subject: Subject: [PATCH 0/3] catatonit for podman
Date: Wed, 1 Nov 2023 18:23:25 +0000

Add catatonit package and include it in podman.
catatonit is required for rootless `podman play kube` command to work
as podman will just abort if the catatonit binary cannot be found.

Wilke Schwiedop (3):
  gnu: Add catatonit
  gnu: podman: Use catatonit
  remove outdated comment

 gnu/packages/containers.scm | 42 ++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)


base-commit: 2b5c6e1a41e4ddcf4cfa53a319ed784a856eac5d
-- 
2.41.0

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

From: Wilke Schwiedop <wilke.schwiedop <at> agfa.com>
To: "66887 <at> debbugs.gnu.org" <66887 <at> debbugs.gnu.org>
Subject: Subject: [PATCH 1/3] gnu: Add catatonit
Date: Wed, 1 Nov 2023 18:45:57 +0000

* gnu/packages/containers.scm (catatonit): New variable.
---
 gnu/packages/containers.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index a3aa9ac1db..e26b5acf21 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -309,6 +309,27 @@ (define-public cni-plugins
 
 ;; For podman to work, the user needs to run
 ;; `sudo mount -t cgroup2 none /sys/fs/cgroup`
+(define-public catatonit
+  (package
+    (name "catatonit")
+    (version "0.1.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/openSUSE/catatonit")
+             ; include fix for a build error that was merged shortly after 0.1.7
+             (commit "cf1fd8a1cc9a40a2c66019d9546891912419d747")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0ac3vfs5d1ka6q21wr4cya9ka8w4c3z1syzdq9sgrks7qnnkxm2h"))))
+    (build-system gnu-build-system)
+    (native-inputs (list autoconf automake libtool))
+    (synopsis "Container init")
+    (description "A container init that is so simple it's effectively brain-dead.")
+    (home-page "https://github.com/openSUSE/catatonit")
+    (license license:gpl3)))
 
 (define-public podman
   (package
-- 
2.41.0

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

From: Wilke Schwiedop <wilke.schwiedop <at> agfa.com>
To: "66887 <at> debbugs.gnu.org" <66887 <at> debbugs.gnu.org>
Subject: Subject: [PATCH 2/3] gnu: podman: Use catatonit
Date: Wed, 1 Nov 2023 18:47:02 +0000

defaultHelperBinariesDir is a string array of paths searched by the
FindHelperBinary function. This patch inserts new entries at the
beginning of array instead of modifying individual elements. This will
make it easier to include additional helper binaries, e.g. aardvark,
netavark and pasta.
---
 gnu/packages/containers.scm | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index e26b5acf21..c00394af2b 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -381,22 +381,31 @@ (define-public podman
                 (("CATATONIT_PATH=\"[^\"]+\"")
                  (string-append "CATATONIT_PATH=" (which "true"))))
               (substitute* "vendor/github.com/containers/common/pkg/config/config_linux.go"
-                (("/usr/local/libexec/podman")
-                 (string-append #$output "/libexec/podman"))
-                (("/usr/local/lib/podman")
-                 (string-append #$output "/bin")))
+                (("var defaultHelperBinariesDir = ..string." all)
+                 (string-append
+                  all
+                  (string-join
+                   (map (lambda (s) (string-append "\n\"" s "\","))
+                        (list
+                         (string-append #$output "/libexec/podman")
+                         (string-append #$output "/bin")
+                         (string-append #$(this-package-input "catatonit") "/bin")))))))
               (substitute* "vendor/github.com/containers/common/pkg/config/default.go"
                 (("/usr/libexec/podman/conmon") (which "conmon"))
                 (("/usr/local/libexec/cni")
                  (string-append #$(this-package-input "cni-plugins")
                                 "/bin"))
-                (("/usr/bin/crun") (which "crun")))))
+                (("/usr/bin/crun") (which "crun"))
+                (("/usr/libexec/podman/catatonit") (which "catatonit")))
+              (substitute* "pkg/rootless/rootless_linux.c"
+                (("/usr/bin/catatonit") (which "catatonit")))))
           (add-after 'install 'install-completions
             (lambda _
               (invoke "make" "install.completions"
                       (string-append "PREFIX=" #$output)))))))
     (inputs
      (list btrfs-progs
+           catatonit
            cni-plugins
            conmon
            crun
-- 
2.41.0

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

From: Wilke Schwiedop <wilke.schwiedop <at> agfa.com>
To: "66887 <at> debbugs.gnu.org" <66887 <at> debbugs.gnu.org>
Subject: Subject: [PATCH 3/3] remove outdated comment
Date: Wed, 1 Nov 2023 18:47:54 +0000

cgroup2 is now the default in guix
---
 gnu/packages/containers.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index c00394af2b..b864f83dcf 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -307,8 +307,6 @@ (define-public cni-plugins
 configure network interfaces in Linux containers.")
     (license license:asl2.0)))
 
-;; For podman to work, the user needs to run
-;; `sudo mount -t cgroup2 none /sys/fs/cgroup`
 (define-public catatonit
   (package
     (name "catatonit")
-- 
2.41.0

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

From: Jack Hill <jackhill <at> jackhill.us>
To: Wilke Schwiedop <wilke.schwiedop <at> agfa.com>
Cc: 66887 <at> debbugs.gnu.org
Subject: [PATCH v2 0/3] resending catatonit patches for QA
Date: Wed, 8 Nov 2023 12:22:53 -0500 (EST)

Hi Guix,

I'm resending the catatonit series because it wasn't picked up properly by 
patchwork/QA the first time. I haven't done a review of the patches, but 
it does look like the commit messages will need to be re-worded to fit our 
style.

Best,
Jack

Wilke Schwiedop (3):
  gnu: Add catatonit.
  gnu: podman: Use catatonit.
  remove outdated comment

 gnu/packages/containers.scm | 42 ++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)


base-commit: 00fd6895322d0b1fd774e79494cfcad721b50b8d
-- 
2.41.0

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

From: Jack Hill <jackhill <at> jackhill.us>
To: 66887 <at> debbugs.gnu.org
Cc: Wilke Schwiedop <wilke.schwiedop <at> agfa.com>
Subject: [PATCH v2 1/3] gnu: Add catatonit.
Date: Wed,  8 Nov 2023 12:24:55 -0500

From: Wilke Schwiedop <wilke.schwiedop <at> agfa.com>

* gnu/packages/containers.scm (catatonit): New variable.

Change-Id: Ib6948bde8204426a8cb008982cb7cc9302f9e6d6
---
 gnu/packages/containers.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index a3aa9ac1db..e26b5acf21 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -309,6 +309,27 @@ (define-public cni-plugins
 
 ;; For podman to work, the user needs to run
 ;; `sudo mount -t cgroup2 none /sys/fs/cgroup`
+(define-public catatonit
+  (package
+    (name "catatonit")
+    (version "0.1.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/openSUSE/catatonit")
+             ; include fix for a build error that was merged shortly after 0.1.7
+             (commit "cf1fd8a1cc9a40a2c66019d9546891912419d747")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0ac3vfs5d1ka6q21wr4cya9ka8w4c3z1syzdq9sgrks7qnnkxm2h"))))
+    (build-system gnu-build-system)
+    (native-inputs (list autoconf automake libtool))
+    (synopsis "Container init")
+    (description "A container init that is so simple it's effectively brain-dead.")
+    (home-page "https://github.com/openSUSE/catatonit")
+    (license license:gpl3)))
 
 (define-public podman
   (package

base-commit: 00fd6895322d0b1fd774e79494cfcad721b50b8d
-- 
2.41.0

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

From: Jack Hill <jackhill <at> jackhill.us>
To: 66887 <at> debbugs.gnu.org
Cc: Wilke Schwiedop <wilke.schwiedop <at> agfa.com>
Subject: [PATCH v2 2/3] gnu: podman: Use catatonit.
Date: Wed,  8 Nov 2023 12:24:56 -0500

From: Wilke Schwiedop <wilke.schwiedop <at> agfa.com>

defaultHelperBinariesDir is a string array of paths searched by the
FindHelperBinary function. This patch inserts new entries at the
beginning of array instead of modifying individual elements. This will
make it easier to include additional helper binaries, e.g. aardvark,
netavark and pasta.

Change-Id: I2f988b9225f3fcee7f00c48ba3aedc9289ba9d47
---
 gnu/packages/containers.scm | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index e26b5acf21..c00394af2b 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -381,22 +381,31 @@ (define-public podman
                 (("CATATONIT_PATH=\"[^\"]+\"")
                  (string-append "CATATONIT_PATH=" (which "true"))))
               (substitute* "vendor/github.com/containers/common/pkg/config/config_linux.go"
-                (("/usr/local/libexec/podman")
-                 (string-append #$output "/libexec/podman"))
-                (("/usr/local/lib/podman")
-                 (string-append #$output "/bin")))
+                (("var defaultHelperBinariesDir = ..string." all)
+                 (string-append
+                  all
+                  (string-join
+                   (map (lambda (s) (string-append "\n\"" s "\","))
+                        (list
+                         (string-append #$output "/libexec/podman")
+                         (string-append #$output "/bin")
+                         (string-append #$(this-package-input "catatonit") "/bin")))))))
               (substitute* "vendor/github.com/containers/common/pkg/config/default.go"
                 (("/usr/libexec/podman/conmon") (which "conmon"))
                 (("/usr/local/libexec/cni")
                  (string-append #$(this-package-input "cni-plugins")
                                 "/bin"))
-                (("/usr/bin/crun") (which "crun")))))
+                (("/usr/bin/crun") (which "crun"))
+                (("/usr/libexec/podman/catatonit") (which "catatonit")))
+              (substitute* "pkg/rootless/rootless_linux.c"
+                (("/usr/bin/catatonit") (which "catatonit")))))
           (add-after 'install 'install-completions
             (lambda _
               (invoke "make" "install.completions"
                       (string-append "PREFIX=" #$output)))))))
     (inputs
      (list btrfs-progs
+           catatonit
            cni-plugins
            conmon
            crun
-- 
2.41.0

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

From: Jack Hill <jackhill <at> jackhill.us>
To: 66887 <at> debbugs.gnu.org
Cc: Wilke Schwiedop <wilke.schwiedop <at> agfa.com>
Subject: [PATCH v2 3/3] remove outdated comment
Date: Wed,  8 Nov 2023 12:24:57 -0500

From: Wilke Schwiedop <wilke.schwiedop <at> agfa.com>

cgroup2 is now the default in guix

Change-Id: I58ab46ec4b16f6e458c363a4a914ccac088e71ba
---
 gnu/packages/containers.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index c00394af2b..b864f83dcf 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -307,8 +307,6 @@ (define-public cni-plugins
 configure network interfaces in Linux containers.")
     (license license:asl2.0)))
 
-;; For podman to work, the user needs to run
-;; `sudo mount -t cgroup2 none /sys/fs/cgroup`
 (define-public catatonit
   (package
     (name "catatonit")
-- 
2.41.0

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

From: Wilke Schwiedop <wilke.schwiedop <at> agfa.com>
To: "66887 <at> debbugs.gnu.org" <66887 <at> debbugs.gnu.org>
Subject: RE: [PATCH v2 0/3] resending catatonit patches for QA
Date: Sun, 19 Nov 2023 11:45:06 +0000

Hello Jack,

thank you for re-submitting the patch-series. Is there any progress on the review of these patches or is there anything that can be done from my end?

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

From: Wilke Schwiedop <wilke.schwiedop <at> agfa.com>
To: "66887 <at> debbugs.gnu.org" <66887 <at> debbugs.gnu.org>
Subject: Superceded by #70112
Date: Mon, 1 Apr 2024 15:23:51 +0000

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

Issue can be closed as changes have been incorporated in #70112

[Message part 2 (text/html, inline)]

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

From: Simon Tournier <zimon.toutoune <at> gmail.com>
To: Wilke Schwiedop <wilke.schwiedop <at> agfa.com>, "66887 <at> debbugs.gnu.org"
 <66887-done <at> debbugs.gnu.org>
Subject: Re: [bug#66887] Superceded by #70112
Date: Wed, 22 May 2024 16:01:47 +0200

Hi,

On lun., 01 avril 2024 at 15:23, Wilke Schwiedop via Guix-patches via <guix-patches <at> gnu.org> wrote:

> Issue can be closed as changes have been incorporated in #70112

So closing.

Cheers,
simon

Previous Next

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