File tree 3 files changed +15
-7
lines changed
3 files changed +15
-7
lines changed Original file line number Diff line number Diff line change 126
126
matchPackageNames : [
127
127
'docker.io/library/ubuntu' ,
128
128
] ,
129
- allowedVersions : '22 .04' ,
129
+ allowedVersions : '24 .04' ,
130
130
matchBaseBranches : [
131
131
'main' ,
132
+ ] ,
133
+ } ,
134
+ {
135
+ matchFileNames : [
136
+ 'Dockerfile.builder'
137
+ ] ,
138
+ matchPackageNames : [
139
+ 'docker.io/library/ubuntu' ,
140
+ ] ,
141
+ allowedVersions : '22.04' ,
142
+ matchBaseBranches : [
132
143
'v1.32' ,
133
144
] ,
134
145
} ,
Original file line number Diff line number Diff line change 3
3
# Also note that if build fails due to C++ internal error or similar,
4
4
# it is possible that the image build needs more RAM than available by
5
5
# 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 :1e622 c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02 AS base
7
7
LABEL maintainer = "[email protected] "
8
8
ARG TARGETARCH
9
9
# Setup TimeZone to prevent tzdata package asking for it interactively
Original file line number Diff line number Diff line change 5
5
# it is possible that the image build needs more RAM than available by
6
6
# default on non-Linux docker installs.
7
7
#
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
12
9
LABEL maintainer="
[email protected] "
13
10
ARG TARGETARCH
14
11
# Setup TimeZone to prevent tzdata package asking for it interactively
@@ -28,7 +25,7 @@ RUN apt-get update && \
28
25
# Cilium-envoy build dependencies
29
26
software-properties-common && \
30
27
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" && \
32
29
apt-get update && \
33
30
apt-get install -y --no-install-recommends \
34
31
clang-17 clang-tools-17 llvm-17-dev lldb-17 lld-17 clang-format-17 libc++-17-dev libc++abi-17-dev && \
You can’t perform that action at this time.
0 commit comments