From dd716f19bb401407307cb1556ac2a28185ddded1 Mon Sep 17 00:00:00 2001 From: Kevin Putnam Date: Tue, 10 Jul 2018 16:20:01 -0700 Subject: [PATCH 1/2] added note for proxy config for docker, improved wording throughout, and removed asterisks where they weren't needed. --- source/clear-linux/tutorials/kata.rst | 51 ++++++++++++++++++--------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/source/clear-linux/tutorials/kata.rst b/source/clear-linux/tutorials/kata.rst index 615f9e1e..a21a8542 100644 --- a/source/clear-linux/tutorials/kata.rst +++ b/source/clear-linux/tutorials/kata.rst @@ -4,10 +4,9 @@ Install Kata Containers\* ####################### This tutorial describes how to install, configure and run Kata Containers\* on -|CLOSIA|. Kata Containers\* is an open source project and community working to -build a standard implementation of lightweight Virtual Machines (VMs) that feel -and perform like containers, but provide the workload isolation and security -advantages of VMs. Kata Containers\* is available in Clear Linux versions above 23380. +|CLOSIA|. Kata Containers is an open source project dedicated to the +development of a lightweight implementation of Virtual Machines (VMs) +offering the speed of containers and the security of VMs. Prerequisites ************* @@ -22,17 +21,17 @@ Before you install any new packages, update |CL| with the following command: sudo swupd update -Install Kata Containers\* +Install Kata Containers *********************** -Kata Containers\* is included in the :file:`containers-virt` bundle. To install the +Kata Containers is included in the :file:`containers-virt` bundle. To install the framework, enter: .. code-block:: bash sudo swupd bundle-add containers-virt -Configure Docker to use Kata Containers\* by default +Configure Docker\* to use Kata Containers by default .. code-block:: bash @@ -43,35 +42,55 @@ Configure Docker to use Kata Containers\* by default ExecStart=/usr/bin/dockerd -D --add-runtime kata-runtime=/usr/bin/kata-runtime --default-runtime=kata-runtime EOF -Restart the Docker\* and Kata Containers\* systemd services +Restart the Docker and Kata Containers systemd services .. code-block:: bash sudo systemctl daemon-reload sudo systemctl restart docker -Run Kata Containers\* +Run Kata Containers ******************* .. code-block:: bash sudo docker run -ti busybox sh +.. note:: + + In cases where it is necessary to use a proxy server and your proxy + environment variables are already set, run the following commands as + a shell script to configure Docker: + + .. code-block:: bash + + docker_service_dir="/etc/systemd/system/docker.service.d/" + sudo mkdir -p "$docker_service_dir" + cat < Date: Wed, 11 Jul 2018 14:09:53 -0700 Subject: [PATCH 2/2] corrected runtime references --- source/clear-linux/tutorials/kata.rst | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/source/clear-linux/tutorials/kata.rst b/source/clear-linux/tutorials/kata.rst index a21a8542..b13b2fee 100644 --- a/source/clear-linux/tutorials/kata.rst +++ b/source/clear-linux/tutorials/kata.rst @@ -84,14 +84,15 @@ More information about Docker in |CLOSIA|. ############################################# Docker on |CLOSIA| provides a docker.service service file to start the Docker -daemon. The daemon will use runc or cc-runtime depending on the environment: +daemon. The daemon will use runc or s/cc-runtime/kata-runtime depending on +the environment: -If you are running |CL| on baremetal or on a VM with Nested -Virtualization activated, Docker will use cc-runtime as the default runtime. -If you are running |CL| on a VM without Nested Virtualization, Docker -will use runc as the default runtime. It is not necessary to configure Docker -to use cc-runtime manually since Docker itself will automatically use this -runtime on systems that support it. +If you are running |CL| on bare metal or on a VM with Nested +Virtualization activated, Docker will use s/cc-runtime/kata-runtime as the +default runtime. If you are running |CL| on a VM without Nested +Virtualization, Docker will use runc as the default runtime. It is not +necessary to manually configure the runtime for Docker, since Docker itself +will automatically use the one supported by the system. To check which runtime your system is using, run: