Skip to content

Revert bump to ubuntu 24.04 #1645

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
nezdolik wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Revert bump to ubuntu 24.04 #1645

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
13 changes: 1 addition & 12 deletions .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,20 +121,9 @@
matchPackageNames: [
'docker.io/library/ubuntu',
],
allowedVersions: '24.04',
matchBaseBranches: [
'main',
],
},
{
matchFileNames: [
'Dockerfile.builder'
],
matchPackageNames: [
'docker.io/library/ubuntu',
],
allowedVersions: '22.04',
matchBaseBranches: [
'main',
'v1.34',
],
},
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:24.04@sha256:66460d557b25769b102175144d538d88219c077c678a49af4afca6fbfc1b5252 AS base
FROM docker.io/library/ubuntu:22.04@sha256:09506232a8004baa32c47d68f1e5c307d648fdd59f5e7eaa42aaf87914100db3 AS base
LABEL maintainer="maintainer@cilium.io"
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/noble/ llvm-toolchain-noble-18 main" && \
apt-add-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" && \
apt-get update && \
apt-get install -y --no-install-recommends \
clang-18 clang-tidy-18 clang-tools-18 llvm-18-dev lldb-18 lld-18 clang-format-18 libc++-18-dev libc++abi-18-dev && \
Expand Down
4 changes: 2 additions & 2 deletions Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ apt-get update && \
python3 python-is-python3 unzip virtualenv wget zip \
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/noble/ llvm-toolchain-noble-18 main" && \
apt-add-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" && \
apt-get update && \
apt-get install -y --no-install-recommends \
clang-18 clang-tools-18 lldb-18 lld-18 clang-format-18 libc++-18-dev libc++abi-18-dev && \
Expand All @@ -41,7 +41,7 @@ apt-get update && \
SCRIPT

Vagrant.configure("2") do |config|
config.vm.box = "bento/ubuntu-24.04"
config.vm.box = "ubuntu/jammy64"
config.disksize.size = $VM_DISK

config.vm.provider "virtualbox" do |vb|
Expand Down
Loading