GNU bug report logs -
#51597
[PATCH] services: docker: Add 'environment-variables' configuration field.
Previous Next
Reported by: Alexey Abramov <levenson <at> mmer.org>
Date: Thu, 4 Nov 2021 06:49:02 UTC
Severity: normal
Tags: patch
Done: Ludovic Courtès <ludo <at> gnu.org>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 51597 in the body.
You can then email your comments to 51597 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org
:
bug#51597
; Package
guix-patches
.
(Thu, 04 Nov 2021 06:49:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Alexey Abramov <levenson <at> mmer.org>
:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org
.
(Thu, 04 Nov 2021 06:49:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
* 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
Reply sent
to
Ludovic Courtès <ludo <at> gnu.org>
:
You have taken responsibility.
(Wed, 17 Nov 2021 15:21:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Alexey Abramov <levenson <at> mmer.org>
:
bug acknowledged by developer.
(Wed, 17 Nov 2021 15:21:02 GMT)
Full text and
rfc822 format available.
Message #10 received at 51597-done <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Hi,
Alexey Abramov <levenson <at> 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’.
[Message part 2 (text/x-patch, inline)]
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
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Thu, 16 Dec 2021 12:24:12 GMT)
Full text and
rfc822 format available.
This bug report was last modified 2 years and 93 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.