bug#51597: closed ([PATCH] services: docker: Add 'environment-variables' configuration field.)

[GNU bug Tracking System]

Your message dated Wed, 17 Nov 2021 16:19:56 +0100
with message-id <874k8ax10j.fsf@gnu.org>
and subject line Re: bug#51597: [PATCH] services: docker: Add 
'environment-variables' configuration field.
has caused the debbugs.gnu.org bug report #51597,
regarding [PATCH] services: docker: Add 'environment-variables' configuration 
field.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
51597: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=51597
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] services: docker: Add 'environment-variables' configuration field.
>
>
>
>
> Date: 
>
> Thu,  4 Nov 2021 07:48:09 +0100
>
>
>
>
> * gnu/services/docker.scm (docker-configuration):  Add the field
> (docker-shepherd-service): Pass the list of defined variables to
> make-forkexec-constructor.
> * doc/guix.texi (Miscellaneous Services): Update doc.
> ---
>  doc/guix.texi           | 3 +++
>  gnu/services/docker.scm | 6 ++++++
>  2 files changed, 9 insertions(+)
>
> diff --git a/doc/guix.texi b/doc/guix.texi
> index 8693249d7c..cf269d6014 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -33303,6 +33303,9 @@ Enable or disable debug output.
>  @item @code{enable-iptables?} (default @code{#t})
>  Enable or disable the addition of iptables rules.
>  
> +@item @code{environment-variables} (default: @code{()})
> +Environment variables to set for dockerd
> +
>  @end table
>  @end deftp
>  
> diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
> index ef551480aa..c4d48676b5 100644
> --- a/gnu/services/docker.scm
> +++ b/gnu/services/docker.scm
> @@ -62,6 +62,9 @@ loop-back communications.")
>    (enable-iptables?
>     (boolean #t)
>     "Enable addition of iptables rules (enabled by default).")
> +  (environment-variables
> +   (list '())
> +   "Environment variables to set for dockerd")
>    (no-serialization))
>  
>  (define %docker-accounts
> @@ -102,6 +105,7 @@ loop-back communications.")
>    (let* ((docker (docker-configuration-docker config))
>           (enable-proxy? (docker-configuration-enable-proxy? config))
>           (enable-iptables? (docker-configuration-enable-iptables? config))
> +         (environment-variables (docker-configuration-environment-variables 
> config))
>           (proxy (docker-configuration-proxy config))
>           (debug? (docker-configuration-debug? config)))
>      (shepherd-service
> @@ -132,6 +136,8 @@ loop-back communications.")
>                             (if #$enable-iptables?
>                                 "--iptables"
>                                 "--iptables=false"))
> +                     #:environment-variables
> +                     (list #$@environment-variables)
>                       #:pid-file "/var/run/docker.pid"
>                       #:log-file "/var/log/docker.log"))
>             (stop #~(make-kill-destructor)))))
> -- 
> 2.31.1
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#51597: [PATCH] services: docker: Add 'environment-variables' configuration field.
>
>
>
>
> Date: 
>
> Wed, 17 Nov 2021 16:19:56 +0100
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux)
>
>
>
>
> Hi,
>
> Alexey Abramov <levenson@mmer.org> skribis:
>
> > * gnu/services/docker.scm (docker-configuration):  Add the field
> > (docker-shepherd-service): Pass the list of defined variables to
> > make-forkexec-constructor.
> > * doc/guix.texi (Miscellaneous Services): Update doc.
>
> Applied with the clarifications below.
>
> Thanks,
> Ludo’.
>
> diff --git a/doc/guix.texi b/doc/guix.texi
> index a9e1f66492..158261e373 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -33230,7 +33230,15 @@ Enable or disable debug output.
>  Enable or disable the addition of iptables rules.
>  
>  @item @code{environment-variables} (default: @code{()})
> -Environment variables to set for dockerd
> +List of environment variables to set for @command{dockerd}.
> +
> +This must be a list of strings where each string has the form
> +@samp{@var{key}=@var{value}} as in this example:
> +
> +@lisp
> +(list "LANGUAGE=eo:ca:eu"
> +      "TMPDIR=/tmp/dockerd")
> +@end lisp
>  
>  @end table
>  @end deftp
>
> --- End Message ---