[PATCH 0/1] guix: pack: add --entry-point-argument option

  • Open
  • quality assurance status badge
Details
5 participants
  • Josselin Poiret
  • Giovanni Biscuolo
  • Graham James Addis
  • Ludovic Courtès
  • Simon Tournier
Owner
unassigned
Submitted by
Graham James Addis
Severity
normal
Merged with
G
G
Graham James Addis wrote on 19 Jun 2023 17:37
[PATCH 0/1] guix: pack: docker add docker-entry-point options
(address . guix-patches@gnu.org)(name . Graham James Addis)(address . graham@addis.org.uk)
cover.1687188729.git.graham@addis.org.uk
This patch adds an option to guix pack to allow multiple parameters to
be passed to the guix pack --format=docker command.

Currently the although the --entry-point option can be entered multiple
times, only the last entry is used as the docker ENTRYPOINT.

Using the new --docker-entry-point option will take multiple entries
and use them in the docker ENTRYPOINT exec form.

Using --docker-entry-point will override any setting of --entry-point.

The existing behaviour of --entry-point is retained if --docker-entry-point
is not specified.

Graham James Addis (1):
guix: pack: docker add docker-entry-point options

doc/guix.texi | 16 +++++-
guix/scripts/pack.scm | 113 ++++++++++++++++++++++++++++++++----------
2 files changed, 103 insertions(+), 26 deletions(-)


base-commit: d884fc9e2efecfba09af4694f5a13ad7fc6f704f
--
2.39.2
L
L
Ludovic Courtès wrote on 3 Jul 2023 11:12
control message for bug #64171
(address . control@debbugs.gnu.org)
87wmzhqry3.fsf@gnu.org
merge 64171 64173
quit
L
L
Ludovic Courtès wrote on 3 Jul 2023 11:25
Re: bug#64171: [PATCH 0/1] guix: pack: docker add docker-entry-point options
(name . Graham James Addis)(address . grahamjamesaddis@gmail.com)
87r0ppqrbx.fsf@gnu.org
Hi,

Graham James Addis <grahamjamesaddis@gmail.com> skribis:

Toggle quote (9 lines)
> This patch adds an option to guix pack to allow multiple parameters to
> be passed to the guix pack --format=docker command.
>
> Currently the although the --entry-point option can be entered multiple
> times, only the last entry is used as the docker ENTRYPOINT.
>
> Using the new --docker-entry-point option will take multiple entries
> and use them in the docker ENTRYPOINT exec form.

How about this alternative route: support multiple ‘--entry-point’
arguments. The first one is passed to the backend as #:entry-point (as
is currently the case) and extra instances are passed as a list as
#:entry-point-arguments.

That way one could do:

guix pack -f docker guile \
--entry-point=bin/guile --entry-point=--version

Or, perhaps even better, introduce a new ‘--entry-point-argument’ (or
‘-A’) option.

The advantage compared to ‘--docker-entry-point’ is that it could be
supported by all the backends.

WDYT?

Thanks,
Ludo’.
G
G
Graham Addis wrote on 3 Jul 2023 14:44
(name . Ludovic Courtès)(address . ludo@gnu.org)
CAA4DTex_Kg_Jhn-z+RHrw2=WcuG3ZxSiOGZE1MtsYpnhCox4tQ@mail.gmail.com
Hi Ludo,

Happy to rework it either way. I can't think of any showstoppers off
the top of my head.

Which option would make the most sense?

Thanks,

Graham

