GNU bug report logs - #74564
[PATCH] gnu: Add podman-docker.

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Package: guix-patches; Reported by: Arjan Adriaanse <arjan@HIDDEN>; Keywords: patch; dated Wed, 27 Nov 2024 23:53:02 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.

Message received at 74564 <at> debbugs.gnu.org:


Received: (at 74564) by debbugs.gnu.org; 29 Nov 2024 13:46:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 29 08:46:25 2024
Received: from localhost ([127.0.0.1]:41542 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tH1KC-00011J-F0
	for submit <at> debbugs.gnu.org; Fri, 29 Nov 2024 08:46:25 -0500
Received: from dane.soverin.net ([185.233.34.150]:54441)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <arjan@HIDDEN>) id 1tH1K7-00010v-25
 for 74564 <at> debbugs.gnu.org; Fri, 29 Nov 2024 08:46:22 -0500
Received: from smtp.freedom.nl (c04smtp-lb01.int.sover.in [10.10.4.74])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
 (No client certificate requested)
 by dane.soverin.net (Postfix) with ESMTPS id 4Y0Dwh1hBzzL5;
 Fri, 29 Nov 2024 13:46:12 +0000 (UTC)
Received: from smtp.freedom.nl (smtp.freedom.nl [10.10.4.108]) by freedom.nl
 (Postfix) with ESMTPSA id 4Y0Dwg4DJLz2xPN; 
 Fri, 29 Nov 2024 13:46:11 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=adriaan.se; s=soverin;
 t=1732887972; bh=8/SZ/eXqHEYPm2BP/v92rZI4fxdKaWFQi9gmudV6Tso=;
 h=From:To:Cc:Subject:Date:From;
 b=Q+VwNkvQq3nLcYilWqCppUcDyvvG7PYNc1mfEEzJgZ2FJl9NiKu6Ryt335VvT4vY0
 4BS3YZHcqdfDTBCztfHNm9C02rFMRUDEtq6h2HpE7sZ5cjwGrtWSgVpIL1ZUu1CNvh
 TFq7MxIla1FKIJApr3GXikP8clQyJHKaTJeL3HJalHoxyl1Sideetcdf/dtTLrqKy7
 94qKnWymg6ArU4V8JLQpMDqLNb3C3mciaKHC8xL7FcULh5Ng0zuWc874XZCurpI3mB
 gaV9dqObK+wjZ/3rpjmDQbGO6BqOtw4Aqi2CsnzjeNXadCH1XmTcMJeJDklOHG1BP0
 P5Q/qHPxq0j7Q==
From: Arjan Adriaanse <arjan@HIDDEN>
To: 74564 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: podman: Add docker output.
Date: Fri, 29 Nov 2024 14:43:19 +0100
Message-ID: <27dfb449bb68b8c96feebe348ef57502b2d2da29.1732887799.git.arjan@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spampanel-Class: ham
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74564
Cc: Arjan Adriaanse <arjan@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* 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@HIDDEN>
 ;;; Copyright © 2024 Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
+;;; Copyright © 2024 Arjan Adriaanse <arjan@HIDDEN>
 ;;;
 ;;; 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
Information forwarded to guix-patches@HIDDEN:
bug#74564; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 27 Nov 2024 23:52:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Nov 27 18:52:36 2024
Received: from localhost ([127.0.0.1]:35491 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tGRpk-0002fB-G4
	for submit <at> debbugs.gnu.org; Wed, 27 Nov 2024 18:52:36 -0500
Received: from lists.gnu.org ([209.51.188.17]:54494)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <arjan@HIDDEN>) id 1tGRph-0002f0-W3
 for submit <at> debbugs.gnu.org; Wed, 27 Nov 2024 18:52:34 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <arjan@HIDDEN>) id 1tGRph-0003La-Mj
 for guix-patches@HIDDEN; Wed, 27 Nov 2024 18:52:33 -0500
Received: from dane.soverin.net ([2a10:de80:1:4092:b9e9:229d:0:1])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <arjan@HIDDEN>) id 1tGRpf-0003PD-2J
 for guix-patches@HIDDEN; Wed, 27 Nov 2024 18:52:33 -0500
