From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id oIlDKf6wR2enqAAA62LTzQ:P1 (envelope-from ) for ; Wed, 27 Nov 2024 23:53:34 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id oIlDKf6wR2enqAAA62LTzQ (envelope-from ) for ; Thu, 28 Nov 2024 00:53:34 +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=gS9eJGwy; dkim=fail ("headers rsa verify failed") header.d=adriaan.se header.s=soverin header.b="HXRT/XIr"; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732751614; a=rsa-sha256; cv=none; b=R/awlpQZyLv755AZ+5ScEoEy0KmS5AqosDnKYWO8arWmc6F6RdqPOJnrIL8N9HxLBQa/vx AJQnGlvArllEpNCbWpzdO/FhYeH6Di8wvfSqGr98DGzbgQKcQvs4HXP/WmUBm3YuDtWmMD Uef6FnY6hgolEHQNJ6otXj+AyPIX6vhj+98sz+9k5MMixhYYR0/RSyBL8iDXLYfs7luO2+ Ji6A5m16pldA+lRkndgB7rO/yi5ng767B1yWrnWAy47zNtQRAEVj1QL3g3M9pODWepSrzh gc67GvF3FX4geuUbbZLmohf5AXTxCjTSlSabFQMbmID+eVWA+Mu1KY6FkZ4NtQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=gS9eJGwy; dkim=fail ("headers rsa verify failed") header.d=adriaan.se header.s=soverin header.b="HXRT/XIr"; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732751614; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=6u5HlT3lrHRVwwWu8t8dtO5K9XHacOBe/+Z4IPegzgc=; b=pl8yEsfbVEAeivNuU10DHyZ+l4phaWWj36qjXssKks/TJXbFC3LyebT/sLLg/0QtTGWIQn EO16HgUDCMaBAkAzhvKoQ0i6+F3r5RtF54R1zY75pc8GOZ8HzS9pS4f7dLd0JuvRQvDXWk zHSgINL8jILuh4I9u2A2ebY9oNPW10J7XbLs+OfSJV34TtVFv5RIJvoAdAxy1BysSusblm hvwd+bi73Bsnowpv/0cCQRkpv4btdmFo2H+VRchjHhETXfuc0lzoo90dGVn0gN/azc5SAh Xoyje5n7oKSS3IPdmkjgfhqCD8ZJQY+4WNYeSunw4vVO6+qUKin6svBaDzujEQ== 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 103E08B5BC for ; Thu, 28 Nov 2024 00:53:34 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tGRqH-0003Ml-Uh; Wed, 27 Nov 2024 18:53:11 -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 1tGRqF-0003MW-AZ for guix-patches@gnu.org; Wed, 27 Nov 2024 18:53:07 -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 1tGRqB-0003gs-TT for guix-patches@gnu.org; Wed, 27 Nov 2024 18:53:04 -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:Subject; bh=6u5HlT3lrHRVwwWu8t8dtO5K9XHacOBe/+Z4IPegzgc=; b=gS9eJGwy/nc47ManxJ0zydmwbFXk96nu2V7djqWHSKs//6Tr1vnEyoH9oD1wKJ+C4/xgwMjs1OLJJYoU+tdLlYPjdOJqDcmE73RHhM3vEquqFYNdDyj5Ks3oe/X6boA9Y5AGEO4La16ApcaA6OIu77XfJBLzeve5jTMcDoxr7vJwBrDLEGNp6WzqefKJ3gHrs10+MWW4vgemofofrAyVil8JYje9aX1GKICw0E/0NU3hwjscqjO+aoHw2EaS7yGOMTVCu9nGYuDkZKwcbAS4kSMYN65plR6fFfA5OO7smWlZraPAt9l7tmCriFWIBmAdD1Sz5b0qVajxDeX9sFCcYQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tGRqA-0002g8-MX for guix-patches@gnu.org; Wed, 27 Nov 2024 18:53:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74564] [PATCH] gnu: Add podman-docker. Resent-From: Arjan Adriaanse Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Nov 2024 23:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74564 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74564@debbugs.gnu.org Cc: Arjan Adriaanse X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173275155710246 (code B ref -1); Wed, 27 Nov 2024 23:53:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Nov 2024 23:52:37 +0000 Received: from localhost ([127.0.0.1]:35491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGRpk-0002fB-G4 for submit@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 ) id 1tGRph-0002f0-W3 for submit@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 ) id 1tGRph-0003La-Mj for guix-patches@gnu.org; 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 ) id 1tGRpf-0003PD-2J for guix-patches@gnu.org; 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 Date: Thu, 28 Nov 2024 00:52:14 +0100 Message-ID: <32690caa04b2bd67a1d0575218a6982051c4521f.1732751534.git.arjan@adriaan.se> 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@adriaan.se; 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-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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -6.24 X-Spam-Score: -6.24 X-Migadu-Queue-Id: 103E08B5BC X-Migadu-Scanner: mx10.migadu.com X-TUID: LKrmez7KY7dA * 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. ;;; 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) @@ -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