services: docker: Fix service definition.

This commit follows a404716d411cf7cd49ff02e3100f0bbf6622d6d5.

* gnu/services/docker.scm
(docker-configuration)[docker-cli]: New record field.
(docker-service-type): Use this.
* doc/guix.texi (Miscellaneous Services)[Docker Service]: Document this.

diff --git a/doc/guix.texi b/doc/guix.texi
index bfffb4a..88128a4 100644 (file)
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -27990,7 +27990,10 @@ This is the data type representing the configuration of Docker and Containerd.
 @table @asis
 
 @item @code{package} (default: @code{docker})
 @table @asis
 
 @item @code{package} (default: @code{docker})

-The Docker package to use.
+The Docker daemon package to use.
+
+@item @code{package} (default: @code{docker-cli})
+The Docker client package to use.

 
 @item @code{containerd} (default: @var{containerd})
 The Containerd package to use.
 
 @item @code{containerd} (default: @var{containerd})
 The Containerd package to use.

diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
index 1cce767..a4eccc7 100644 (file)
--- a/gnu/services/docker.scm
+++ b/gnu/services/docker.scm
@@ -45,6 +45,9 @@
   (docker
    (package docker)
    "Docker daemon package.")
   (docker
    (package docker)
    "Docker daemon package.")

+  (docker-cli
+   (package docker-cli)
+   "Docker client package.")

   (containerd
    (package containerd)
    "containerd package.")
   (containerd
    (package containerd)
    "containerd package.")


@@ -136,7 +139,7 @@ bundles in Docker containers.")
                  (list
                   ;; Make sure the 'docker' command is available.
                   (service-extension profile-service-type
                  (list
                   ;; Make sure the 'docker' command is available.
                   (service-extension profile-service-type

-                                     (compose list docker-cli))
+                                     (compose list docker-configuration-docker-cli))

                   (service-extension activation-service-type
                                      %docker-activation)
                   (service-extension shepherd-root-service-type
                   (service-extension activation-service-type
                                      %docker-activation)
                   (service-extension shepherd-root-service-type