Skip to content

Commit 7d06ce3

Browse files
committed
image: Bump ubuntu version to 24.04
Ubuntu 22.04 is still under support, however, some security fixes might not be backported without Pro subscription. Hence, it's better to move to ubuntu 24.04. Signed-off-by: Tam Mach <[email protected]>
1 parent edafe60 commit 7d06ce3

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

.github/renovate.json5

+12-1
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,20 @@
126126
matchPackageNames: [
127127
'docker.io/library/ubuntu',
128128
],
129-
allowedVersions: '22.04',
129+
allowedVersions: '24.04',
130130
matchBaseBranches: [
131131
'main',
132+
],
133+
},
134+
{
135+
matchFileNames: [
136+
'Dockerfile.builder'
137+
],
138+
matchPackageNames: [
139+
'docker.io/library/ubuntu',
140+
],
141+
allowedVersions: '22.04',
142+
matchBaseBranches: [
132143
'v1.32',
133144
],
134145
},

Dockerfile.builder

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Also note that if build fails due to C++ internal error or similar,
44
# it is possible that the image build needs more RAM than available by
55
# default on non-Linux docker installs.
6-
FROM docker.io/library/ubuntu:22.04@sha256:d80997daaa3811b175119350d84305e1ec9129e1799bba0bd1e3120da3ff52c3 AS base
6+
FROM docker.io/library/ubuntu:24.04@sha256:1e622c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02 AS base
77
LABEL maintainer="[email protected]"
88
ARG TARGETARCH
99
# Setup TimeZone to prevent tzdata package asking for it interactively

Dockerfile.builder.tests

+2-5
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
# it is possible that the image build needs more RAM than available by
66
# default on non-Linux docker installs.
77
#
8-
# This shoould be the same as Dockerfile.builder except the below:
9-
# - Ubuntu version is bumped to 22.04
10-
# - LLVM apt repo is from apt.llvm.org/jammy/ instead of apt.llvm.org/focal/
11-
FROM docker.io/library/ubuntu:22.04@sha256:9a0bdde4188b896a372804be2384015e90e3f84906b750c1a53539b585fbbe7f AS base
8+
FROM docker.io/library/ubuntu:24.04@sha256:1e622c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02 AS base
129
LABEL maintainer="[email protected]"
1310
ARG TARGETARCH
1411
# Setup TimeZone to prevent tzdata package asking for it interactively
@@ -28,7 +25,7 @@ RUN apt-get update && \
2825
# Cilium-envoy build dependencies
2926
software-properties-common && \
3027
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc && \
31-
apt-add-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" && \
28+
apt-add-repository -y "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-17 main" && \
3229
apt-get update && \
3330
apt-get install -y --no-install-recommends \
3431
clang-17 clang-tools-17 llvm-17-dev lldb-17 lld-17 clang-format-17 libc++-17-dev libc++abi-17-dev && \

0 commit comments

Comments
 (0)