diff options
| -rw-r--r-- | doc/guix.texi | 5 | ||||
| -rw-r--r-- | gnu/services/containers.scm | 20 |
2 files changed, 20 insertions, 5 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index bb07432d49b..0bbad147e8a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -45659,8 +45659,9 @@ The group under whose authority docker commands will be run. @item @code{command} (default: @code{'()}) (type: list-of-strings) Overwrite the default command (@code{CMD}) of the image. -@item @code{entrypoint} (default: @code{""}) (type: string) -Overwrite the default entrypoint (@code{ENTRYPOINT}) of the image. +@item @code{entrypoint} (default: @code{""}) (type: string-or-list-of-strings) +Overwrite the default entrypoint (@code{ENTRYPOINT}) of the image. It can +be either a string, or a list of strings. @item @code{host-environment} (default: @code{'()}) (type: list) Set environment variables in the host environment where @samp{docker run} diff --git a/gnu/services/containers.scm b/gnu/services/containers.scm index af947a6681a..a01df18ba5d 100644 --- a/gnu/services/containers.scm +++ b/gnu/services/containers.scm @@ -521,6 +521,15 @@ but ~a was found") el)))) reference (string-append "localhost/" reference))) +(define (string-or-list-of-strings? value) + (if (or (string? value) + ((list-of string) value)) + value + (raise + (formatted-message + (G_ "entrypoint may only be a single string or a list of strings +but ~a was found") value)))) + (define (oci-lowerable-image? image) (or (manifest? image) (operating-system? image) @@ -544,6 +553,7 @@ but ~a was found") el)))) value)) (define-maybe/no-serialization string) +(define-maybe/no-serialization string-or-list-of-strings) (define-maybe/no-serialization package) (define-maybe/no-serialization subid-range) @@ -603,8 +613,9 @@ This field will override the @code{group} field of @code{oci-configuration}.") (list-of-strings '()) "Overwrite the default command (@code{CMD}) of the image.") (entrypoint - (maybe-string) - "Overwrite the default entrypoint (@code{ENTRYPOINT}) of the image.") + (maybe-string-or-list-of-strings) + "Overwrite the default entrypoint (@code{ENTRYPOINT}) of the image. It can +be either a string, or a list of strings.") (host-environment (oci-container-host-environment '()) "Set environment variables in the host environment where @command{docker run} @@ -962,7 +973,10 @@ for the OCI runtime run command." (apply append (filter (compose not unspecified?) (list (if (maybe-value-set? entrypoint) - `("--entrypoint" ,entrypoint) + `("--entrypoint" + ,(if (list? entrypoint) + (string-join entrypoint " ") + entrypoint)) '()) (append-map (lambda (spec) |