From a677dffa03457a08cf4785a551d2e274fd2f2b28 Mon Sep 17 00:00:00 2001 From: Giles Knap Date: Mon, 24 Feb 2025 14:43:16 +0000 Subject: [PATCH 1/2] restore 24.04 ubuntu --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f336ea0..6ced0be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,10 @@ # EPICS_TARGET_ARCH: the epics cross compile target platform # note that linux-x86_64 is shortened to linux and is the default # EPICS_HOST_ARCH: the epics host architecture name -# BASE_IMAGE: can be used to bring in cross compilation tools +# BASE_IMAGE: can be used to bring in cross compilation tools e.g RTEMS BSP -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 From 362b984c578628e3e7de9d07daf2279416d4ef2b Mon Sep 17 00:00:00 2001 From: Giles Knap Date: Mon, 24 Feb 2025 14:45:48 +0000 Subject: [PATCH 2/2] add warning re base image changes --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 6ced0be..43a76b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ # EPICS_HOST_ARCH: the epics host architecture name # BASE_IMAGE: can be used to bring in cross compilation tools e.g RTEMS BSP +# warning - also change .github/workflows/build.yml when changing the base image ARG BASE_IMAGE=ubuntu:24.04 ARG RUNTIME_BASE=ubuntu:24.04