From 8af4c335e32fbed7556a4cd7f26f93bc66afaace Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 31 Dec 2018 00:39:02 +0100 Subject: services: Add docker. * gnu/services/docker.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * doc/guix.texi (Miscellaneous Services): Document the service. --- gnu/services/docker.scm | 94 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 gnu/services/docker.scm (limited to 'gnu/services/docker.scm') diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm new file mode 100644 index 00000000000..6d270831b32 --- /dev/null +++ b/gnu/services/docker.scm @@ -0,0 +1,94 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Danny Milosavljevic +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu services docker) + #:use-module (gnu services) + #:use-module (gnu services configuration) + #:use-module (gnu services base) + #:use-module (gnu services dbus) + #:use-module (gnu services shepherd) + #:use-module (gnu system shadow) + #:use-module (gnu packages docker) + #:use-module (guix records) + #:use-module (guix gexp) + #:use-module (guix packages) + + #:export (docker-configuration + docker-service-type)) + +(define-configuration docker-configuration + (docker + (package docker) + "Docker daemon package.") + (containerd + (package containerd) + "containerd package.")) + +(define %docker-accounts + (list (user-group (name "docker") (system? #t)))) + +(define (%containerd-activation config) + (let ((state-dir "/var/lib/containerd")) + #~(begin + (use-modules (guix build utils)) + (mkdir-p #$state-dir)))) + +(define (%docker-activation config) + (%containerd-activation config) + (let ((state-dir "/var/lib/docker")) + #~(begin + (use-modules (guix build utils)) + (mkdir-p #$state-dir)))) + +(define (containerd-shepherd-service config) + (let* ((package (docker-configuration-containerd config))) + (shepherd-service + (documentation "containerd daemon.") + (provision '(containerd)) + (start #~(make-forkexec-constructor + (list (string-append #$package "/bin/containerd")))) + (stop #~(make-kill-destructor))))) + +(define (docker-shepherd-service config) + (let* ((docker (docker-configuration-docker config))) + (shepherd-service + (documentation "Docker daemon.") + (provision '(dockerd)) + (requirement '(containerd)) + (start #~(make-forkexec-constructor + (list (string-append #$docker "/bin/dockerd") + "-p" "/var/run/docker.pid") + #:pid-file "/var/run/docker.pid" + #:log-file "/var/log/docker.log")) + (stop #~(make-kill-destructor))))) + +(define docker-service-type + (service-type (name 'docker) + (description "Provide capability to run Docker application +bundles in Docker containers.") + (extensions + (list + (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)))) + (service-extension account-service-type + (const %docker-accounts)))) + (default-value (docker-configuration)))) -- cgit v1.3 From f0bfd0fc217a9af44b122f4e3cdf389a74594096 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 10 Jan 2019 03:54:28 +0100 Subject: services: docker: Specify log file for containerd. * gnu/services/docker.scm (containerd-shepherd-service): Specify log file for containerd. --- gnu/services/docker.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/services/docker.scm') diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index 6d270831b32..c88fc342e8c 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -61,7 +61,8 @@ (documentation "containerd daemon.") (provision '(containerd)) (start #~(make-forkexec-constructor - (list (string-append #$package "/bin/containerd")))) + (list (string-append #$package "/bin/containerd")) + #:log-file "/var/log/containerd.log")) (stop #~(make-kill-destructor))))) (define (docker-shepherd-service config) -- cgit v1.3 From f946a370edbf65baab41e8373e25157da5029a88 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 10 Jan 2019 05:14:43 +0100 Subject: services: docker: Depend on elogind. * gnu/services/docker.scm (docker-shepherd-service)[requirement]: Add elogind. --- gnu/services/docker.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/services/docker.scm') diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index c88fc342e8c..9e24bcd9504 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -70,7 +70,8 @@ (shepherd-service (documentation "Docker daemon.") (provision '(dockerd)) - (requirement '(containerd)) + ;; Note: elogind is required because it's mounting the cgroups. + (requirement '(containerd elogind)) (start #~(make-forkexec-constructor (list (string-append #$docker "/bin/dockerd") "-p" "/var/run/docker.pid") -- cgit v1.3 From d3a0e74d6a303cd46b0761b5a84c8e8b290e3797 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 10 Jan 2019 14:50:47 +0100 Subject: services: docker: Clarify service-extension shepherd-root-service-type. * gnu/services/docker.scm (docker-service-type)[extensions]: Clarify service-extension shepherd-root-service-type. --- gnu/services/docker.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/services/docker.scm') diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index 9e24bcd9504..87931f83f51 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -88,9 +88,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)))) -- cgit v1.3 From 8b0c1744154f0e9a008c4e4586bfdb0876749139 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 10 Jan 2019 19:16:06 +0100 Subject: services: docker: Use more minimal service requrements. * gnu/services/docker.scm (docker-service-type)[requirement]: Add 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. Remove elogind. --- gnu/services/docker.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/services/docker.scm') diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index 87931f83f51..c84c887612a 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -71,7 +71,14 @@ (documentation "Docker daemon.") (provision '(dockerd)) ;; Note: elogind is required because it's mounting the cgroups. - (requirement '(containerd elogind)) + (requirement '(containerd + 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 + )) (start #~(make-forkexec-constructor (list (string-append #$docker "/bin/dockerd") "-p" "/var/run/docker.pid") -- cgit v1.3 From 9757b57f4efd13b2fcf5277145231288770d46d0 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 11 Jan 2019 02:53:28 +0100 Subject: services: docker: Update comment. * gnu/services/docker.scm (docker-shepherd-service): Update comment. --- gnu/services/docker.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/services/docker.scm') diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index c84c887612a..09fe3cc1c32 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -70,7 +70,6 @@ (shepherd-service (documentation "Docker daemon.") (provision '(dockerd)) - ;; Note: elogind is required because it's mounting the cgroups. (requirement '(containerd file-system-/sys/fs/cgroup/blkio file-system-/sys/fs/cgroup/cpu -- cgit v1.3