Received: from smtp.freedom.nl (c04smtp-lb01.int.sover.in [10.10.4.74])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
 (No client certificate requested)
 by dane.soverin.net (Postfix) with ESMTPS id 4XzGSx6zbQz10PS;
 Wed, 27 Nov 2024 23:52:17 +0000 (UTC)
Received: from smtp.freedom.nl (smtp.freedom.nl [10.10.4.108]) by freedom.nl
 (Postfix) with ESMTPSA id 4XzGSx0fz2z2xZB; 
 Wed, 27 Nov 2024 23:52:17 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=adriaan.se; s=soverin;
 t=1732751537; bh=KwdFPSl+CpcYLnGGJ2ewo3WnVtlzAnZZUR+T41p4Pho=;
 h=From:To:Cc:Subject:Date:From;
 b=HXRT/XIr5tlU5qwCR5VRVTAXXPSKOna4XPGyE6ff3joRYeSmXkwdUk8UC+L0nyzC0
 3LjQ2TDiN0mMEmW+hNMdPABtLAmrn3YQUiiRD4+MLA1EC7I1n5qxNf/S1wvPb5+1xz
 4s5joMn3z3e5qUWD4hN2U8NCwvM7Prr5FK0jX7insaCu3bkFQwVTRkgYBj8yRFQ2TZ
 pK+2zY3X3vPP1r+YD5xH525AssFtqBM+3v+OGLdfSHJ176bvzmjTcOzkJoU/BxUZR4
 XbLoOUP3r+I7lfczjM7+87pSOxc3YoAH+IjAJqicGyxT9HQDX12KYuEXXNvXC3djoD
 hjWTQhuUP6mdA==
From: Arjan Adriaanse <arjan@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: Add podman-docker.
Date: Thu, 28 Nov 2024 00:52:14 +0100
Message-ID: <32690caa04b2bd67a1d0575218a6982051c4521f.1732751534.git.arjan@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spampanel-Class: ham
Received-SPF: none client-ip=2a10:de80:1:4092:b9e9:229d:0:1;
 envelope-from=arjan@HIDDEN; helo=dane.soverin.net
X-Spam_score_int: -27
X-Spam_score: -2.8
X-Spam_bar: --
X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001,
 SPF_NONE=0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: submit
Cc: Arjan Adriaanse <arjan@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

* gnu/packages/containers.scm (podman-docker): New variable.

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

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index c638736cda..b606215842 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@HIDDEN>
 ;;; Copyright © 2024 Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
+;;; Copyright © 2024 Arjan Adriaanse <arjan@HIDDEN>
 ;;;
 ;;; 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)
@@ -576,6 +578,33 @@ (define-public podman
 @code{openssh} packages.")
     (license license:asl2.0)))
 
+(define-public podman-docker
+  (package/inherit podman
+    (name "podman-docker")
+    (native-inputs `(,@(package-native-inputs podman)
+                     ("gettext" ,gettext-minimal))) ; for envsubst
+    (propagated-inputs (list podman))
+    (build-system copy-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'set-env
+            (lambda _
+              ;; When running go, things fail because HOME=/homeless-shelter.
+              (setenv "HOME" "/tmp")
+              (setenv "PREFIX" #$output)
+              (setenv "ETCDIR" (string-append #$output "/etc"))))
+          (replace 'install
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "Makefile"
+                (("BINDIR=\\$\\{BINDIR\\}") ; directory of podman command
+                 (string-append "BINDIR=" (assoc-ref inputs "podman") "/bin"))
+                (("ETCDIR=\\$\\{ETCDIR\\}") ; configuration directory
+                 "ETCDIR='$${XDG_CONFIG_HOME}'"))
+              (invoke "make" "docker-docs" "install.docker-full"))))))
+    (synopsis "Emulate Docker CLI using Podman")))
+
 (define-public podman-compose
   (package
     (name "podman-compose")

base-commit: c6d15cf27a137051ccd8f301330a70dd0eecc3d4
-- 
2.46.0
Acknowledgement sent to Arjan Adriaanse <arjan@HIDDEN>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#74564; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Sun, 12 Jan 2025 05:45:02 UTC

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