From c55f819109e484d6c7a95e3c1332d1ce8ad4f312 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Mon, 25 Feb 2019 17:02:14 +0100
Subject: [PATCH] [doc] Add more notes to linux CI installation
---
doc/linux.rst | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/doc/linux.rst b/doc/linux.rst
index ce772437..4b2d23c6 100644
--- a/doc/linux.rst
+++ b/doc/linux.rst
@@ -17,12 +17,17 @@ Docker and Gitlab-runner setup
------------------------------
Base docker installation:
-https://docs.docker.com/install/linux/docker-ce/debian/
+https://secure.idiap.ch/intranet/system/software/docker
Ensure to add/configure for auto-loading the ``overlay`` kernel module in
``/etc/modules``. Then update/create ``/etc/docker/daemon.json`` to contain
-the entry ``"storage-driver": "overlay2"``. Restart the daemon. Eventually
-reboot the machine to ensure everything works fine.
+the entry ``"storage-driver": "overlay2"``.
+
+To ensure that you can control memory and CPU usage for launched docker
+containers, you'll need to enable "cgroups" on your machine. In essence,
+change ``/etc/default/grub`` to contain the line
+``GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1"``. Then, re-run
+``update-grub`` after such change.
To install docker at Idiap, you also need to follow the security guidelines
from Cédric at https://secure.idiap.ch/intranet/system/software/docker. If you
@@ -46,6 +51,9 @@ for this step:
$ service docker start
+ Reboot the machine to ensure everything works fine.
+
+
Hosts section
=============
--
GitLab