Merge pull request #447 from jodh-intel/fix-debian-docker-install

Fix debian docker install
This commit is contained in:
GabyCT 2019-04-26 08:53:59 -05:00 committed by GitHub
commit 1deb4d2d80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 130 additions and 132 deletions

View File

@ -65,4 +65,4 @@
```
The previous command shows details of the kernel version running inside the
container, which is different from the host kernel version.
container, which is different to the host kernel version.

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:
```
```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.

View File

@ -20,7 +20,7 @@
For more information on installing Docker please refer to the
[Docker Guide](https://www.suse.com/documentation/sles-12/singlehtml/book_sles_docker/book_sles_docker.html).
2. Configure Docker to use Kata Containers with one of the following methods:
2. Configure Docker to use Kata Containers by default with one of the following methods:
1. systemd

View File

@ -1,6 +1,7 @@
# Install Kata Containers on Ubuntu
1. Install the Kata Containers components with the following commands:
```bash
$ ARCH=$(arch)
$ BRANCH="${BRANCH:-master}"