From 259252cdf683369c41241e3cdf23794353893c94 Mon Sep 17 00:00:00 2001
From: Andres Montalban <andres.m@miro.com>
Date: Tue, 23 Jul 2024 17:24:43 -0300
Subject: [PATCH] sec: Upgrade Ubuntu to latest LTS version

---
 CHANGELOG.md                          | 4 ++++
 cmd/grafana-agent-operator/Dockerfile | 2 +-
 cmd/grafana-agent/Dockerfile          | 2 +-
 cmd/grafana-agentctl/Dockerfile       | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c47cbbf4b1f1..6ca2cbecf20d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@ internal API changes are not present.
 Main (unreleased)
 -----------------
 
+### Other changes
+
+- Change the Docker base image for Linux containers to `ubuntu:noble`. (@amontalban)
+
 v0.42.0 (2024-07-24)
 -------------------------
 
diff --git a/cmd/grafana-agent-operator/Dockerfile b/cmd/grafana-agent-operator/Dockerfile
index c18b4a27420b..1cea76934f65 100644
--- a/cmd/grafana-agent-operator/Dockerfile
+++ b/cmd/grafana-agent-operator/Dockerfile
@@ -22,7 +22,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     RELEASE_BUILD=${RELEASE_BUILD} VERSION=${VERSION} \
     make operator
 
-FROM public.ecr.aws/ubuntu/ubuntu:mantic
+FROM public.ecr.aws/ubuntu/ubuntu:noble
 
 LABEL org.opencontainers.image.source="https://github.com/grafana/agent"
 
diff --git a/cmd/grafana-agent/Dockerfile b/cmd/grafana-agent/Dockerfile
index c729901b0576..6b1e4412b150 100644
--- a/cmd/grafana-agent/Dockerfile
+++ b/cmd/grafana-agent/Dockerfile
@@ -30,7 +30,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     GOEXPERIMENT=${GOEXPERIMENT} \
     make agent
 
-FROM public.ecr.aws/ubuntu/ubuntu:mantic
+FROM public.ecr.aws/ubuntu/ubuntu:noble
 
 #Username and uid for grafana-agent user
 ARG UID=473
diff --git a/cmd/grafana-agentctl/Dockerfile b/cmd/grafana-agentctl/Dockerfile
index 06a48141f8c4..05c68547d7fe 100644
--- a/cmd/grafana-agentctl/Dockerfile
+++ b/cmd/grafana-agentctl/Dockerfile
@@ -23,7 +23,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     GO_TAGS="netgo promtail_journal_enabled" \
     make agentctl
 
-FROM public.ecr.aws/ubuntu/ubuntu:mantic
+FROM public.ecr.aws/ubuntu/ubuntu:noble
 
 LABEL org.opencontainers.image.source="https://github.com/grafana/agent"