* [bug#61680] [PATCH] gnu: podman: Add 'docker' alias script as 'docker' output
@ 2023-02-21 14:34 Zongyuan Li via Guix-patches via
2023-02-22 5:19 ` Liliana Marie Prikler
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Zongyuan Li via Guix-patches via @ 2023-02-21 14:34 UTC (permalink / raw)
To: 61680; +Cc: Zongyuan Li
* gnu/packages/containers.scm: New 'docker' output for podman
Signed-off-by: Zongyuan Li <zongyuan.li@c0x0o.me>
---
gnu/packages/containers.scm | 157 +++++++++++++++++++-----------------
1 file changed, 83 insertions(+), 74 deletions(-)
diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index 272b67c38d..80c4aaa400 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -312,83 +312,92 @@ (define-public podman
(package
(name "podman")
(version "4.3.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/containers/podman")
- (commit (string-append "v" version))))
- (modules '((guix build utils)))
- ;; FIXME: Btrfs libraries not detected by these scripts.
- (snippet '(substitute* "Makefile"
- ((".*hack/btrfs.*") "")))
- (sha256
- (base32 "05hv4xdf06n728lmsx793zygypc9i404bgcgpy0fyrg8c2s11q2h"))
- (file-name (git-file-name name version))))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/containers/podman")
+ (commit (string-append "v" version))))
+ (modules '((guix build utils)))
+ ;; FIXME: Btrfs libraries not detected by these scripts.
+ (snippet '(substitute* "Makefile"
+ ((".*hack/btrfs.*")
+ "")))
+ (sha256
+ (base32
+ "05hv4xdf06n728lmsx793zygypc9i404bgcgpy0fyrg8c2s11q2h"))
+ (file-name (git-file-name name version))))
(build-system gnu-build-system)
+ (outputs '("out" "docker"))
(arguments
- (list
- #:make-flags
- #~(list #$(string-append "CC=" (cc-for-target))
- (string-append "PREFIX=" #$output))
- #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox
- #:test-target "test"
- #:phases
- #~(modify-phases %standard-phases
- (delete 'configure)
- (add-after 'unpack 'set-env
- (lambda* (#:key inputs #:allow-other-keys)
- ;; when running go, things fail because
- ;; HOME=/homeless-shelter.
- (setenv "HOME" "/tmp")))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- ;; (invoke "strace" "-f" "bin/podman" "version")
- (invoke "make" "localsystem")
- (invoke "make" "remotesystem"))))
- (add-after 'unpack 'fix-hardcoded-paths
- (lambda _
- (substitute* (find-files "libpod" "\\.go")
- (("exec.LookPath[(][\"]slirp4netns[\"][)]")
- (string-append "exec.LookPath(\""
- (which "slirp4netns") "\")")))
- (substitute* "hack/install_catatonit.sh"
- (("CATATONIT_PATH=\"[^\"]+\"")
- (string-append "CATATONIT_PATH=" (which "true"))))
- (substitute* "vendor/github.com/containers/common/pkg/config/config_linux.go"
- (("/usr/local/libexec/podman")
- (string-append #$output "/bin")))
- (substitute* "vendor/github.com/containers/common/pkg/config/default.go"
- (("/usr/libexec/podman/conmon") (which "conmon"))
- (("/usr/local/libexec/cni")
- (string-append #$(this-package-input "cni-plugins")
- "/bin"))
- (("/usr/bin/crun") (which "crun")))))
- (add-after 'install 'install-completions
- (lambda _
- (invoke "make" "install.completions"
- (string-append "PREFIX=" #$output)))))))
- (inputs
- (list btrfs-progs
- cni-plugins
- conmon
- crun
- gpgme
- go-github-com-go-md2man
- iptables
- libassuan
- libseccomp
- libselinux
- slirp4netns))
- (native-inputs
- (list bats
- git
- go
- ; strace ; XXX debug
- pkg-config
- python))
+ (list #:make-flags #~(list #$(string-append "CC="
+ (cc-for-target))
+ (string-append "PREFIX="
+ #$output))
+ #:tests? #f ;/sys/fs/cgroup not set up in guix sandbox
+ #:test-target "test"
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'unpack 'set-env
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "HOME" "/tmp")))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "make" "localsystem")
+ (invoke "make" "remotesystem"))))
+ (add-after 'unpack 'fix-hardcoded-paths
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* (find-files "libpod" "\\.go")
+ (("exec.LookPath[(][\"]slirp4netns[\"][)]")
+ (string-append "exec.LookPath(\""
+ (which "slirp4netns") "\")")))
+ (substitute* "hack/install_catatonit.sh"
+ (("CATATONIT_PATH=\"[^\"]+\"")
+ (string-append "CATATONIT_PATH="
+ (which "true"))))
+ (substitute* "vendor/github.com/containers/common/pkg/config/config_linux.go"
+ (("/usr/local/libexec/podman")
+ (string-append #$output "/bin")))
+ (substitute* "vendor/github.com/containers/common/pkg/config/default.go"
+ (("/usr/libexec/podman/conmon")
+ (which "conmon"))
+ (("/usr/local/libexec/cni")
+ (string-append #$(this-package-input
+ "cni-plugins") "/bin"))
+ (("/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")) #t)))
+ (add-after 'install 'install-completions
+ (lambda _
+ (invoke "make" "install.completions"
+ (string-append "PREFIX="
+ #$output)))))))
+ (inputs (list btrfs-progs
+ cni-plugins
+ conmon
+ crun
+ gpgme
+ go-github-com-go-md2man
+ iptables
+ libassuan
+ libseccomp
+ libselinux
+ slirp4netns))
+ (native-inputs (list bats
+ git
+ go
+ ;; strace ; XXX debug
+ pkg-config
+ python))
(home-page "https://podman.io")
(synopsis "Manage containers, images, pods, and their volumes")
(description
--
2.37.1 (Apple Git-137.1)
^ permalink raw reply related [flat|nested] 9+ messages in thread* [bug#61680] [PATCH] gnu: podman: Add 'docker' alias script as 'docker' output
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-23 6:56 ` [bug#61680] [PATCH v2] " Zongyuan Li via Guix-patches via
2023-03-03 8:08 ` [bug#61680] [PATCH v3] " Zongyuan Li via Guix-patches via
2 siblings, 1 reply; 9+ messages in thread
From: Liliana Marie Prikler @ 2023-02-22 5:19 UTC (permalink / raw)
To: Zongyuan Li, 61680
Am Dienstag, dem 21.02.2023 um 14:34 +0000 schrieb Zongyuan Li:
> * gnu/packages/containers.scm: New 'docker' output for podman
That ChangeLog looks somewhat incomplete.
> Signed-off-by: Zongyuan Li <zongyuan.li@c0x0o.me>
Signed-off-by is for committers signing off the commits.
> ---
> gnu/packages/containers.scm | 157 +++++++++++++++++++---------------
> --
> 1 file changed, 83 insertions(+), 74 deletions(-)
>
> diff --git a/gnu/packages/containers.scm
> b/gnu/packages/containers.scm
> index 272b67c38d..80c4aaa400 100644
> --- a/gnu/packages/containers.scm
> +++ b/gnu/packages/containers.scm
> @@ -312,83 +312,92 @@ (define-public podman
> (package
> (name "podman")
> (version "4.3.1")
> - (source
> - (origin
> - (method git-fetch)
> - (uri (git-reference
> - (url "https://github.com/containers/podman")
> - (commit (string-append "v" version))))
> - (modules '((guix build utils)))
> - ;; FIXME: Btrfs libraries not detected by these scripts.
> - (snippet '(substitute* "Makefile"
> - ((".*hack/btrfs.*") "")))
> - (sha256
> - (base32
> "05hv4xdf06n728lmsx793zygypc9i404bgcgpy0fyrg8c2s11q2h"))
> - (file-name (git-file-name name version))))
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/containers/podman")
> + (commit (string-append "v" version))))
> + (modules '((guix build utils)))
> + ;; FIXME: Btrfs libraries not detected by these
> scripts.
> + (snippet '(substitute* "Makefile"
> + ((".*hack/btrfs.*")
> + "")))
> + (sha256
> + (base32
> +
> "05hv4xdf06n728lmsx793zygypc9i404bgcgpy0fyrg8c2s11q2h"))
> + (file-name (git-file-name name version))))
Don't mix style changes with functional ones. `guix style', while
recommended in the manual, often does more harm than good.
> + (outputs '("out" "docker"))
Since this is a very non-standard output, perhaps try describing it
with a output-synopsis package property.
Cheers
^ permalink raw reply [flat|nested] 9+ messages in thread* [bug#61680] [PATCH] gnu: podman: Add 'docker' alias script as 'docker' output
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
0 siblings, 1 reply; 9+ messages in thread
From: lWP6SrZsSwhCy5tUxadDfg via Guix-patches via @ 2023-02-22 5:52 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: 61680
> On Feb 22, 2023, at 13:19, Liliana Marie Prikler <liliana.prikler@gmail.com> wrote:
>
> Am Dienstag, dem 21.02.2023 um 14:34 +0000 schrieb Zongyuan Li:
>> * gnu/packages/containers.scm: New 'docker' output for podman
> That ChangeLog looks somewhat incomplete.
>
>> Signed-off-by: Zongyuan Li <zongyuan.li@c0x0o.me>
> Signed-off-by is for committers signing off the commits.
>
>> ---
>> gnu/packages/containers.scm | 157 +++++++++++++++++++---------------
>> --
>> 1 file changed, 83 insertions(+), 74 deletions(-)
>>
>> diff --git a/gnu/packages/containers.scm
>> b/gnu/packages/containers.scm
>> index 272b67c38d..80c4aaa400 100644
>> --- a/gnu/packages/containers.scm
>> +++ b/gnu/packages/containers.scm
>> @@ -312,83 +312,92 @@ (define-public podman
>> (package
>> (name "podman")
>> (version "4.3.1")
>> - (source
>> - (origin
>> - (method git-fetch)
>> - (uri (git-reference
>> - (url "https://github.com/containers/podman")
>> - (commit (string-append "v" version))))
>> - (modules '((guix build utils)))
>> - ;; FIXME: Btrfs libraries not detected by these scripts.
>> - (snippet '(substitute* "Makefile"
>> - ((".*hack/btrfs.*") "")))
>> - (sha256
>> - (base32
>> "05hv4xdf06n728lmsx793zygypc9i404bgcgpy0fyrg8c2s11q2h"))
>> - (file-name (git-file-name name version))))
>> + (source (origin
>> + (method git-fetch)
>> + (uri (git-reference
>> + (url "https://github.com/containers/podman")
>> + (commit (string-append "v" version))))
>> + (modules '((guix build utils)))
>> + ;; FIXME: Btrfs libraries not detected by these
>> scripts.
>> + (snippet '(substitute* "Makefile"
>> + ((".*hack/btrfs.*")
>> + "")))
>> + (sha256
>> + (base32
>> +
>> "05hv4xdf06n728lmsx793zygypc9i404bgcgpy0fyrg8c2s11q2h"))
>> + (file-name (git-file-name name version))))
> Don't mix style changes with functional ones. `guix style', while
> recommended in the manual, often does more harm than good.
>
>> + (outputs '("out" "docker"))
> Since this is a very non-standard output, perhaps try describing it
> with a output-synopsis package property.
>
> Cheers
Thanks for the review. I will take a look :)
By the way, should I post a new v2 patch in a new thread, or just continue with this one?
^ permalink raw reply [flat|nested] 9+ messages in thread* [bug#61680] [PATCH] gnu: podman: Add 'docker' alias script as 'docker' output
2023-02-22 5:52 ` lWP6SrZsSwhCy5tUxadDfg via Guix-patches via
@ 2023-02-22 19:23 ` Liliana Marie Prikler
0 siblings, 0 replies; 9+ messages in thread
From: Liliana Marie Prikler @ 2023-02-22 19:23 UTC (permalink / raw)
To: lWP6SrZsSwhCy5tUxadDfg; +Cc: 61680
Am Mittwoch, dem 22.02.2023 um 05:52 +0000 schrieb
lWP6SrZsSwhCy5tUxadDfg:
>
>
> > On Feb 22, 2023, at 13:19, Liliana Marie Prikler
> > <liliana.prikler@gmail.com> wrote:
> >
> > Am Dienstag, dem 21.02.2023 um 14:34 +0000 schrieb Zongyuan Li:
> > > * gnu/packages/containers.scm: New 'docker' output for podman
> > That ChangeLog looks somewhat incomplete.
> >
> > > Signed-off-by: Zongyuan Li <zongyuan.li@c0x0o.me>
> > Signed-off-by is for committers signing off the commits.
> >
> > > ---
> > > gnu/packages/containers.scm | 157 +++++++++++++++++++-----------
> > > ----
> > > --
> > > 1 file changed, 83 insertions(+), 74 deletions(-)
> > >
> > > diff --git a/gnu/packages/containers.scm
> > > b/gnu/packages/containers.scm
> > > index 272b67c38d..80c4aaa400 100644
> > > --- a/gnu/packages/containers.scm
> > > +++ b/gnu/packages/containers.scm
> > > @@ -312,83 +312,92 @@ (define-public podman
> > > (package
> > > (name "podman")
> > > (version "4.3.1")
> > > - (source
> > > - (origin
> > > - (method git-fetch)
> > > - (uri (git-reference
> > > - (url "https://github.com/containers/podman")
> > > - (commit (string-append "v" version))))
> > > - (modules '((guix build utils)))
> > > - ;; FIXME: Btrfs libraries not detected by these scripts.
> > > - (snippet '(substitute* "Makefile"
> > > - ((".*hack/btrfs.*") "")))
> > > - (sha256
> > > - (base32
> > > "05hv4xdf06n728lmsx793zygypc9i404bgcgpy0fyrg8c2s11q2h"))
> > > - (file-name (git-file-name name version))))
> > > + (source (origin
> > > + (method git-fetch)
> > > + (uri (git-reference
> > > + (url "https://github.com/containers/podman")
> > > + (commit (string-append "v" version))))
> > > + (modules '((guix build utils)))
> > > + ;; FIXME: Btrfs libraries not detected by these
> > > scripts.
> > > + (snippet '(substitute* "Makefile"
> > > + ((".*hack/btrfs.*")
> > > + "")))
> > > + (sha256
> > > + (base32
> > > +
> > > "05hv4xdf06n728lmsx793zygypc9i404bgcgpy0fyrg8c2s11q2h"))
> > > + (file-name (git-file-name name version))))
> > Don't mix style changes with functional ones. `guix style', while
> > recommended in the manual, often does more harm than good.
> >
> > > + (outputs '("out" "docker"))
> > Since this is a very non-standard output, perhaps try describing it
> > with a output-synopsis package property.
> >
> > Cheers
>
> Thanks for the review. I will take a look :)
> By the way, should I post a new v2 patch in a new thread, or just
> continue with this one?
Established practise is to bump the reroll count (-v2 -v3 ...) and
reply to the existing thread.
Cheers
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#61680] [PATCH v2] gnu: podman: Add 'docker' alias script as 'docker' output
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-23 6:56 ` Zongyuan Li via Guix-patches via
2023-03-02 18:35 ` [bug#61680] [PATCH] " Ludovic Courtès
2023-03-03 8:08 ` [bug#61680] [PATCH v3] " Zongyuan Li via Guix-patches via
2 siblings, 1 reply; 9+ messages in thread
From: Zongyuan Li via Guix-patches via @ 2023-02-23 6:56 UTC (permalink / raw)
To: 61680; +Cc: liliana.prikler, zongyuan.li
Introduces a output named 'docker' in podman package. This
output provides a 'docker' alias for podman. Since their
cmd interface are identical, this simple script just act
the same as 'alias docker=podman', with some additional
checks and notification.
Changes since v1:
* Add more details in commit messages
* Revert style format
* Add output-synopsis for 'docker' output
* gnu/packages/containers.scm: 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 272b67c38d..50dfa88421 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")) #t)))
(add-after 'install 'install-completions
(lambda _
(invoke "make" "install.completions"
--
2.37.1 (Apple Git-137.1)
^ permalink raw reply related [flat|nested] 9+ messages in thread* [bug#61680] [PATCH] gnu: podman: Add 'docker' alias script as 'docker' output
2023-02-23 6:56 ` [bug#61680] [PATCH v2] " Zongyuan Li via Guix-patches via
@ 2023-03-02 18:35 ` Ludovic Courtès
2023-03-03 6:30 ` Zongyuan Li via Guix-patches via
0 siblings, 1 reply; 9+ messages in thread
From: Ludovic Courtès @ 2023-03-02 18:35 UTC (permalink / raw)
To: Zongyuan Li; +Cc: 61680, liliana.prikler
Hi,
Zongyuan Li <zongyuan.li@c0x0o.me> skribis:
> Introduces a output named 'docker' in podman package. This
> output provides a 'docker' alias for podman. Since their
> cmd interface are identical, this simple script just act
> the same as 'alias docker=podman', with some additional
> checks and notification.
>
> Changes since v1:
>
> * Add more details in commit messages
> * Revert style format
> * Add output-synopsis for 'docker' output
>
> * gnu/packages/containers.scm: New 'docker' output for podman
Regarding the commit log, please check ‘git log’ and the “Submitting
Patches” of the manual for convention. We can tweak that for you if you
want, but basically it’s about describe what has changed, not why.
> 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 272b67c38d..50dfa88421 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")))
Are there downsides to having the ‘docker’ command directly in “out”?
I would prefer that because it’d be more easily discovered.
> (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")) #t)))
No need for a trailing #t.
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 9+ messages in thread* [bug#61680] [PATCH] gnu: podman: Add 'docker' alias script as 'docker' output
2023-03-02 18:35 ` [bug#61680] [PATCH] " Ludovic Courtès
@ 2023-03-03 6:30 ` Zongyuan Li via Guix-patches via
0 siblings, 0 replies; 9+ messages in thread
From: Zongyuan Li via Guix-patches via @ 2023-03-03 6:30 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 61680, Liliana Marie Prikler
Hi,
Thanks for the review, Ludovic
> On Mar 3, 2023, at 02:35, Ludovic Courtès <ludo@gnu.org> wrote:
>
> Regarding the commit log, please check ‘git log’ and the “Submitting
> Patches” of the manual for convention. We can tweak that for you if you
> want, but basically it’s about describe what has changed, not why.
I will try to fix it in next version, but I’m ok if you want to tweak that.
> Are there downsides to having the ‘docker’ command directly in “out”?
>
> I would prefer that because it’d be more easily discovered.
‘docker’ alias in podman will conflict with the real docker package.
If user wants both podman and docker package installed on their
system, it’s better to put alias in a seperate output.
> No need for a trailing #t.
ACK
Li
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#61680] [PATCH v3] gnu: podman: Add 'docker' alias script as 'docker' output
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-23 6:56 ` [bug#61680] [PATCH v2] " Zongyuan Li via Guix-patches via
@ 2023-03-03 8:08 ` Zongyuan Li via Guix-patches via
2023-03-24 10:29 ` Zongyuan Li via Guix-patches via
2 siblings, 1 reply; 9+ messages in thread
From: Zongyuan Li via Guix-patches via @ 2023-03-03 8:08 UTC (permalink / raw)
To: 61680; +Cc: ludo, liliana.prikler, Zongyuan Li
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)
^ permalink raw reply related [flat|nested] 9+ messages in thread* [bug#61680] [PATCH v3] gnu: podman: Add 'docker' alias script as 'docker' output
2023-03-03 8:08 ` [bug#61680] [PATCH v3] " Zongyuan Li via Guix-patches via
@ 2023-03-24 10:29 ` Zongyuan Li via Guix-patches via
0 siblings, 0 replies; 9+ messages in thread
From: Zongyuan Li via Guix-patches via @ 2023-03-24 10:29 UTC (permalink / raw)
To: 61680; +Cc: Ludovic Courtès, Liliana Marie Prikler
Ping. Any further information?
Thanks
> On Mar 3, 2023, at 16:08, Zongyuan Li <zongyuan.li@c0x0o.me> wrote:
>
> 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)
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-03-24 15:35 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [bug#61680] [PATCH v3] " Zongyuan Li via Guix-patches via
2023-03-24 10:29 ` Zongyuan Li via Guix-patches via
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).