diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-01-07 18:31:32 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-01-07 18:31:32 +0100 |
| commit | 2cbb1a6e1e2679c7db74b6b906d223fb3661d09f (patch) | |
| tree | ab4101e769bbac1d53950004044fd297223b9492 /doc | |
| parent | b369dc272eeba4eafb2bc7dc56f7b3cf09fb0961 (diff) | |
| parent | b212e6934643e085f168a5364cb593f61aa616ba (diff) | |
| download | guix-2cbb1a6e1e2679c7db74b6b906d223fb3661d09f.tar guix-2cbb1a6e1e2679c7db74b6b906d223fb3661d09f.tar.gz | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/guix.texi | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index daf3ee22cf..affb4f20bc 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -1799,7 +1799,7 @@ Setup}), or simply fail. When the build or substitution process remains silent for more than @var{seconds}, terminate it and report a build failure. -The default value is @code{0}, which disables the timeout. +The default value is @code{3600} (one hour). The value specified here can be overridden by clients (@pxref{Common Build Options, @option{--max-silent-time}}). @@ -1808,7 +1808,7 @@ Build Options, @option{--max-silent-time}}). Likewise, when the build or substitution process lasts for more than @var{seconds}, terminate it and report a build failure. -The default value is @code{0}, which disables the timeout. +The default value is 24 hours. The value specified here can be overridden by clients (@pxref{Common Build Options, @option{--timeout}}). @@ -19455,8 +19455,8 @@ few seconds when enough entropy is available and is only done once; you might want to turn it off for instance in a virtual machine that does not need it and where the extra boot time is a problem. -@item @code{max-silent-time} (default: @code{0}) -@itemx @code{timeout} (default: @code{0}) +@item @code{max-silent-time} (default: @code{3600}) +@itemx @code{timeout} (default: @code{(* 3600 24)}) The number of seconds of silence and the number of seconds of activity, respectively, after which a build process times out. A value of zero disables the timeout. @@ -39746,6 +39746,9 @@ This must be a list of strings where each string has the form "TMPDIR=/tmp/dockerd") @end lisp +@item @code{config-file} (type: maybe-file-like) +JSON configuration file pass to @command{dockerd}. + @end table @end deftp |