diff options
| author | Marius Bakke <marius@gnu.org> | 2022-07-21 23:52:47 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-07-21 23:52:47 +0200 |
| commit | abea091dbef2d44e6eb46bd2413bdf917e14d095 (patch) | |
| tree | 28f6c61dbda0acb52678944b121b66a6f50a3709 /gnu/services/docker.scm | |
| parent | 3b20467807c32aeac56bbbe22ffb8823f68e282b (diff) | |
| parent | 3f171587bc6a47bb056f3e699e17e05f5832aea5 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services/docker.scm')
| -rw-r--r-- | gnu/services/docker.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index 846ebe8334..741bab5a8c 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -98,6 +98,8 @@ loop-back communications.") ;; For finding containerd-shim binary. #:environment-variables (list (string-append "PATH=" #$containerd "/bin")) + #:pid-file "/run/containerd/containerd.pid" + #:pid-file-timeout 300 #:log-file "/var/log/containerd.log")) (stop #~(make-kill-destructor))))) @@ -135,7 +137,8 @@ loop-back communications.") '("--userland-proxy=false")) (if #$enable-iptables? "--iptables" - "--iptables=false")) + "--iptables=false") + "--containerd" "/run/containerd/containerd.sock") #:environment-variables (list #$@environment-variables) #:pid-file "/var/run/docker.pid" |