diff options
| author | Oleg Pykhalov <go.wigust@gmail.com> | 2020-09-15 01:10:55 +0300 |
|---|---|---|
| committer | Oleg Pykhalov <go.wigust@gmail.com> | 2020-09-15 01:10:55 +0300 |
| commit | f6dfe42129d005662d91e1acb1c75eafe7b9b33e (patch) | |
| tree | a6d66cea84853c9591b4e0e5414af9b62ef7c0fe | |
| parent | 8ba70a6ad306bdef3f03221f7883fb36abe595ab (diff) | |
| download | guix-f6dfe42129d005662d91e1acb1c75eafe7b9b33e.tar guix-f6dfe42129d005662d91e1acb1c75eafe7b9b33e.tar.gz | |
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.
| -rw-r--r-- | doc/guix.texi | 5 | ||||
| -rw-r--r-- | gnu/services/docker.scm | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index bfffb4ac2a..88128a4b3a 100644 --- 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}) -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. diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index 1cce767675..a4eccc7928 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -45,6 +45,9 @@ (docker (package docker) "Docker daemon package.") + (docker-cli + (package docker-cli) + "Docker client 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 - (compose list docker-cli)) + (compose list docker-configuration-docker-cli)) (service-extension activation-service-type %docker-activation) (service-extension shepherd-root-service-type |