diff --git a/images/bpftool/Dockerfile b/images/bpftool/Dockerfile index 57aa916..de4e7ac 100644 --- a/images/bpftool/Dockerfile +++ b/images/bpftool/Dockerfile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 ARG COMPILERS_IMAGE=quay.io/cilium/image-compilers:5569a29cea6b3ad50aeb03102aaf3dc03841197c@sha256:b15dbedb7c49816c74a765e2f6ecdb9359763b8e4e4328d794f48b9cefae9804 -ARG UBUNTU_IMAGE=docker.io/library/ubuntu:22.04@sha256:26c68657ccce2cb0a31b330cb0be2b5e108d467f641c62e13ab40cbec258c68d +ARG UBUNTU_IMAGE=docker.io/library/ubuntu:24.04@sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30 ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73 FROM --platform=linux/amd64 ${COMPILERS_IMAGE} as builder diff --git a/images/compilers/Dockerfile b/images/compilers/Dockerfile index dc6737d..74ba010 100644 --- a/images/compilers/Dockerfile +++ b/images/compilers/Dockerfile @@ -1,7 +1,7 @@ # Copyright 2020 Authors of Cilium # SPDX-License-Identifier: Apache-2.0 -ARG UBUNTU_IMAGE=docker.io/library/ubuntu:22.04@sha256:26c68657ccce2cb0a31b330cb0be2b5e108d467f641c62e13ab40cbec258c68d +ARG UBUNTU_IMAGE=docker.io/library/ubuntu:24.04@sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30 ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73 FROM ${UBUNTU_IMAGE} as builder diff --git a/images/compilers/install-deps.sh b/images/compilers/install-deps.sh index d34de22..712e3f8 100755 --- a/images/compilers/install-deps.sh +++ b/images/compilers/install-deps.sh @@ -26,7 +26,6 @@ packages=( make ninja-build pkg-config - python2 python3 python3-pip unzip @@ -42,15 +41,36 @@ packages_amd64=( export DEBIAN_FRONTEND=noninteractive -cat > /etc/apt/sources.list << EOF -deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy main restricted universe multiverse -deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-updates main restricted universe multiverse -deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-security main restricted universe multiverse -deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-backports main restricted universe multiverse -deb [arch=arm64] http://ports.ubuntu.com/ jammy main restricted universe multiverse -deb [arch=arm64] http://ports.ubuntu.com/ jammy-updates main restricted universe multiverse -deb [arch=arm64] http://ports.ubuntu.com/ jammy-security main restricted universe multiverse -deb [arch=arm64] http://ports.ubuntu.com/ jammy-backports main restricted universe multiverse +cat > /etc/apt/sources.list.d/ubuntu.sources << EOF +Types: deb +URIs: http://archive.ubuntu.com/ubuntu/ +Suites: noble noble-updates noble-backports +Components: main universe restricted multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg +Architectures: amd64 + +## Ubuntu security updates. Aside from URIs and Suites, +## this should mirror your choices in the previous section. +Types: deb +URIs: http://security.ubuntu.com/ubuntu/ +Suites: noble-security +Components: main universe restricted multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg +Architectures: amd64 + +Types: deb +URIs: http://ports.ubuntu.com/ +Suites: noble noble-updates noble-backports +Components: main restricted universe multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg +Architectures: arm64 + +Types: deb +URIs: http://ports.ubuntu.com/ubuntu-ports/ +Suites: noble-security +Components: main universe restricted multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg +Architectures: arm64 EOF if [ "$(uname -m)" == "x86_64" ] ; then @@ -66,7 +86,6 @@ if [ "$(uname -m)" == "x86_64" ] ; then apt-get install -y --no-install-recommends "${packages_amd64[@]}" fi -update-alternatives --install /usr/bin/python python /usr/bin/python2 1 update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 2 if [ "$(uname -m)" == "x86_64" ] ; then update-alternatives --install /usr/bin/aarch64-linux-gnu-gcc aarch64-linux-gnu-gcc /usr/bin/aarch64-linux-gnu-gcc-9 3 diff --git a/images/iptables/Dockerfile b/images/iptables/Dockerfile index 3517ef5..dda8361 100644 --- a/images/iptables/Dockerfile +++ b/images/iptables/Dockerfile @@ -1,14 +1,14 @@ # Copyright Authors of Cilium # SPDX-License-Identifier: Apache-2.0 -# This file builds iptables 1.8.8-1 from source using Ubuntu 22.04 +# This file builds iptables 1.8.8-1 from source using Ubuntu 24.04 # The source code comes from Debian Bookworm snapshots # To upgrade to a new iptables version, change also the snapshot date. ARG IPTABLES_VERSION=1.8.8-1 ARG SNAPSHOT_DATE=20230116T212610Z -FROM docker.io/library/ubuntu:22.04@sha256:27cb6e6ccef575a4698b66f5de06c7ecd61589132d5a91d098f7f3f9285415a9 +FROM docker.io/library/ubuntu:24.04@sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30 RUN mkdir /iptables WORKDIR /iptables diff --git a/images/llvm/Dockerfile b/images/llvm/Dockerfile index 35a5f19..7d41151 100644 --- a/images/llvm/Dockerfile +++ b/images/llvm/Dockerfile @@ -2,6 +2,8 @@ # SPDX-License-Identifier: Apache-2.0 ARG COMPILERS_IMAGE=quay.io/cilium/image-compilers:5569a29cea6b3ad50aeb03102aaf3dc03841197c@sha256:b15dbedb7c49816c74a765e2f6ecdb9359763b8e4e4328d794f48b9cefae9804 +#TODO Bump to 24.04 once the verifier tests are fixed +#Verifier tests TestVerifier/bpf_host/{1,2} is failing if we use ubuntu 24.04 ARG UBUNTU_IMAGE=docker.io/library/ubuntu:22.04@sha256:26c68657ccce2cb0a31b330cb0be2b5e108d467f641c62e13ab40cbec258c68d ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73