github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 06:52:13 +00:00
Code Issues Projects Releases Wiki Activity

packaging: Move builds to Ubuntu 22.04

Browse Source 
As Ubuntu 20.04 will reach its EOL in April.

Signed-off-by: Fabiano Fidêncio <fabiano@fidencio.org>
This commit is contained in:
Fabiano Fidêncio 2025-02-10 20:57:22 +01:00
parent c9f5966f56
commit 75ac09baba
7 changed files with 15 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile
View File

@ -2,7 +2,7 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
FROM ubuntu:20.04 FROM ubuntu:22.04
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
ENV INSTALL_IN_GOPATH=false ENV INSTALL_IN_GOPATH=false
# Required for libxml2-dev # Required for libxml2-dev
@ -45,10 +45,10 @@ RUN sh -c "echo '${IMG_USER} ALL=NOPASSWD: ALL' >> /etc/sudoers"
RUN if [ "${ARCH}" != "$(uname -m)" ] && [ "${ARCH}" == "s390x" ]; then sed -i 's/^deb/deb [arch=amd64]/g' /etc/apt/sources.list && \ RUN if [ "${ARCH}" != "$(uname -m)" ] && [ "${ARCH}" == "s390x" ]; then sed -i 's/^deb/deb [arch=amd64]/g' /etc/apt/sources.list && \
dpkg --add-architecture "s390x" && \ dpkg --add-architecture "s390x" && \
echo "deb [arch=s390x] http://ports.ubuntu.com/ focal main multiverse universe" >> /etc/apt/sources.list && \ echo "deb [arch=s390x] http://ports.ubuntu.com/ jammy main multiverse universe" >> /etc/apt/sources.list && \
echo "deb [arch=s390x] http://ports.ubuntu.com/ focal-security main multiverse universe" >> /etc/apt/sources.list && \ echo "deb [arch=s390x] http://ports.ubuntu.com/ jammy-security main multiverse universe" >> /etc/apt/sources.list && \
echo "deb [arch=s390x] http://ports.ubuntu.com/ focal-backports main multiverse universe" >> /etc/apt/sources.list && \ echo "deb [arch=s390x] http://ports.ubuntu.com/ jammy-backports main multiverse universe" >> /etc/apt/sources.list && \
echo "deb [arch=s390x] http://ports.ubuntu.com/ focal-updates main multiverse universe" >> /etc/apt/sources.list; fi echo "deb [arch=s390x] http://ports.ubuntu.com/ jammy-updates main multiverse universe" >> /etc/apt/sources.list; fi
#FIXME: gcc is required as agent is build out of a container build. #FIXME: gcc is required as agent is build out of a container build.
RUN apt-get update && \ RUN apt-get update && \

5
tools/packaging/static-build/agent/Dockerfile
View File

@ -2,7 +2,7 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
FROM ubuntu:20.04 FROM ubuntu:22.04
ARG RUST_TOOLCHAIN ARG RUST_TOOLCHAIN
COPY install_libseccomp.sh /usr/bin/install_libseccomp.sh COPY install_libseccomp.sh /usr/bin/install_libseccomp.sh
@ -51,6 +51,3 @@ RUN ARCH=$(uname -m); \
*) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \ *) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \
esac; \ esac; \
rustup target add "${rust_arch}-unknown-linux-${libc}" rustup target add "${rust_arch}-unknown-linux-${libc}"
# aarch64 requires this name -- link for all
RUN ln -s /usr/bin/musl-gcc "/usr/bin/$(uname -m)-linux-musl-gcc"

5
tools/packaging/static-build/coco-guest-components/Dockerfile
View File

@ -3,7 +3,7 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
FROM ubuntu:20.04 FROM ubuntu:22.04
ARG RUST_TOOLCHAIN ARG RUST_TOOLCHAIN
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
@ -55,6 +55,3 @@ RUN ARCH=$(uname -m); \
esac; \ esac; \
echo "RUST_ARCH=${rust_arch}" > /etc/profile.d/rust.sh; \ echo "RUST_ARCH=${rust_arch}" > /etc/profile.d/rust.sh; \
rustup target add "${rust_arch}-unknown-linux-${LIBC}" rustup target add "${rust_arch}-unknown-linux-${LIBC}"
# aarch64 requires this name -- link for all
RUN ln -s /usr/bin/musl-gcc "/usr/bin/$(uname -m)-linux-musl-gcc"

