From 69d157f78b8626983f7cbfeeff3c652a1ba91bc6 Mon Sep 17 00:00:00 2001 From: Jakob Naucke Date: Thu, 25 Nov 2021 16:49:35 +0100 Subject: [PATCH] CCv0: Use Ubuntu as base for initrd As discussed in #2908, Ubuntu is used as a base for CCv0 for building umoci in the guest. Currently, CCv0 only works with initrd, so this only applies to initrd. Signed-off-by: Jakob Naucke --- .../packaging/kata-deploy/local-build/dockerbuild/Dockerfile | 1 + versions.yaml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile b/tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile index 8df4c14740..7a4afab1f0 100644 --- a/tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile +++ b/tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile @@ -28,6 +28,7 @@ RUN sh -c "echo '${IMG_USER} ALL=NOPASSWD: ALL' >> /etc/sudoers" #FIXME: gcc is required as agent is build out of a container build. RUN apt-get update && \ apt install -y \ + cpio \ gcc \ git \ make \ diff --git a/versions.yaml b/versions.yaml index ec9d5cb86a..86cf6ba2c7 100644 --- a/versions.yaml +++ b/versions.yaml @@ -138,8 +138,8 @@ assets: url: "https://github.com/kata-containers/kata-containers/tools/osbuilder" architecture: aarch64: - name: &default-initrd-name "alpine" - version: &default-initrd-version "3.13.5" + name: &default-initrd-name "ubuntu" + version: &default-initrd-version "20.04" ppc64le: name: *default-initrd-name version: *default-initrd-version