fixes for DLS podman

epics-containers · Nov 30, 2024 · 67e63cb · 67e63cb
1 parent 81f2dc2
commit 67e63cb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/opi/phoebus-launch.sh b/opi/phoebus-launch.sh
@@ -11,12 +11,12 @@ settings="
 -settings ${workspace}/opi/settings.ini
 "
 
-if which phoebus.sh &>/dev/null ; then
+if which XXphoebus.sh &>/dev/null ; then
     echo "Using phoebus.sh from PATH"
     set -x
     phoebus.sh ${settings} "${@}"
 
-elif module load phoebus 2>/dev/null; then
+elif module load XXphoebus 2>/dev/null; then
     echo "Using phoebus module"
     set -x
     phoebus.sh ${settings} "${@}"
@@ -36,7 +36,7 @@ else
 
     # settings for container launch
     x11="-e DISPLAY --net host"
-    args="--rm -it --security-opt=label=none --user ${UIDGID}"
+    args="--rm -it --security-opt=label=disable --user ${UIDGID}"
     mounts="-v=/tmp:/tmp -v=${workspace}:/workspace"
     image="ghcr.io/epics-containers/ec-phoebus:latest"
 

diff --git a/services/bl01t-launch.sh b/services/bl01t-launch.sh
@@ -14,10 +14,12 @@ if podman version &> /dev/null && [[ -z $USE_DOCKER ]]
 fi
 echo "Using $docker as container runtime"
 
-args="--rm -it"
+mkdir -p $this_dir/../opi/auto-generated
+
+args="--rm -it --security-opt=label=disable --user $UIDGID"
 ca="-p 127.0.0.1:5064:5064/udp -p 127.0.0.1:5064-5065:5064-5065"
 pva="-p 127.0.0.1:5076:5076/udp -p 127.0.0.1:5075:5075"
-vols="-v /tmp:/tmp"
+vols="-v /tmp:/tmp -v $this_dir/../opi/auto-generated:/epics/opi"
 image="ghcr.io/epics-containers/pva-demo-developer:2024.11.2"
 
 set -x