From 18bf47ffc6ed0e1cedde0b889f926f406f0d6db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Anjos?= <andre.anjos@idiap.ch>
Date: Tue, 3 Jan 2017 17:00:01 +0100
Subject: [PATCH] Now a good fix.
---
install/docker-ci/README.md | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/install/docker-ci/README.md b/install/docker-ci/README.md
index dc279b2..c1e98e8 100644
--- a/install/docker-ci/README.md
+++ b/install/docker-ci/README.md
@@ -8,7 +8,6 @@ This guide assumes you want to install a new CI machine from scratch, with
1. Install a base Debian 8.x distribution
2. Install the following packages:
-
```sh
$ apt-get update
$ apt-get install openssh-server curl vim-nox htop
@@ -19,31 +18,26 @@ $ apt-get install openssh-server curl vim-nox htop
5. Follow the steps in section "Kernel Support" below for extended CPU and
memory control on docker containers, in case you need those
6. If there are locale problems, install the missing locales with:
-
```sh
$ dpkg-reconfigure locales
```
7. Install docker:
-
```sh
$ curl -sSL https://get.docker.com/ | sh
```
8. Install Gitlab CI:
-
```sh
$ curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-ci-multi-runner/script.deb.sh | bash
```
9. Add the `gitlab-runner` user to the docker group:
-
```sh
$ usermod -aG docker gitlab-runner
```
10. Register the runner and fine-tune its configuration:
-
```sh
$ gitlab-ci-multi-runner register
$ vim /etc/gitlab-runner/config.toml
@@ -55,7 +49,6 @@ $ service gitlab-runner restart
can access `docker build`. More information here:
https://docs.gitlab.com/ce/ci/docker/using_docker_build.html
11. Configure docker to access Idiap's registry:
-
```sh
$ mkdir -p /etc/docker/certs.d/docker.idiap.ch
$ scp ./docker.crt root@<machine>:/etc/docker/certs.d/docker.idiap.ch/
@@ -72,9 +65,9 @@ the its kernel.
Here are some tests you can run to test if both are available:
```sh
-$ for the memory check
+# for the memory check
$ docker run -it --rm -m 128M --memory-swap=128M progrium/stress --vm 1 --vm-bytes 130M --vm-hang 0
-$ for CPU quota check
+# for CPU quota check
$ docker run -it --rm --cpu-quota=50000 --cpu-period=100000 progrium/stress --cpu 3
```
--
GitLab