diff --git a/libpod.conf b/libpod.conf index 0f3a19d..643e0f4 100644 --- a/libpod.conf +++ b/libpod.conf @@ -119,6 +119,23 @@ runtime_supports_json = ["runc"] runc = [ ] + +# Kata Containers is an OCI runtime, where containers are run inside lightweight +# VMs. Kata provides additional isolation towards the host, minimizing the host attack +# surface and mitigating the consequences of containers breakout. + +# Kata Containers with the default configured VMM +kata-runtime = [ +] + +# Kata Containers with the QEMU VMM +kata-qemu = [ +] + +# Kata Containers with the Firecracker VMM +kata-fc = [ +] + # The [runtimes] table MUST be the last thing in this file. # (Unless another table is added) # TOML does not provide a way to end a table other than a further table being diff --git a/podman.changes b/podman.changes index c56b4bf..9f93a73 100644 --- a/podman.changes +++ b/podman.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 5 15:26:01 UTC 2019 - Marco Vedovati + +- Add katacontainers as a recommended package, and include it as an + additional OCI runtime in the configuration. + ------------------------------------------------------------------- Tue Aug 27 08:04:20 UTC 2019 - Marco Vedovati diff --git a/podman.spec b/podman.spec index 5b23f60..9ad2948 100644 --- a/podman.spec +++ b/podman.spec @@ -65,6 +65,7 @@ Requires: slirp4netns >= 0.3.0 Requires: catatonit Requires: fuse-overlayfs Recommends: %{name}-cni-config = %{version} +Recommends: katacontainers %{go_nostrip} %if 0%{?with_libostree} BuildRequires: libostree-devel