github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-07 11:04:12 +00:00
Code Issues Projects Releases Wiki Activity

docs: Fix debian docker install

Browse Source 
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>
This commit is contained in:
James O. D. Hunt 2019-04-26 10:46:34 +01:00
parent adb1ca046f
commit 74bbd537d9
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
install/docker/debian-docker-install.md
View File

@ -31,7 +31,7 @@ a. sysVinit
- with sysVinit, docker config is stored in `/etc/default/docker`, edit the options similar to the following: - 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 $ 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" 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 EOF
``` ```
c. systemd Docker `daemon.json` c. Docker `daemon.json`
Add the following definitions to `/etc/docker/daemon.json`: Add the following definitions to `/etc/docker/daemon.json`:
```bash ```json
$ sudo sh -c "echo '{ {
\"default-runtime\": \"kata-runtime\", "default-runtime": "kata-runtime",
\"runtimes\": { "runtimes": {
\"kata-runtime\": { "kata-runtime": {
\"path\": \"/usr/bin/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): 3. Restart the Docker systemd service with one of the following (depending on init choice):
a. sysVinit a. sysVinit
```bash ```sh
$ sudo /etc/init.d/docker stop $ sudo /etc/init.d/docker stop
$ sudo /etc/init.d/docker start $ sudo /etc/init.d/docker start
``` ```
to watch for errors: To watch for errors:
```bash ```sh
tail -f /var/log/docker.log $ tail -f /var/log/docker.log
``` ```
b. systemd b. systemd
@ -94,6 +94,3 @@ c. systemd Docker `daemon.json`
The previous command shows details of the kernel version running inside the The previous command shows details of the kernel version running inside the
container, which is different to the host kernel version. container, which is different to the host kernel version.