From 4b4a198ce6ca681f7e2e8ddcb9325332e0243e45 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Tue, 3 Jan 2017 16:54:18 +0100
Subject: [PATCH] Fix indentation
---
install/docker-ci/README.md | 53 +++++++++++++++++++------------------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/install/docker-ci/README.md b/install/docker-ci/README.md
index 1d1ebae..45a50fd 100644
--- a/install/docker-ci/README.md
+++ b/install/docker-ci/README.md
@@ -8,46 +8,46 @@ 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
- ```
+```sh
+$ apt-get update
+$ apt-get install openssh-server curl vim-nox htop
+```
3. Make sure to copy access keys for personel at `/root/.ssh/authorized_keys`
4. Access your machine via ssh from this point onwards, make sure it is OK
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
- ```
+```sh
+$ dpkg-reconfigure locales
+```
7. Install docker:
- ```sh
- $ curl -sSL https://get.docker.com/ | sh
- ```
+```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
- ```
+```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
- ```
+```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
- $ service gitlab-runner restart
- ```
+```sh
+$ gitlab-ci-multi-runner register
+$ vim /etc/gitlab-runner/config.toml
+$ service gitlab-runner restart
+```
If you'd like to user `docker build`, you'll need to register 2 runners: one
with the `docker` executor and another with a `shell` executor (that 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/
- $ scp ./gitlab.crt root@<machine>:/etc/docker/certs.d/docker.idiap.ch/
- ```
+```sh
+$ mkdir -p /etc/docker/certs.d/docker.idiap.ch
+$ scp ./docker.crt root@<machine>:/etc/docker/certs.d/docker.idiap.ch/
+$ scp ./gitlab.crt root@<machine>:/etc/docker/certs.d/docker.idiap.ch/
+```
## Kernel Support
@@ -99,4 +99,5 @@ $ make menuconfig
# Save the new configuration
$ fakeroot make-kpkg --initrd --revision=1.0.bob kernel_image
$ dpkg -i ../linux-image-*.dpkg
+$ shutdown -r now
```
--
GitLab