From a62983f192bca15874306a0a8545056f27fd06b4 Mon Sep 17 00:00:00 2001
From: Paulin Todev <paulin.todev@gmail.com>
Date: Mon, 12 Aug 2024 09:44:53 +0100
Subject: [PATCH] Upgrade to Ubuntu 24.04 (Noble Numbat).

---
 CHANGELOG.md | 4 ++++
 Dockerfile   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c0bf0f284..0095e2f36d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,10 @@ Main (unreleased)
 - Fixed an issue where clustering peers resolution via hostname in `--cluster.join-addresses`
   resolves to duplicated IP addresses when using SRV records. (@thampiotr)
 
+### Other changes
+
+- Change the Docker base image for Linux containers to `ubuntu:noble`. (@ptodev)
+
 v1.3.0
 -----------------
 
diff --git a/Dockerfile b/Dockerfile
index 62067825d0..8a021071f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     GOEXPERIMENT=${GOEXPERIMENT} \
     make alloy
 
-FROM public.ecr.aws/ubuntu/ubuntu:mantic
+FROM public.ecr.aws/ubuntu/ubuntu:noble
 
 # Username and uid for alloy user
 ARG UID=473