github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-18 01:13:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #319 from marcov/docker-config

Browse Source 
dev-guide: detect & use existing docker unit file
This commit is contained in:
GabyCT 2019-01-07 13:40:43 -06:00 committed by GitHub
commit f0913e2d10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Developer-Guide.md
View File

@ -262,7 +262,7 @@ $ script -fec 'sudo -E USE_DOCKER=true ./image_builder.sh ${ROOTFS_DIR}'
``` ```
> **Notes:** > **Notes:**
> >
> - You must ensure that the *default Docker runtime* is `runc` to make use of > - You must ensure that the *default Docker runtime* is `runc` to make use of
> the `USE_DOCKER` variable. If that is not the case, remove the variable > the `USE_DOCKER` variable. If that is not the case, remove the variable
> from the previous command. See [Checking Docker default runtime](#checking-docker-default-runtime). > from the previous command. See [Checking Docker default runtime](#checking-docker-default-runtime).
@ -389,14 +389,13 @@ $ script -fec 'sudo -E ${GOPATH}/src/github.com/kata-containers/tests/.ci/instal
# Run Kata Containers with Docker # Run Kata Containers with Docker
## Update Docker configuration ## Update the Docker systemd unit file
``` ```
$ dir=/etc/systemd/system/docker.service.d $ dockerUnit=$(systemctl show -p FragmentPath docker.service | cut -d "=" -f 2)
$ file="$dir/kata-containers.conf" $ unitFile=${dockerUnit:-/etc/systemd/system/docker.service.d/kata-containers.conf}
$ sudo mkdir -p "$dir" $ test -e "$unitFile" || { sudo mkdir -p "$(dirname $unitFile)"; echo -e "[Service]\nType=simple\nExecStart=\nExecStart=/usr/bin/dockerd -D --default-runtime runc" | sudo tee "$unitFile"; }
$ sudo test -e "$file" || echo -e "[Service]\nType=simple\nExecStart=\nExecStart=/usr/bin/dockerd -D --default-runtime runc" | sudo tee "$file" $ grep -q "kata-runtime=" $unitFile || sudo sed -i 's!^\(ExecStart=[^$].*$\)!\1 --add-runtime kata-runtime=/usr/local/bin/kata-runtime!g' "$unitFile"
$ sudo grep -q "kata-runtime=" $file || sudo sed -i 's!^\(ExecStart=[^$].*$\)!\1 --add-runtime kata-runtime=/usr/local/bin/kata-runtime!g' "$file"
$ sudo systemctl daemon-reload $ sudo systemctl daemon-reload
$ sudo systemctl restart docker $ sudo systemctl restart docker
``` ```
@ -512,7 +511,7 @@ implementation you chose, and the kubelet service has to be updated accordingly.
`/etc/systemd/system/kubelet.service.d/0-crio.conf` `/etc/systemd/system/kubelet.service.d/0-crio.conf`
``` ```
[Service] [Service]
Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///var/run/crio/crio.sock" Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///var/run/crio/crio.sock"
``` ```
@ -520,7 +519,7 @@ Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --runtime-request-tim
`/etc/systemd/system/kubelet.service.d/0-cri-containerd.conf` `/etc/systemd/system/kubelet.service.d/0-cri-containerd.conf`
``` ```
[Service] [Service]
Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock" Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock"
``` ```
For more information about CRI-containerd see the "Configure Kubelet to use containerd" For more information about CRI-containerd see the "Configure Kubelet to use containerd"