Merge pull request #1 from ulrikpedersen/main

Sync with main repo
8ryn · Jan 30, 2024 · 2fdcaec · 2fdcaec
2 parents cc57c62 + 97ede35
commit 2fdcaec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/sim/areaDetectorDock/Dockerfile b/sim/areaDetectorDock/Dockerfile
@@ -1,10 +1,11 @@
 ##### runtime stage ############################################################
 
-FROM ghcr.io/epics-containers/ioc-adsimdetector-linux-runtime:23.3.4 AS runtime
+FROM ghcr.io/epics-containers/ioc-adsimdetector-linux-runtime:2023.11.2 AS runtime
 
 #copy config folder
 COPY config ${IOC}/config
 
 #User created to avoid writing files as root
+RUN chmod a+w /epics
 RUN useradd --shell /bin/bash ioc
 USER ioc
diff --git a/sim/areaDetectorDock/config/st.cmd b/sim/areaDetectorDock/config/st.cmd
@@ -34,4 +34,4 @@ dbpf "ADT:USER1:CAM:ImageMode", "Single"
 
 dbpf "ADT:USER1:CAM:Noise", "5"
 
-dbpf "ADT:USER1:CAM:NDAttributesFile", "/repos/epics/ioc/config/detAttributes.xml"
+dbpf "ADT:USER1:CAM:NDAttributesFile", "/epics/ioc/config/detAttributes.xml"
diff --git a/sim/pulsedLaser/Dockerfile b/sim/pulsedLaser/Dockerfile
@@ -1,6 +1,6 @@
 FROM python:3.10
 
-RUN pip install softioc cothread
+RUN pip install softioc==4.4.0 cothread==2.18.3
 
 COPY simPulse.py SimPulse.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,4 +34,4 @@ dbpf "ADT:USER1:CAM:ImageMode", "Single"

		dbpf "ADT:USER1:CAM:Noise", "5"

		dbpf "ADT:USER1:CAM:NDAttributesFile", "/repos/epics/ioc/config/detAttributes.xml"
		dbpf "ADT:USER1:CAM:NDAttributesFile", "/epics/ioc/config/detAttributes.xml"