From: Zongyuan Li via Guix-patches via <guix-patches@gnu.org>
To: 61680@debbugs.gnu.org
Cc: ludo@gnu.org, liliana.prikler@gmail.com,
Zongyuan Li <zongyuan.li@c0x0o.me>
Subject: [bug#61680] [PATCH v3] gnu: podman: Add 'docker' alias script as 'docker' output
Date: Fri, 03 Mar 2023 08:08:55 +0000 [thread overview]
Message-ID: <20230303080821.81649-1-zongyuan.li@c0x0o.me> (raw)
In-Reply-To: <20230221143401.42099-1-zongyuan.li@c0x0o.me>
gnu: podman: Add 'docker' alias script as 'docker' output
changes since v2:
* Remove redundant trailing #t
* Adjust commit log
* gnu/packages/containers.scm (podman): New 'docker' output for podman
---
gnu/packages/containers.scm | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index b402bbde6a..b316588ea2 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -327,6 +327,9 @@ (define-public podman
(file-name (git-file-name name version))))
(build-system gnu-build-system)
+ (outputs '("out" "docker"))
+ (properties
+ `((output-synopsis "docker" "docker alias for podman")))
(arguments
(list
#:make-flags
@@ -349,7 +352,7 @@ (define-public podman
(invoke "make" "localsystem")
(invoke "make" "remotesystem"))))
(add-after 'unpack 'fix-hardcoded-paths
- (lambda _
+ (lambda* (#:key outputs #:allow-other-keys)
(substitute* (find-files "libpod" "\\.go")
(("exec.LookPath[(][\"]slirp4netns[\"][)]")
(string-append "exec.LookPath(\""
@@ -365,7 +368,14 @@ (define-public podman
(("/usr/local/libexec/cni")
(string-append #$(this-package-input "cni-plugins")
"/bin"))
- (("/usr/bin/crun") (which "crun")))))
+ (("/usr/bin/crun") (which "crun")))
+ (substitute* "docker"
+ (("/usr/bin/podman") (string-append (assoc-ref outputs "out")
+ "/bin/podman")))))
+ (add-after 'install 'install-docker
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((docker (assoc-ref outputs "docker")))
+ (install-file "docker" (string-append docker "/bin")))))
(add-after 'install 'install-completions
(lambda _
(invoke "make" "install.completions"
--
2.37.1 (Apple Git-137.1)
next prev parent reply other threads:[~2023-03-03 8:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-21 14:34 [bug#61680] [PATCH] gnu: podman: Add 'docker' alias script as 'docker' output Zongyuan Li via Guix-patches via
2023-02-22 5:19 ` Liliana Marie Prikler
2023-02-22 5:52 ` lWP6SrZsSwhCy5tUxadDfg via Guix-patches via
2023-02-22 19:23 ` Liliana Marie Prikler
2023-02-23 6:56 ` [bug#61680] [PATCH v2] " Zongyuan Li via Guix-patches via
2023-03-02 18:35 ` [bug#61680] [PATCH] " Ludovic Courtès
2023-03-03 6:30 ` Zongyuan Li via Guix-patches via
2023-03-03 8:08 ` Zongyuan Li via Guix-patches via [this message]
2023-03-24 10:29 ` [bug#61680] [PATCH v3] " Zongyuan Li via Guix-patches via
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230303080821.81649-1-zongyuan.li@c0x0o.me \
--to=guix-patches@gnu.org \
--cc=61680@debbugs.gnu.org \
--cc=liliana.prikler@gmail.com \
--cc=ludo@gnu.org \
--cc=zongyuan.li@c0x0o.me \
/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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).