fix start-proxy.sh

epics-containers · Mar 17, 2024 · f0734ac · f0734ac
1 parent bd07d14
commit f0734ac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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