From 74bbd537d93f33054d44aae194123b755aaad52a Mon Sep 17 00:00:00 2001
From: "James O. D. Hunt" <james.o.hunt@intel.com>
Date: Fri, 26 Apr 2019 10:46:34 +0100
Subject: [PATCH] docs: Fix debian docker install

Fix installing docker on Debian by changing the docker install guide to
ensure that only the `kata-containers.conf` systemd service snippet is
created. Previously, both the snippet and the `daemon.json` Docker
config files were being updated because the latter also specified a bash
code block.

Note that the `daemon.json` section is now consistent with the other
install guides - it just displays the JSON code to add rather than
trying to set it.

Also, added missing shell prompts, changed code blocks into shell (but
not bash) code blocks and fixed a few minor grammar and whitespace
issues.

For further details, see:

- https://github.com/kata-containers/documentation/blob/master/Documentation-Requirements.md
- https://github.com/kata-containers/tests/tree/master/cmd/kata-manager

Fixes #442.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
---
 install/docker/debian-docker-install.md | 29 +++++++++++--------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/install/docker/debian-docker-install.md b/install/docker/debian-docker-install.md
index 9cf9bbc7fa..136d308cc3 100644
--- a/install/docker/debian-docker-install.md
+++ b/install/docker/debian-docker-install.md
@@ -31,7 +31,7 @@ a. sysVinit
     
     - with sysVinit,  docker config is stored in `/etc/default/docker`, edit the options similar to the following: 
        
-    ```
+    ```sh
     $ sudo sh -c "echo '# specify docker runtime for kata-containers
     DOCKER_OPTS=\"-D --add-runtime kata-runtime=/usr/bin/kata-runtime --default-runtime=kata-runtime\"' >> /etc/default/docker"
     ```
@@ -47,34 +47,34 @@ b. systemd
     EOF
     ```
 
-c. systemd Docker `daemon.json`
+c. Docker `daemon.json`
 
     Add the following definitions to `/etc/docker/daemon.json`:
 
-    ```bash
-    $ sudo sh -c "echo '{
-      \"default-runtime\": \"kata-runtime\",
-      \"runtimes\": {
-        \"kata-runtime\": {
-          \"path\": \"/usr/bin/kata-runtime\"
+    ```json
+    {
+      "default-runtime": "kata-runtime",
+      "runtimes": {
+        "kata-runtime": {
+          "path": "/usr/bin/kata-runtime"
         }
       }
-    }' >> /etc/docker/daemon.json"
+    }
     ```
 
 3. Restart the Docker systemd service with one of the following (depending on init choice):
 
     a. sysVinit
   
-    ```bash
+    ```sh
     $ sudo /etc/init.d/docker stop
     $ sudo /etc/init.d/docker start
     ```
 
-    to watch for errors:
+    To watch for errors:
 
-    ```bash
-    tail -f /var/log/docker.log
+    ```sh
+    $ tail -f /var/log/docker.log
     ```
     
     b. systemd
@@ -94,6 +94,3 @@ c. systemd Docker `daemon.json`
 
    The previous command shows details of the kernel version running inside the
    container, which is different to the host kernel version.
-
-   
-