From f0734ac68e33d0a171314e4d50aca08bd7197aca Mon Sep 17 00:00:00 2001
From: Giles Knap <giles.knap@diamond.ac.uk>
Date: Sun, 17 Mar 2024 11:28:54 +0000
Subject: [PATCH] fix start-proxy.sh

---
 .github/workflows/build.yml | 2 +-
 ioc/start.sh                | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 84dc20e..c364054 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
             epics-host: linux-x86_64
             extension: -rtems-beatnik
             platform: linux/amd64
-            runtime: "RUNTIME=ghcr.io/epics-containers/rtems-proxy:0.1.5"
+            runtime: "RUNTIME=ghcr.io/epics-containers/rtems-proxy:0.1.6"
 
           - epics-target: linux-x86_64
             epics-host: linux-x86_64
diff --git a/ioc/start.sh b/ioc/start.sh
index 9c935bf..141e296 100755
--- a/ioc/start.sh
+++ b/ioc/start.sh
@@ -160,7 +160,12 @@ if [[ ${TARGET_ARCHITECTURE} == "linux-x86_64" ]] ; then
     exec ${IOC}/bin/linux-x86_64/ioc ${final_ioc_startup}
 else
     # not native architectures will have a proxy-start.sh in the root
-    /proxy-start.sh
+    if [[ -f ${CONFIG_DIR}/proxy-start.sh ]]; then
+        # instances can provide their own proxy-start ovedrride in config
+        bash ${CONFIG_DIR}/proxy-start.sh
+    fi
+    # the proxy container will provide a default proxy-start.sh in the root
+    bash /proxy-start.sh
 fi