support network=host

epics-containers · Dec 9, 2024 · 732f1a0 · 732f1a0
1 parent bfdc5b3
commit 732f1a0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/settings/config/start-ca.sh b/settings/config/start-ca.sh
@@ -2,7 +2,6 @@
 
 # IP lists for IOCS (blank if get_ioc_ips.py fails)
 export IPS="$(python3 /config/get_ioc_ips.py)"
-export EPICS_PVA_ADDR_LIST=${IPS:-127.0.0.1}
 export EPICS_CA_ADDR_LIST=${IPS:-127.0.0.1}
 
 # PORTS for CA and PVA
@@ -13,5 +12,12 @@ export PVA_SERVER_PORT=${PVA_SERVER_PORT:-5075}
 CA_DEBUG=${CA_DEBUG:-0}
 PVA_DEBUG=${PVA_DEBUG:-0}
 
-# background the CA Gateway
-/epics/ca-gateway/bin/linux-x86_64/gateway -sport ${CA_SERVER_PORT} -cip "${EPICS_CA_ADDR_LIST}" -pvlist /config/pvlist -access /config/access -log /dev/stdout -debug ${CA_DEBUG:-0}
+# don't pass -cip if EPICS_CA_AUTO_ADDR_LIST is YES
+if [[ EPICS_CA_AUTO_ADDR_LIST == "NO" ]]; then
+  cip="-cip ${EPICS_CA_ADDR_LIST}"
+fi
+
+# start the CA Gateway
+/epics/ca-gateway/bin/linux-x86_64/gateway -sport ${CA_SERVER_PORT} $cip \
+   -pvlist /config/pvlist -access /config/access \
+   -log /dev/stdout -debug ${CA_DEBUG:-0}
diff --git a/settings/config/start-pva.sh b/settings/config/start-pva.sh
@@ -18,7 +18,7 @@ cat /config/pvagw.template |
   sed \
     -e "s/PVA_ADDR_LIST/${EPICS_PVA_ADDR_LIST}/" \
     -e "s/PVA_SERVER_PORT/${PVA_SERVER_PORT}/" \
-    > /config/pvagw.config
+    > /tmp/pvagw.config
 
 # background the PVA Gateway
-pvagw /config/pvagw.config
+pvagw /tmp/pvagw.config