services: desktop: Fix define for the upower-service procedure.

[jackhill/guix/guix.git] / gnu / services / docker.scm

diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
index 9e24bcd..8b5edf5 100644 (file)
--- a/gnu/services/docker.scm
+++ b/gnu/services/docker.scm
@@ -70,8 +70,17 @@
     (shepherd-service
            (documentation "Docker daemon.")
            (provision '(dockerd))
-           ;; Note: elogind is required because it's mounting the cgroups.
-           (requirement '(containerd elogind))
+           (requirement '(containerd
+                          dbus-system
+                          elogind
+                          file-system-/sys/fs/cgroup/blkio
+                          file-system-/sys/fs/cgroup/cpu
+                          file-system-/sys/fs/cgroup/cpuset
+                          file-system-/sys/fs/cgroup/devices
+                          file-system-/sys/fs/cgroup/memory
+                          ; TODO: file-system-/sys/fs/cgroup/pids
+                          networking
+                          udev))
            (start #~(make-forkexec-constructor
                      (list (string-append #$docker "/bin/dockerd")
                            "-p" "/var/run/docker.pid")
@@ -88,9 +97,9 @@ bundles in Docker containers.")
                   (service-extension activation-service-type
                                      %docker-activation)
                   (service-extension shepherd-root-service-type
-                                     (lambda args
-                                       (list (apply containerd-shepherd-service args)
-                                             (apply docker-shepherd-service args))))
+                                     (lambda (config)
+                                       (list (containerd-shepherd-service config)
+                                             (docker-shepherd-service config))))
                   (service-extension account-service-type
                                      (const %docker-accounts))))
                 (default-value (docker-configuration))))