Skip to content

[v1.32] image: Bump ubuntu version to 24.04 #1272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: v1.32
Choose a base branch
from
+5 −20
Draft

[v1.32] image: Bump ubuntu version to 24.04 #1272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,24 +109,12 @@
{
matchFileNames: [
'Dockerfile',
],
matchPackageNames: [
'docker.io/library/ubuntu',
],
allowedVersions: '24.04',
matchBaseBranches: [
'main',
'v1.31',
],
},
{
matchFileNames: [
'Dockerfile.builder'
],
matchPackageNames: [
'docker.io/library/ubuntu',
],
allowedVersions: '22.04',
allowedVersions: '24.04',
matchBaseBranches: [
'main',
'v1.31',
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.builder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Also note that if build fails due to C++ internal error or similar,
# it is possible that the image build needs more RAM than available by
# default on non-Linux docker installs.
FROM docker.io/library/ubuntu:22.04@sha256:d80997daaa3811b175119350d84305e1ec9129e1799bba0bd1e3120da3ff52c3 AS base
FROM docker.io/library/ubuntu:24.04@sha256:1e622c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02 AS base
LABEL maintainer="[email protected]"
ARG TARGETARCH
# Setup TimeZone to prevent tzdata package asking for it interactively
Expand All @@ -27,7 +27,7 @@ RUN apt-get update && \
# Cilium-envoy build dependencies
software-properties-common && \
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc && \
apt-add-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" && \
apt-add-repository -y "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-17 main" && \
apt-get update && \
apt-get install -y --no-install-recommends \
clang-17 clang-tools-17 llvm-17-dev lldb-17 lld-17 clang-format-17 libc++-17-dev libc++abi-17-dev && \
Expand Down
7 changes: 2 additions & 5 deletions Dockerfile.builder.tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
# it is possible that the image build needs more RAM than available by
# default on non-Linux docker installs.
#
# This shoould be the same as Dockerfile.builder except the below:
# - Ubuntu version is bumped to 22.04
# - LLVM apt repo is from apt.llvm.org/jammy/ instead of apt.llvm.org/focal/
FROM docker.io/library/ubuntu:22.04@sha256:9a0bdde4188b896a372804be2384015e90e3f84906b750c1a53539b585fbbe7f AS base
FROM docker.io/library/ubuntu:24.04@sha256:1e622c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02 AS base
LABEL maintainer="[email protected]"
ARG TARGETARCH
# Setup TimeZone to prevent tzdata package asking for it interactively
Expand All @@ -28,7 +25,7 @@ RUN apt-get update && \
# Cilium-envoy build dependencies
software-properties-common && \
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc && \
apt-add-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" && \
apt-add-repository -y "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-17 main" && \
apt-get update && \
apt-get install -y --no-install-recommends \
clang-17 clang-tools-17 llvm-17-dev lldb-17 lld-17 clang-format-17 libc++-17-dev libc++abi-17-dev && \
Expand Down
Loading