7
tools/packaging/static-build/initramfs/Dockerfile
View File

@ -1,7 +1,7 @@
# Copyright (c) 2022 Intel Corporation # Copyright (c) 2022 Intel Corporation
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
FROM ubuntu:20.04 FROM ubuntu:22.04
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG cryptsetup_repo=${cryptsetup_repo} ARG cryptsetup_repo=${cryptsetup_repo}
@ -12,10 +12,7 @@ ARG lvm2_version=${lvm2_version}
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ENV TZ=UTC ENV TZ=UTC
RUN apt-get update &&\ RUN apt-get update && apt-get upgrade -y && \
apt-get --no-install-recommends install -y software-properties-common &&\
add-apt-repository ppa:git-core/ppa -y &&\
apt-get update && apt-get upgrade -y && \
apt-get --no-install-recommends install -y \ apt-get --no-install-recommends install -y \
apt-utils \ apt-utils \
asciidoctor \ asciidoctor \

14
tools/packaging/static-build/ovmf/Dockerfile
View File

@ -2,7 +2,7 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
FROM ubuntu:20.04 FROM ubuntu:22.04
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \ RUN apt-get update && \
@ -14,15 +14,9 @@ RUN apt-get update && \
git \ git \
iasl \ iasl \
make \ make \
python \ nasm \
python-is-python3 \
python3 \ python3 \
python3-distutils \ python3-distutils \
uuid-dev && \ uuid-dev && \
apt-get clean && rm -rf /var/lib/lists/ && \ apt-get clean && rm -rf /var/lib/lists/
cd /tmp && curl -fsLO https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.gz && \
tar xf nasm-2.15.05.tar.gz && \
cd nasm-2.15.05 && \
./configure && \
make -j"$(nproc)" && \
make install && \
cd /tmp && rm -r nasm-2.15.05*

5
tools/packaging/static-build/shim-v2/Dockerfile
View File

@ -2,7 +2,7 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
FROM ubuntu:20.04 FROM ubuntu:22.04
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
ENV GO_HOME="/opt" ENV GO_HOME="/opt"
@ -58,6 +58,3 @@ RUN ARCH=$(uname -m); \
curl -OL "https://storage.googleapis.com/golang/go${GO_VERSION}.${kernelname}-${goarch}.tar.gz" && \ curl -OL "https://storage.googleapis.com/golang/go${GO_VERSION}.${kernelname}-${goarch}.tar.gz" && \
tar -C "${GO_HOME}" -xzf "go${GO_VERSION}.${kernelname}-${goarch}.tar.gz" && \ tar -C "${GO_HOME}" -xzf "go${GO_VERSION}.${kernelname}-${goarch}.tar.gz" && \
rm "go${GO_VERSION}.${kernelname}-${goarch}.tar.gz" rm "go${GO_VERSION}.${kernelname}-${goarch}.tar.gz"
# aarch64 requires this name -- link for all
RUN ln -s /usr/bin/musl-gcc "/usr/bin/$(uname -m)-linux-musl-gcc"

7
tools/packaging/static-build/tools/Dockerfile
View File

@ -2,7 +2,7 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
FROM ubuntu:20.04 FROM ubuntu:22.04
ARG GO_TOOLCHAIN ARG GO_TOOLCHAIN
ARG RUST_TOOLCHAIN ARG RUST_TOOLCHAIN
@ -51,8 +51,3 @@ RUN kernelname=$(uname -s | tr '[:upper:]' '[:lower:]'); \
curl -OL "https://storage.googleapis.com/golang/go${GO_TOOLCHAIN}.${kernelname}-amd64.tar.gz" && \ curl -OL "https://storage.googleapis.com/golang/go${GO_TOOLCHAIN}.${kernelname}-amd64.tar.gz" && \
tar -C "${GO_HOME}" -xzf "go${GO_TOOLCHAIN}.${kernelname}-amd64.tar.gz" && \ tar -C "${GO_HOME}" -xzf "go${GO_TOOLCHAIN}.${kernelname}-amd64.tar.gz" && \
rm "go${GO_TOOLCHAIN}.${kernelname}-amd64.tar.gz" rm "go${GO_TOOLCHAIN}.${kernelname}-amd64.tar.gz"
# cmake looks for musl binutils
# For setting CMAKE_AR, find_program searches for musl-ar.
# Symlink to system ar.
RUN ln -s "$(which ar)" /usr/bin/musl-ar