From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id +EBxMvHFSWdDpQAAe85BDQ:P1 (envelope-from ) for ; Fri, 29 Nov 2024 13:47:30 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id +EBxMvHFSWdDpQAAe85BDQ (envelope-from ) for ; Fri, 29 Nov 2024 14:47:29 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=dUWXs6QY; dkim=fail ("headers rsa verify failed") header.d=adriaan.se header.s=soverin header.b=Q+VwNkvQ; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3F191805E5 for ; Fri, 29 Nov 2024 14:47:28 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tH1L0-0006eP-AH; Fri, 29 Nov 2024 08:47:16 -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 ) id 1tH1Kp-0006dy-SW for guix-patches@gnu.org; Fri, 29 Nov 2024 08:47:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tH1Kp-0000Xh-Ie for guix-patches@gnu.org; Fri, 29 Nov 2024 08:47:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=5QwOgehCtn121VXg4j4U4P6bGiddZn+OndTtiQO15so=; b=dUWXs6QYNbhCquM7BRagspAUWPX1KihXEaS94n9IuqduTduWT9LrVpgmS/D00zWq2PNYejSyiMmexB2ERL+m/+ozk+B00w08wjwfn88q3ZH5s023Sg2HjWOHYZrVr6dq7sQAgtbNX3GbZXzPuhvAmmH+4/ycaOldjICiM5d0pENreB1x284lsoBksTKDqKpx8/TRq9h1b6aXN/MFmF31yZWJ0t7utO5ToxiT/T18rCv4LeRWzVae0tSbkqLS3TtI+rxAQGy4MLefSOG5raanxG+SPF8M0mWCFEOaaEmIg0EQVOvYBybc4GEFMgTk0Df7KQDV+H4wj4p5PxMxpS2qlA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tH1Kp-00012Y-3d for guix-patches@gnu.org; Fri, 29 Nov 2024 08:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74564] [PATCH v2] gnu: podman: Add docker output. References: <32690caa04b2bd67a1d0575218a6982051c4521f.1732751534.git.arjan@adriaan.se> In-Reply-To: <32690caa04b2bd67a1d0575218a6982051c4521f.1732751534.git.arjan@adriaan.se> Resent-From: Arjan Adriaanse Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Nov 2024 13:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74564 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74564@debbugs.gnu.org Cc: Arjan Adriaanse Received: via spool by 74564-submit@debbugs.gnu.org id=B74564.17328879853929 (code B ref 74564); Fri, 29 Nov 2024 13:47:02 +0000 Received: (at 74564) by debbugs.gnu.org; 29 Nov 2024 13:46:25 +0000 Received: from localhost ([127.0.0.1]:41542 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tH1KC-00011J-F0 for submit@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 ) id 1tH1K7-00010v-25 for 74564@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 Date: Fri, 29 Nov 2024 14:43:19 +0100 Message-ID: <27dfb449bb68b8c96feebe348ef57502b2d2da29.1732887799.git.arjan@adriaan.se> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spampanel-Class: ham X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 3F191805E5 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -7.76 X-Spam-Score: -7.76 X-TUID: 0X1f9gmKmPg7 * 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. ;;; Copyright © 2024 Jean-Pierre De Jesus DIAZ +;;; Copyright © 2024 Arjan Adriaanse ;;; ;;; 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