From 75f66458614c75d15eb845b90d50b1ad742c33aa Mon Sep 17 00:00:00 2001
From: Giles Knap <giles.knap@diamond.ac.uk>
Date: Wed, 20 Mar 2024 13:27:21 +0000
Subject: [PATCH] explicit install of proxy python package

---
 Dockerfile           |  3 ++-
 ioc/install_proxy.sh | 23 -----------------------
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 ioc/install_proxy.sh

diff --git a/Dockerfile b/Dockerfile
index 2c5b9df..682c673 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,7 +57,8 @@ COPY ioc ${SOURCE_FOLDER}/ioc
 RUN cd ${IOC} && ./install.sh && make
 
 # install runtime proxy for non-native builds
-RUN bash ${IOC}/install_proxy.sh
+RUN if [ EPICS_TARGET_ARCH != "linux_x86-64" ] ; then \
+    pip install rtems-proxy==0.2.2 fi
 
 ##### runtime preparation stage ################################################
 FROM developer AS runtime_prep
diff --git a/ioc/install_proxy.sh b/ioc/install_proxy.sh
deleted file mode 100644
index d53ac26..0000000
--- a/ioc/install_proxy.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# This script installs a python proxy for the IOC.  The proxy is used to
-# communicate with the IOC from the kubernetes pod where the IOC is non-native
-# and cannot run in the cluster itself.
-
-# Only one proxy will be installed based on the EPICS_TARGET_ARCH
-# the entry point for all proxies will be "epics-proxy start" and will
-# be called by the default IOC start.sh script after it has prepared
-# runtime assets.
-# TODO: at present the rtems-proxy is the only supported proxy and uses
-# rtems-proxy start as its entry point.
-# TODO: consider renaming to ioc-proxy and genericizing. This would
-# negate the need for this script.
-
-# Most IOCs are native linux-x86_64 and will run directly in the cluster
-# so proxy installation is not required.
-
-if [[ $EPICS_TARGET_ARCH == "RTEMS-beatnik" ]] ; then
-    pip install rtems-proxy=="0.2.1"
-fi
-
-# no other proxies supported at present