From f45df66f3402f87f2c8360ea85531c3bd4ea503c Mon Sep 17 00:00:00 2001
From: Ollie Copping <oliver.copping@diamond.ac.uk>
Date: Mon, 27 Jan 2025 09:58:55 +0000
Subject: [PATCH] Bump version of ubuntu to 24.04

---
 .devcontainer/devcontainer.json | 2 +-
 .github/workflows/build.yml     | 4 ++--
 Dockerfile                      | 4 ++--
 build                           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a4a6482..41356c2 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -7,7 +7,7 @@
         "args": {
             // Native target development settings ==============================
             "EPICS_TARGET_ARCH": "linux-x86_64",
-            "BASE_IMAGE": "ubuntu:22.04"
+            "BASE_IMAGE": "ubuntu:24.04"
             // Local cross compilation settings ================================
             // "EPICS_TARGET_ARCH": "RTEMS-beatnik",
             // "BASE_IMAGE": "ghcr.io/epics-containers/rtems-beatnik-runtime"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 204ffe2..afd4637 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
           - epics-target: linux-x86_64
             epics-host: linux-x86_64
             name: epics-base
-            base_image: ubuntu:22.04
+            base_image: ubuntu:24.04
             platform: linux/amd64
 
           # cross compile for RTEMS to VME5500 (power pc beatnik)
@@ -36,7 +36,7 @@ jobs:
           - epics-target: linux-aarch64
             epics-host: linux-x86_64
             name: epics-base-aarch64
-            base_image: ubuntu:22.04
+            base_image: ubuntu:24.04
             platform: linux/amd64
 
     runs-on: ${{ matrix.os }}
diff --git a/Dockerfile b/Dockerfile
index c117836..47e185e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,8 +6,8 @@
 #   EPICS_HOST_ARCH: the epics host architecture name
 #   BASE_IMAGE: can be used to bring in cross compilation tools
 
-ARG BASE_IMAGE=ubuntu:22.04
-ARG RUNTIME_BASE=ubuntu:22.04
+ARG BASE_IMAGE=ubuntu:24.04
+ARG RUNTIME_BASE=ubuntu:24.04
 
 ##### developer stage ##########################################################
 FROM ${BASE_IMAGE} AS developer
diff --git a/build b/build
index 15c7622..2db13a4 100755
--- a/build
+++ b/build
@@ -16,7 +16,7 @@ TAG=${TAG:-ec_test}
 if [ "$T_A" = "RTEMS-beatnik" ]; then
     base="ghcr.io/epics-containers/rtems-beatnik-runtime"
 else
-    base="ubuntu:22.04"
+    base="ubuntu:24.04"
 fi
 
 cd $(dirname ${0})