From 3908b9a7466d759ea0cbf202e35c481cdb2e73fc Mon Sep 17 00:00:00 2001
From: Nicolas Bock <nicolas.bock@canonical.com>
Date: Wed, 29 May 2024 14:00:37 -0600
Subject: [PATCH] Bump base OS of images

Signed-off-by: Nicolas Bock <nicolas.bock@canonical.com>
---
 Dockerfile-debug         | 8 ++++----
 cmd/monitor/Dockerfile   | 5 +++--
 cmd/processor/Dockerfile | 5 +++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Dockerfile-debug b/Dockerfile-debug
index f6da57f..ca0f25e 100644
--- a/Dockerfile-debug
+++ b/Dockerfile-debug
@@ -1,12 +1,12 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 LABEL maintainer="Canonical Sustaining Engineering <edward.hope-morley@canonical.com>"
 LABEL org.opencontainers.image.description "Athena Monitor"
 
 RUN apt-get update
-RUN apt-get install --no-install-recommends --yes \
+RUN DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends apt-utils
+RUN DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
     iproute2 \
     iputils-ping
-RUN apt-get update
-RUN apt-get install --no-install-recommends --yes \
+RUN DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
     default-mysql-client
diff --git a/cmd/monitor/Dockerfile b/cmd/monitor/Dockerfile
index 5778f48..7d7e0e6 100644
--- a/cmd/monitor/Dockerfile
+++ b/cmd/monitor/Dockerfile
@@ -1,9 +1,10 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 LABEL maintainer="Canonical Sustaining Engineering <edward.hope-morley@canonical.com>"
 LABEL org.opencontainers.image.description "Athena Monitor"
 
 RUN apt-get update
-RUN apt-get --yes install \
+RUN DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends apt-utils
+RUN DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
     bc \
     bsdmainutils \
     ca-certificates \
diff --git a/cmd/processor/Dockerfile b/cmd/processor/Dockerfile
index 2647c34..02ac3ec 100644
--- a/cmd/processor/Dockerfile
+++ b/cmd/processor/Dockerfile
@@ -1,9 +1,10 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 LABEL maintainer="Canonical Sustaining Engineering <edward.hope-morley@canonical.com>"
 LABEL org.opencontainers.image.description "Athena Processor"
 
 RUN apt-get update
-RUN apt-get --yes install \
+RUN DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends apt-utils
+RUN DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
     bc \
     bsdmainutils \
     ca-certificates \