bug#61682: [PATCH] gnu: buildah: Add 'buildah' package

["Ludovic Courtès" <ludo@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

Hi,

Zongyuan Li <zongyuan.li@c0x0o.me> skribis:

> gnu: buildah: Add 'buildah' package
>
> Introduce new 'buildah' package
>
> * gnu/packages/containers.scm: New 'buildah' package

Finally applied with the changes below, most of which were suggested by
Liliana.

Thanks,
Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 2647 bytes --]

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index 839d81cd0e..eb7699c505 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -414,8 +414,10 @@ (define-public buildah
     (arguments
      (list #:import-path "github.com/containers/buildah/cmd/buildah"
            #:unpack-path "github.com/containers/buildah"
-            ; Some dependencies require go-1.18 to build
+
+           ;; Some dependencies require go-1.18 to build.
            #:go go-1.18
+
            #:tests? #f
            #:install-source? #f
            #:phases
@@ -433,14 +435,12 @@ (define-public buildah
                      (("/usr/local") (string-append #$output)))))
                (add-after 'build 'build-docs
                  (lambda* (#:key unpack-path #:allow-other-keys)
-                    (let*
-                      ((doc-path (string-append "src/" unpack-path "/docs")))
-                      (invoke "make" "-C" doc-path))))
+                   (let ((doc (string-append "src/" unpack-path "/docs")))
+                     (invoke "make" "-C" doc))))
                (add-after 'install 'install-docs
                  (lambda* (#:key unpack-path #:allow-other-keys)
-                    (let*
-                      ((doc-path (string-append "src/" unpack-path "/docs")))
-                      (invoke "make" "-C" doc-path "install")))))))
+                   (let ((doc (string-append "src/" unpack-path "/docs")))
+                     (invoke "make" "-C" doc "install")))))))
     (inputs (list btrfs-progs
                   cni-plugins
                   conmon
@@ -455,10 +455,23 @@ (define-public buildah
      (list go-github-com-go-md2man
            gnu-make
            pkg-config))
-    (synopsis
-     "Build Open Container Initiative images")
+    (synopsis "Build @acronym{OCI, Open Container Initiative} images")
     (description
-     "Buildah is used to build Open Container Initiative
-@acronym{OCI, Open Container Initiative} compatible containers.")
+     "Buildah is a command-line tool to build @acronym{OCI, Open Container
+Initiative} container images.  More generally, it can be used to:
+
+@itemize
+@item
+create a working container, either from scratch or using an image as a
+starting point;
+@item
+create an image, either from a working container or via the instructions
+in a @file{Dockerfile};
+@item
+mount a working container's root filesystem for manipulation;
+@item
+use the updated contents of a container's root filesystem as a filesystem
+layer to create a new image.
+@end itemize")
     (home-page "https://buildah.io")
     (license license:asl2.0)))