all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Arjan Adriaanse <arjan@adriaan.se>
To: 74564@debbugs.gnu.org
Cc: Arjan Adriaanse <arjan@adriaan.se>
Subject: [bug#74564] [PATCH v2] gnu: podman: Add docker output.
Date: Fri, 29 Nov 2024 14:43:19 +0100	[thread overview]
Message-ID: <27dfb449bb68b8c96feebe348ef57502b2d2da29.1732887799.git.arjan@adriaan.se> (raw)
In-Reply-To: <32690caa04b2bd67a1d0575218a6982051c4521f.1732751534.git.arjan@adriaan.se>

* gnu/packages/containers.scm (podman-docker)[arguments]<#:phases>: Add
'override-docker-envsubst-args and 'install-docker.
[inputs]: Add gettext-minimal.
[outputs]: Add docker.

Change-Id: Ib6a3e0423d8257ce13e72ac12a908da42015cf8d
---
 gnu/packages/containers.scm | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index c638736cda..6cc1a199d2 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2024 Foundation Devices, Inc. <hello@foundation.xyz>
 ;;; Copyright © 2024 Jean-Pierre De Jesus DIAZ <jean@foundation.xyz>
+;;; Copyright © 2024 Arjan Adriaanse <arjan@adriaan.se>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -44,6 +45,7 @@ (define-module (gnu packages containers)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gnupg)
@@ -541,7 +543,20 @@ (define-public podman
           (add-after 'install 'install-completions
             (lambda _
               (invoke "make" "install.completions"
-                      (string-append "PREFIX=" #$output)))))))
+                      (string-append "PREFIX=" #$output))))
+          (add-after 'unpack 'override-docker-envsubst-args
+            (lambda _
+              (substitute* "Makefile"
+                ;; BINDIR is the directory of the podman command and
+                ;; ETCDIR is the system configuration directory.
+                (("envsubst < docker/docker.in")
+                 (string-append "BINDIR=" #$output "/bin ETCDIR=/etc "
+                                "envsubst < docker/docker.in")))))
+          (add-after 'install 'install-docker
+            (lambda _
+              (invoke "make" "docker-docs" "install.docker-full"
+                      (string-append "PREFIX=" #$output:docker)
+                      (string-append "ETCDIR=" #$output:docker "/etc")))))))
     (inputs
      (list bash-minimal
            btrfs-progs
@@ -553,12 +568,15 @@ (define-public podman
      (list (package/inherit grep
              (inputs (list pcre2)))     ; Drop once grep on master supports -P
            bats
+           gettext-minimal
            git
            go-1.22
            go-github-com-go-md2man
            mandoc
            pkg-config
            python))
+    (outputs '("out"
+               "docker")) ; Emulate Docker CLI
     (home-page "https://podman.io")
     (synopsis "Manage containers, images, pods, and their volumes")
     (description

base-commit: c6d15cf27a137051ccd8f301330a70dd0eecc3d4
-- 
2.46.0





      reply	other threads:[~2024-11-29 13:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-27 23:52 [bug#74564] [PATCH] gnu: Add podman-docker Arjan Adriaanse
2024-11-29 13:43 ` Arjan Adriaanse [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=27dfb449bb68b8c96feebe348ef57502b2d2da29.1732887799.git.arjan@adriaan.se \
    --to=arjan@adriaan.se \
    --cc=74564@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.