From 6ef28deb96d7eab27ef33dfec6b3aca7155ce7df Mon Sep 17 00:00:00 2001
From: morph027 <morphsen@gmx.com>
Date: Fri, 13 Jul 2018 11:39:50 +0200
Subject: [PATCH] docs: add kata-runtime to Docker daemon.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: #484

Signed-off-by: Stefan Heitmüller <morphsen@gmx.com>
---
 install/docker/centos-docker-install.md | 55 ++++++++++++++++---------
 install/docker/fedora-docker-install.md | 35 ++++++++++++----
 install/docker/rhel-docker-install.md   | 35 ++++++++++++----
 install/docker/ubuntu-docker-install.md | 35 ++++++++++++----
 4 files changed, 114 insertions(+), 46 deletions(-)

diff --git a/install/docker/centos-docker-install.md b/install/docker/centos-docker-install.md
index 6c09565d83..e99b4c5afb 100644
--- a/install/docker/centos-docker-install.md
+++ b/install/docker/centos-docker-install.md
@@ -24,31 +24,48 @@
    For more information on installing Docker please refer to the
    [Docker Guide](https://docs.docker.com/engine/installation/linux/centos).
 
-2. Configure Docker to use Kata Containers by default with the following commands:
+2. Configure Docker to use Kata Containers by default with one of the following methods:
 
-   ```bash
-   $ sudo mkdir -p /etc/systemd/system/docker.service.d/
-   $ cat <<EOF | sudo tee /etc/systemd/system/docker.service.d/kata-containers.conf
-   [Service]
-   ExecStart=
-   ExecStart=/usr/bin/dockerd -D --add-runtime kata-runtime=/usr/bin/kata-runtime --default-runtime=kata-runtime
-   EOF
-   ```
+    1. systemd
+
+        ```bash
+        $ sudo mkdir -p /etc/systemd/system/docker.service.d/
+        $ cat <<EOF | sudo tee /etc/systemd/system/docker.service.d/kata-containers.conf
+        [Service]
+        ExecStart=
+        ExecStart=/usr/bin/dockerd -D --add-runtime kata-runtime=/usr/bin/kata-runtime --default-runtime=kata-runtime
+        EOF
+        ```
+
+    2. Docker `daemon.json`
+
+        Add the following definitions to `/etc/docker/daemon.json`:
+
+        ```json
+        {
+          "default-runtime": "kata-runtime",
+          "runtimes": {
+            "kata-runtime": {
+              "path": "/usr/bin/kata-runtime"
+            }
+          }
+        }
+        ```
 
 3. Restart the Docker systemd service with the following commands:
 
-   ```bash
-   $ sudo systemctl daemon-reload
-   $ sudo systemctl restart docker
-   ```
+    ```bash
+    $ sudo systemctl daemon-reload
+    $ sudo systemctl restart docker
+    ```
 
 4. Run Kata Containers
 
-   You are now ready to run Kata Containers:
+    You are now ready to run Kata Containers:
 
-   ```bash
-   $ sudo docker run busybox uname -a
-   ```
+    ```bash
+    $ sudo docker run busybox uname -a
+    ```
 
-   The previous command shows details of the kernel version running inside the
-   container, which is different to the host kernel version.
+    The previous command shows details of the kernel version running inside the
+    container, which is different from the host kernel version.
diff --git a/install/docker/fedora-docker-install.md b/install/docker/fedora-docker-install.md
index d190ec3777..5c5c991a8b 100644
--- a/install/docker/fedora-docker-install.md
+++ b/install/docker/fedora-docker-install.md
@@ -25,16 +25,33 @@
    For more information on installing Docker please refer to the
    [Docker Guide](https://docs.docker.com/engine/installation/linux/fedora).
 
-2. Configure Docker to use Kata Containers by default with the following commands:
+2. Configure Docker to use Kata Containers by default with one of the following methods:
 
-   ```bash
-   $ sudo mkdir -p /etc/systemd/system/docker.service.d/
-   $ cat <<EOF | sudo tee /etc/systemd/system/docker.service.d/kata-containers.conf
-   [Service]
-   ExecStart=
-   ExecStart=/usr/bin/dockerd -D --add-runtime kata-runtime=/usr/bin/kata-runtime --default-runtime=kata-runtime
-   EOF
-   ```
+    1. systemd
+
+        ```bash
+        $ sudo mkdir -p /etc/systemd/system/docker.service.d/
+        $ cat <<EOF | sudo tee /etc/systemd/system/docker.service.d/kata-containers.conf
+        [Service]
+        ExecStart=
+        ExecStart=/usr/bin/dockerd -D --add-runtime kata-runtime=/usr/bin/kata-runtime --default-runtime=kata-runtime
+        EOF
+        ```
+
+    2. Docker `daemon.json`
+
+        Add the following definitions to `/etc/docker/daemon.json`:
+
+        ```json
+        {
+          "default-runtime": "kata-runtime",
+          "runtimes": {
+            "kata-runtime": {
+              "path": "/usr/bin/kata-runtime"
+            }
+          }
+        }
+        ```
 
 3. Restart the Docker systemd service with the following commands:
 
diff --git a/install/docker/rhel-docker-install.md b/install/docker/rhel-docker-install.md
index dd0c0fab0d..c21d9b8f75 100644
--- a/install/docker/rhel-docker-install.md
+++ b/install/docker/rhel-docker-install.md
@@ -25,16 +25,33 @@
    For more information on installing Docker please refer to the
    [Docker Guide](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux_atomic_host/7/html-single/getting_started_with_containers/#getting_docker_in_rhel_7).
 
-2. Configure Docker to use Kata Containers by default with the following commands:
+2. Configure Docker to use Kata Containers by default with one of the following methods:
 
-   ```bash
-   $ sudo mkdir -p /etc/systemd/system/docker.service.d/
-   $ cat <<EOF | sudo tee /etc/systemd/system/docker.service.d/kata-containers.conf
-   [Service]
-   ExecStart=
-   ExecStart=/usr/bin/dockerd -D --add-runtime kata-runtime=/usr/bin/kata-runtime --default-runtime=kata-runtime
-   EOF
-   ```
+    1. systemd
+
+        ```bash
+        $ sudo mkdir -p /etc/systemd/system/docker.service.d/
+        $ cat <<EOF | sudo tee /etc/systemd/system/docker.service.d/kata-containers.conf
+        [Service]
+        ExecStart=
+        ExecStart=/usr/bin/dockerd -D --add-runtime kata-runtime=/usr/bin/kata-runtime --default-runtime=kata-runtime
+        EOF
+        ```
+
+    2. Docker `daemon.json`
+
+        Add the following definitions to `/etc/docker/daemon.json`:
+
+        ```json
+        {
+          "default-runtime": "kata-runtime",
+          "runtimes": {
+            "kata-runtime": {
+              "path": "/usr/bin/kata-runtime"
+            }
+          }
+        }
+        ```
 
 3. Restart the Docker systemd service with the following commands:
 
diff --git a/install/docker/ubuntu-docker-install.md b/install/docker/ubuntu-docker-install.md
index e8050c5992..707b2cc298 100644
--- a/install/docker/ubuntu-docker-install.md
+++ b/install/docker/ubuntu-docker-install.md
@@ -28,16 +28,33 @@
    For more information on installing Docker please refer to the
    [Docker Guide](https://docs.docker.com/engine/installation/linux/ubuntu).
 
-2. Configure Docker to use Kata Containers by default with the following commands:
+2. Configure Docker to use Kata Containers by default with one of the following methods:
 
-   ```bash
-   $ sudo mkdir -p /etc/systemd/system/docker.service.d/
-   $ cat <<EOF | sudo tee /etc/systemd/system/docker.service.d/kata-containers.conf
-   [Service]
-   ExecStart=
-   ExecStart=/usr/bin/dockerd -D --add-runtime kata-runtime=/usr/bin/kata-runtime --default-runtime=kata-runtime
-   EOF
-   ```
+    1. systemd
+
+        ```bash
+        $ sudo mkdir -p /etc/systemd/system/docker.service.d/
+        $ cat <<EOF | sudo tee /etc/systemd/system/docker.service.d/kata-containers.conf
+        [Service]
+        ExecStart=
+        ExecStart=/usr/bin/dockerd -D --add-runtime kata-runtime=/usr/bin/kata-runtime --default-runtime=kata-runtime
+        EOF
+        ```
+
+    2. Docker `daemon.json`
+
+        Add the following definitions to `/etc/docker/daemon.json`:
+
+        ```json
+        {
+          "default-runtime": "kata-runtime",
+          "runtimes": {
+            "kata-runtime": {
+              "path": "/usr/bin/kata-runtime"
+            }
+          }
+        }
+        ```
 
 3. Restart the Docker systemd service with the following commands: