ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 21:59:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: docker: Fix service definition.

Browse source 
This commit follows a404716d41.

* 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.
This commit is contained in:
Oleg Pykhalov 2020-09-15 01:10:55 +03:00
parent 8ba70a6ad3
commit f6dfe42129
No known key found for this signature in database
GPG key ID: 167F8EA5001AFA9C
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/guix.texi
View file

@ -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.

5
gnu/services/docker.scm
View file

@ -45,6 +45,9 @@ (define-configuration docker-configuration
(docker
(package docker)
"Docker daemon package.")
(docker-cli
(package docker-cli)
"Docker client package.")
(containerd
(package containerd)
"containerd package.")
@ -136,7 +139,7 @@ (define docker-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