On Mon, 3 Jul 2023 at 10:26, Ludovic Courtès <ludo@gnu.org> wrote:
Toggle quote (34 lines)
>
> Hi,
>
> Graham James Addis <grahamjamesaddis@gmail.com> skribis:
>
> > This patch adds an option to guix pack to allow multiple parameters to
> > be passed to the guix pack --format=docker command.
> >
> > Currently the although the --entry-point option can be entered multiple
> > times, only the last entry is used as the docker ENTRYPOINT.
> >
> > Using the new --docker-entry-point option will take multiple entries
> > and use them in the docker ENTRYPOINT exec form.
>
> How about this alternative route: support multiple ‘--entry-point’
> arguments. The first one is passed to the backend as #:entry-point (as
> is currently the case) and extra instances are passed as a list as
> #:entry-point-arguments.
>
> That way one could do:
>
> guix pack -f docker guile \
> --entry-point=bin/guile --entry-point=--version
>
> Or, perhaps even better, introduce a new ‘--entry-point-argument’ (or
> ‘-A’) option.
>
> The advantage compared to ‘--docker-entry-point’ is that it could be
> supported by all the backends.
>
> WDYT?
>
> Thanks,
> Ludo’.
G
G
Giovanni Biscuolo wrote on 3 Jul 2023 18:40
Re: [bug#64171] [PATCH 0/1] guix: pack: docker add docker-entry-point options
(address . 64171@debbugs.gnu.org)
87mt0dkkxp.fsf@xelera.eu
Graham Addis <grahamjamesaddis@gmail.com> writes:

Toggle quote (7 lines)
> Hi Ludo,
>
> Happy to rework it either way. I can't think of any showstoppers off
> the top of my head.
>
> Which option would make the most sense?

[...]

Toggle quote (3 lines)
>> Or, perhaps even better, introduce a new ‘--entry-point-argument’ (or
>> ‘-A’) option.

IMO ‘--entry-point-argument’ is more semantic, its destination is clearer

[...]

Thanks a lot for this patch!

Happy hacking, Gio'

--
Giovanni Biscuolo

Xelera IT Infrastructures
-----BEGIN PGP SIGNATURE-----

iQJABAEBCgAqFiEERcxjuFJYydVfNLI5030Op87MORIFAmSi+gIMHGdAeGVsZXJh
LmV1AAoJENN9DqfOzDkSW5EP/0Fq6TMzP7cp/wE+OcR4yh8BmM59sxTLXINNp62U
dGbw3zyYdkAxiWr3od0cOYIjEMVl+Vg/0xhOVQGZxrGQu/WScYR5aPXG+YAzYEBv
jCaLwnLRL5Ef3KXnIUqj40Hou/JaslMhMtqrsXy0gaqXFnzuJ5OEdkywY7bmXtKY
5w32LqrL5wiypOe81PObf90GVTruuYWO03H/MLzYQ+bupF8PZoeNgozJHoVy+T+Y
vWz7AStDf5gIE6hF4YzzUcw+W76IFK2I7heARG0SuGGOTtf5o+HFwrDvsrLtHIP+
bGZnvouc1P2jQqcRouS/GiQzQC0aySXFu82Z/2ZT8R7pWxYWip8QTvwi27IMHnHl
r/XdmdAckyxqHApYPJvPSKZ+ArGWMTbN3H73yNiGxEsxbqRDYqaoegwMAfkTjAS/
wAhxxxR96Spo9pUv0wg8ecS1DujKr0UbWhRUzEb8khPkS6GWK8uW48Z5stEJ8zt0
7gqHGHfjZ1WwndECNxxLADF5GQ2NJ3Wwe7LlFMjbbtQGJNpVNxBaK7L8ZXDfVt3R
2ACFKl20WeiHQXnXgMfyDpOkz5pq88hvP45WUxl1ggA33HTgA6bZCNwZZ5E26Mjg
ORjldyXdEbJxxxSpaF6zl+1ILoATduxblAA++E7CmkfvC9vq8wSVZgQuRxx7fKwl
WACp
=tpEc
-----END PGP SIGNATURE-----

G
G
Graham Addis wrote on 8 Jul 2023 18:08
(name . Giovanni Biscuolo)(address . g@xelera.eu)
CAA4DTexMugyaAxWqZPpiALkVDSApWU63KeaauwvUuk8sG+cQCg@mail.gmail.com
One last question, as the proposed changes no longer reflect this bug
description, should I raise a new bug, or just add the replacement
patch to this one?

On Mon, 3 Jul 2023 at 17:40, Giovanni Biscuolo <g@xelera.eu> wrote:
Toggle quote (27 lines)
>
> Graham Addis <grahamjamesaddis@gmail.com> writes:
>
> > Hi Ludo,
> >
> > Happy to rework it either way. I can't think of any showstoppers off
> > the top of my head.
> >
> > Which option would make the most sense?
>
> [...]
>
> >> Or, perhaps even better, introduce a new ‘--entry-point-argument’ (or
> >> ‘-A’) option.
>
> IMO ‘--entry-point-argument’ is more semantic, its destination is clearer
>
> [...]
>
> Thanks a lot for this patch!
>
> Happy hacking, Gio'
>
> --
> Giovanni Biscuolo
>
> Xelera IT Infrastructures
J
J
Josselin Poiret wrote on 9 Jul 2023 10:31
87y1jp8p10.fsf@jpoiret.xyz
Hi Graham,

Graham Addis <grahamjamesaddis@gmail.com> writes:

Toggle quote (4 lines)
> One last question, as the proposed changes no longer reflect this bug
> description, should I raise a new bug, or just add the replacement
> patch to this one?

You can retitle bugs on debbugs, have a look at [1].


Best,
--
Josselin Poiret
-----BEGIN PGP SIGNATURE-----

iQHEBAEBCgAuFiEEOSSM2EHGPMM23K8vUF5AuRYXGooFAmSqcEsQHGRldkBqcG9p
cmV0Lnh5egAKCRBQXkC5Fhcait2BDACEgy4mLpBl7wQ2/MSZD07MbwGT8h9/K2WD
AegmFj22RI2+GAVJnA2t1hNiPFpXGwLc7/58SPflyGhIUfm9kdzLHCmXsoz8p4jL
DDAXJBX/r4OsGsE/OxX61/3xLynWzim1qNCT2PuoB/PXj1HjEyAWc+JtwRpwpELw
fOZ9QLkBtQpML6HVtQZEc2vm74/Gd/4huxz6C4EAqf5se2ee1kxjpIpupHQU9Ddj
bb2cTGjzXwg//Dn6bTrKXQ8BqSDlSmU4b5Ie0HMT4pnaX5wg5HrIshbpgfi3lfbV
cylejAmbq6LC+BWit69iQttaE3F5q26/Wgo6eAgaPyKn9jtHy6FSPvnzP9pltli/
nwLg//p7lDLeNF38wvcot3H3iQzJXlI62ktxZ0WiRfg/RllGi5kqtyyNrr9h4mUK
tdLhOvJ3/3fwQhuCuHmVJx3+WN70RKmT6w7boZ0FElGu0qQws3F4oo8GURLViKkC
BFq6tTgoDeASPDorStVs2zYZuKx91Ec=
=1miX
-----END PGP SIGNATURE-----

G
G
Graham Addis wrote on 11 Jul 2023 10:54
(address . control@debbugs.gnu.org)
CAA4DTewP3o6kpc+1aM=yB_0TjunNoMNFVDX0fwCuR40iF31saA@mail.gmail.com
retitle 64171 [PATCH 0/1] guix: pack: add --entry-point-argument option
Attachment: file
G
G
Graham James Addis wrote on 12 Jul 2023 10:17
(address . 64171@debbugs.gnu.org)(name . Graham James Addis)(address . graham@addis.org.uk)
53f0c51cabbd317469721fb7f47b47af50d42177.1689149161.git.graham@addis.org.uk
* guix/scripts/pack.scm: add support for parameters in entry-point
(entry-point-argument-spec-option-parser): add function to parse --entry-point-argument
(docker-image): Add function (form_entry_point) to handle --entry-point
vs --entry-point-argument merging
(docker-image): change call to (build-docker-image) to use (form-entry-point)
(%default-options): add dafault for --entry-point-argument option
(%docker-format-options): parser for --entry-point-argument
(show-docker-format-options): help for --docker-format-options
(show-docker-format-options/detailed): detailed help for --docker-format-options
(%options): add flag for --help-docker-format and add parser for --docker-format-options
(extra-options): add entry-point-argument option
(guix.texi): add documentation
---
doc/guix.texi | 14 +++++-
guix/scripts/pack.scm | 107 ++++++++++++++++++++++++++++++++----------
2 files changed, 95 insertions(+), 26 deletions(-)

Toggle diff (219 lines)
diff --git a/doc/guix.texi b/doc/guix.texi
index 4e7faf8aea..10d220c7b9 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -116,6 +116,7 @@
Copyright @copyright{} 2023 Karl Hallsby@*
Copyright @copyright{} 2023 Nathaniel Nicandro@*
Copyright @copyright{} 2023 Tanguy Le Carrour@*
+Copyright @copyright{} 2023 Graham James Addis@*
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -7410,7 +7411,7 @@ Invoking guix pack
@env{GUIX_EXECUTION_ENGINE} environment variable accordingly.
@end quotation
-@cindex entry point, for Docker images
+@cindex entry point, for Docker and Singularity images
@item --entry-point=@var{command}
Use @var{command} as the @dfn{entry point} of the resulting pack, if the pack
format supports it---currently @code{docker} and @code{squashfs} (Singularity)
@@ -7433,6 +7434,17 @@ Invoking guix pack
docker run @var{image-id}
@end example
+@cindex entry point arguments, for docker images
+@item --entry-point-argument=@var{command}
+@itemx -A @var{command}
+Use @var{command} as an argument to @dfn{entry point} of the resulting pack.
+This option is only valid in conjunction with @code{--entry-point} and can
+appear multiple times on the command line.
+
+@example
+guix pack -f docker --entry-point=bin/guile --entry-point-argument="--help" guile
+@end example
+
@item --expression=@var{expr}
@itemx -e @var{expr}
Consider the package @var{expr} evaluates to.
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 0dc9979194..c620eb9dc0 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2022 Alex Griffin <a@ajgrf.com>
+;;; Copyright © 2023 Graham James Addis <graham@addis.org.uk>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -193,6 +194,16 @@ (define (symlink-spec-option-parser opt name arg result)
(leave (G_ "~a: invalid symlink specification~%")
arg))))
+(define (entry-point-argument-spec-option-parser opt name arg result)
+ "A SRFI-37 opion parser for the --entry-point-argument option. The spec
+takes multiple occurances. The entries are used in the exec form for the
+docker entry-point. The values are used as parameters in conjunction with
+the --entry-point option which is used as the first value in the exec form."
+ (let ((entry-point-argument (assoc-ref result 'entry-point-argument)))
+ (alist-cons 'entry-point-argument
+ (append entry-point-argument (list arg))
+ (alist-delete 'entry-point-argument result eq?))))
+
(define (set-utf8-locale profile)
"Configure the environment to use the \"en_US.utf8\" locale provided by the
GLIBC-UT8-LOCALES package."
@@ -626,6 +637,7 @@ (define* (docker-image name profile
(guix build utils)
(guix profiles) (guix search-paths)
(srfi srfi-1) (srfi srfi-19)
+ (ice-9 optargs)
(ice-9 match))
#$(procedure-source manifest->friendly-name)
@@ -653,31 +665,48 @@ (define* (docker-image name profile
`((directory "/tmp" ,(getuid) ,(getgid) #o1777)
,@(append-map symlink->directives '#$symlinks)))
- (setenv "PATH" #+(file-append archiver "/bin"))
-
- (build-docker-image #$output
- (map store-info-item
- (call-with-input-file "profile"
- read-reference-graph))
- #$profile
- #:repository (manifest->friendly-name
- (profile-manifest #$profile))
- #:database #+database
- #:system (or #$target %host-type)
- #:environment environment
- #:entry-point
- #$(and entry-point
- #~(list (string-append #$profile "/"
- #$entry-point)))
- #:extra-files directives
- #:compressor #+(compressor-command compressor)
- #:creation-time (make-time time-utc 0 1))))))
-
- (gexp->derivation (string-append name ".tar"
- (compressor-extension compressor))
- build
- #:target target
- #:references-graphs `(("profile" ,profile))))
+ (define (form-entry-point
+ prefix entry-point
+ entry-point-argument)
+ ;; construct entry-point parameter for build-docker-image
+ ;; the first entry is constructed by prefixing the entry-point
+ ;; with the supplied index subsequent entries are taken from
+ ;; the --entry-point-argument options
+ (cond
+ (entry-point
+ (cons*
+ (string-append prefix "/" entry-point)
+ entry-point-argument)
+ )
+ ('()))) ;empty list returned if no conditions are met
+
+ (let-keywords '#$extra-options #f ((entry-point-argument #f))
+
+ (setenv "PATH" #+(file-append archiver "/bin"))
+
+ (build-docker-image #$output
+ (map store-info-item
+ (call-with-input-file "profile"
+ read-reference-graph))
+ #$profile
+ #:repository (manifest->friendly-name
+ (profile-manifest #$profile))
+ #:database #+database
+ #:system (or #$target %host-type)
+ #:environment environment
+ #:entry-point (form-entry-point
+ #$profile
+ #$entry-point
+ entry-point-argument)
+ #:extra-files directives
+ #:compressor #+(compressor-command compressor)
+ #:creation-time (make-time time-utc 0 1)))))))
+
+ (gexp->derivation (string-append name ".tar"
+ (compressor-extension compressor))
+ build
+ #:target target
+ #:references-graphs `(("profile" ,profile))))
;;;
@@ -1346,6 +1375,7 @@ (define %default-options
(debug . 0)
(verbosity . 1)
(symlinks . ())
+ (entry-point-argument . ())
(compressor . ,(first %compressors))))
(define %formats
@@ -1428,6 +1458,25 @@ (define (show-rpm-format-options/detailed)
(newline)
(exit 0))
+
+(define %docker-format-options
+ (list (option '(#\A "entry-point-argument") #t #f
+ entry-point-argument-spec-option-parser)))
+
+(define (show-docker-format-options)
+ (display (G_ "
+ --help-docker-format
+ list options specific to the DOCKER format")))
+
+(define (show-docker-format-options/detailed)
+ (display (G_ "
+ -A, --entry-point-argument=COMMAND/PARAMETER
+ Value(s) to use for the Docker EntryPoint arguments.
+ Multiple instances are accepted. This is only valid
+ in conjunction with the --entry-point option."))
+ (newline)
+ (exit 0))
+
(define %options
;; Specifications of the command-line options.
(cons* (option '(#\h "help") #f #f
@@ -1508,8 +1557,13 @@ (define %options
(lambda args
(show-rpm-format-options/detailed)))
+ (option '("help-docker-format") #f #f
+ (lambda args
+ (show-docker-format-options/detailed)))
+
(append %deb-format-options
%rpm-format-options
+ %docker-format-options
%transformation-options
%standard-build-options
%standard-cross-build-options
@@ -1528,6 +1582,7 @@ (define (show-help)
(newline)
(show-deb-format-options)
(show-rpm-format-options)
+ (show-docker-format-options)
(newline)
(display (G_ "
-f, --format=FORMAT build a pack in the given FORMAT"))
@@ -1696,6 +1751,8 @@ (define-command (guix-pack . args)
(process-file-arg opts 'preun-file)
#:postun-file
(process-file-arg opts 'postun-file)))
+ ('docker
+ (list #:entry-point-argument (assoc-ref opts 'entry-point-argument)))
(_ '())))
(target (assoc-ref opts 'target))
(bootstrap? (assoc-ref opts 'bootstrap?))

base-commit: 2426e51688d479042ea115a634c6be2d8b9f3b99
--
2.39.2
L
L
Ludovic Courtès wrote on 17 Aug 2023 11:42
Re: bug#64173: [PATCH 0/1] guix: pack: add --entry-point-argument option
(name . Graham James Addis)(address . grahamjamesaddis@gmail.com)
87wmxuxax2.fsf_-_@gnu.org
Hi Graham,

Apologies for the delay (holiday time!).

Graham James Addis <grahamjamesaddis@gmail.com> skribis:

Toggle quote (12 lines)
> * guix/scripts/pack.scm: add support for parameters in entry-point
> (entry-point-argument-spec-option-parser): add function to parse --entry-point-argument
> (docker-image): Add function (form_entry_point) to handle --entry-point
> vs --entry-point-argument merging
> (docker-image): change call to (build-docker-image) to use (form-entry-point)
> (%default-options): add dafault for --entry-point-argument option
> (%docker-format-options): parser for --entry-point-argument
> (show-docker-format-options): help for --docker-format-options
> (show-docker-format-options/detailed): detailed help for --docker-format-options
> (%options): add flag for --help-docker-format and add parser for --docker-format-options
> (extra-options): add entry-point-argument option

This is really a minor issue and I don’t mind fixing it for you, but
note that the ChangeLog style just needs to say what has been
changed/added/removed. For example:

(entry-point-argument-spec-option-parser): New procedure.

Toggle quote (2 lines)
> (guix.texi): add documentation

And here:

* doc/guix.texi (Inovking guix pack): Document it.

I like this new version. Here are a few things that I think would need
to be changed before we can push:

Toggle quote (4 lines)
> +@cindex entry point arguments, for docker images
> +@item --entry-point-argument=@var{command}
> +@itemx -A @var{command}

Maybe @var{argument} for consistency and clarity?

Toggle quote (4 lines)
> +Use @var{command} as an argument to @dfn{entry point} of the resulting pack.
> +This option is only valid in conjunction with @code{--entry-point} and can
> +appear multiple times on the command line.

Maybe add: “The example below shows illustrates that, passing
@option{--help} to the @command{guile} command:”

Toggle quote (4 lines)
> +@example
> +guix pack -f docker --entry-point=bin/guile --entry-point-argument="--help" guile
> +@end example

[...]

Toggle quote (10 lines)
> +(define (entry-point-argument-spec-option-parser opt name arg result)
> + "A SRFI-37 opion parser for the --entry-point-argument option. The spec
> +takes multiple occurances. The entries are used in the exec form for the
> +docker entry-point. The values are used as parameters in conjunction with
> +the --entry-point option which is used as the first value in the exec form."
> + (let ((entry-point-argument (assoc-ref result 'entry-point-argument)))
> + (alist-cons 'entry-point-argument
> + (append entry-point-argument (list arg))
> + (alist-delete 'entry-point-argument result eq?))))

I would just keep a regular option parser that does:

(alist-cons 'entry-point-argument arg result)

Later on, we’d collect all these arguments:

(reverse
(filter-map (match-lambda
(('entry-point-argument . arg) arg)
(_ #f))
opts))

I think this would be a bit clearer; this is what ‘guix repl’ does, for
instance.

Toggle quote (14 lines)
> + (define (form-entry-point
> + prefix entry-point
> + entry-point-argument)
> + ;; construct entry-point parameter for build-docker-image
> + ;; the first entry is constructed by prefixing the entry-point
> + ;; with the supplied index subsequent entries are taken from
> + ;; the --entry-point-argument options
> + (cond
> + (entry-point
> + (cons*
> + (string-append prefix "/" entry-point)
> + entry-point-argument)
> + )

I’d avoid this extra procedure.

Toggle quote (23 lines)
> + ('()))) ;empty list returned if no conditions are met
> +
> + (let-keywords '#$extra-options #f ((entry-point-argument #f))



> + (setenv "PATH" #+(file-append archiver "/bin"))
> +
> + (build-docker-image #$output
> + (map store-info-item
> + (call-with-input-file "profile"
> + read-reference-graph))
> + #$profile
> + #:repository (manifest->friendly-name
> + (profile-manifest #$profile))
> + #:database #+database
> + #:system (or #$target %host-type)
> + #:environment environment
> + #:entry-point (form-entry-point
> + #$profile
> + #$entry-point
> + entry-point-argument)

How about keeping it similar to what it looks like currently:

#:entry-point
#$(and entry-point
#~(cons (string-append #$profile "/"
#$entry-point)
'#$(or (assoc-ref extra-options
#:entry-point-arguments)
'())))


?

Toggle quote (6 lines)
> @@ -1346,6 +1375,7 @@ (define %default-options
> (debug . 0)
> (verbosity . 1)
> (symlinks . ())
> + (entry-point-argument . ())

This can be omitted if you take the approach suggested above, with one
‘entry-point-argument’ pair per argument.

Toggle quote (38 lines)
> +(define %docker-format-options
> + (list (option '(#\A "entry-point-argument") #t #f
> + entry-point-argument-spec-option-parser)))
> +
> +(define (show-docker-format-options)
> + (display (G_ "
> + --help-docker-format
> + list options specific to the DOCKER format")))
> +
> +(define (show-docker-format-options/detailed)
> + (display (G_ "
> + -A, --entry-point-argument=COMMAND/PARAMETER
> + Value(s) to use for the Docker EntryPoint arguments.
> + Multiple instances are accepted. This is only valid
> + in conjunction with the --entry-point option."))
> + (newline)
> + (exit 0))
> +
> (define %options
> ;; Specifications of the command-line options.
> (cons* (option '(#\h "help") #f #f
> @@ -1508,8 +1557,13 @@ (define %options
> (lambda args
> (show-rpm-format-options/detailed)))
>
> + (option '("help-docker-format") #f #f
> + (lambda args
> + (show-docker-format-options/detailed)))
> +
> (append %deb-format-options
> %rpm-format-options
> + %docker-format-options
> @@ -1528,6 +1582,7 @@ (define (show-help)
> (newline)
> (show-deb-format-options)
> (show-rpm-format-options)
> + (show-docker-format-options)

Leftover, can be removed.

Toggle quote (7 lines)
> @@ -1696,6 +1751,8 @@ (define-command (guix-pack . args)
> (process-file-arg opts 'preun-file)
> #:postun-file
> (process-file-arg opts 'postun-file)))
> + ('docker
> + (list #:entry-point-argument (assoc-ref opts 'entry-point-argument)))

This would become #:entry-point-arguments (plural), with the
‘filter-map’ trick shown above.

Also, it should be possible to make it work for the Singularity backend,
right? We can keep it for a subsequent commit if you prefer, but then
please add a TODO comment.

Could you send an updated patch?

Thanks in advance!

Ludo’.
S
S
Simon Tournier wrote on 17 Aug 2023 13:48
Re: [bug#64173] [PATCH 0/1] guix: pack: add --entry-point-argument option
87sf8h51pq.fsf@gmail.com
Hi,

On Thu, 17 Aug 2023 at 11:42, Ludovic Courtès <ludo@gnu.org> wrote:

Toggle quote (25 lines)
>> +(define (entry-point-argument-spec-option-parser opt name arg result)
>> + "A SRFI-37 opion parser for the --entry-point-argument option. The spec
>> +takes multiple occurances. The entries are used in the exec form for the
>> +docker entry-point. The values are used as parameters in conjunction with
>> +the --entry-point option which is used as the first value in the exec form."
>> + (let ((entry-point-argument (assoc-ref result 'entry-point-argument)))
>> + (alist-cons 'entry-point-argument
>> + (append entry-point-argument (list arg))
>> + (alist-delete 'entry-point-argument result eq?))))
>
> I would just keep a regular option parser that does:
>
> (alist-cons 'entry-point-argument arg result)
>
> Later on, we’d collect all these arguments:
>
> (reverse
> (filter-map (match-lambda
> (('entry-point-argument . arg) arg)
> (_ #f))
> opts))
>
> I think this would be a bit clearer; this is what ‘guix repl’ does, for
> instance.

[...]

Toggle quote (3 lines)
> This can be omitted if you take the approach suggested above, with one
> ‘entry-point-argument’ pair per argument.

[...]

Toggle quote (3 lines)
> This would become #:entry-point-arguments (plural), with the
> ‘filter-map’ trick shown above.

Just to be sure to understand, the command-line could list several
--entry-point-argument options, right?

Well, since the order of the various command-line arguments might
matter, and since a ’reverse’ is suggested, and since all the Guix
command-lines do not behave the same way – for instance “guix package”
processes command-line argument from right to left; see #43585 or #50473
[1,2]; anyway :-) – I would suggest to add a sentence in the
documentation (manual) that the command-line arguments are parsed from
left to right.




Cheers,
simon
L
L
Ludovic Courtès wrote on 18 Aug 2023 16:00
(name . Simon Tournier)(address . zimon.toutoune@gmail.com)
87zg2oqwkv.fsf@gnu.org
Hi,

Simon Tournier <zimon.toutoune@gmail.com> skribis:

Toggle quote (3 lines)
> Just to be sure to understand, the command-line could list several
> --entry-point-argument options, right?

Yes.

Toggle quote (8 lines)
> Well, since the order of the various command-line arguments might
> matter, and since a ’reverse’ is suggested, and since all the Guix
> command-lines do not behave the same way – for instance “guix package”
> processes command-line argument from right to left; see #43585 or #50473
> [1,2]; anyway :-) – I would suggest to add a sentence in the
> documentation (manual) that the command-line arguments are parsed from
> left to right.

No: the ‘reverse’ puts them back in the right order (because
‘args-fold*’ traverses the option list from left to right and thus
conses the result in reverse order.)

HTH!

Ludo’.
S
S
Simon Tournier wrote on 18 Aug 2023 16:15
(name . Ludovic Courtès)(address . ludo@gnu.org)
CAJ3okZ1LbkaSydP_m=712D4LTLDwRUBbowp7tQ24LKjp6jWBkg@mail.gmail.com
Hi,

On Fri, 18 Aug 2023 at 16:00, Ludovic Courtès <ludo@gnu.org> wrote:

Toggle quote (12 lines)
> > Well, since the order of the various command-line arguments might
> > matter, and since a ’reverse’ is suggested, and since all the Guix
> > command-lines do not behave the same way – for instance “guix package”
> > processes command-line argument from right to left; see #43585 or #50473
> > [1,2]; anyway :-) – I would suggest to add a sentence in the
> > documentation (manual) that the command-line arguments are parsed from
> > left to right.
>
> No: the ‘reverse’ puts them back in the right order (because
> ‘args-fold*’ traverses the option list from left to right and thus
> conses the result in reverse order.)

Is "no" for not adding a sentence in the documentation? :-)

BTW, what means the "right order"? :-)
I point that "guix package" and "guix show" process the command-line
option in different order -- from right to left vs from left to right
respectively. Thus, this "right order" you are assuming can be
confusing, IMHO.

Therefore, applying POLA, it appears to me worth to add under the
option description of this new "--entry-point-argument" in the manual:
"The @code{--entry-point-arguement} option is applied from left to
right." Or something along this line.

My 2 cents.

Cheers,
simon
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 64171@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 64171
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch