Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to fix issues caused by latest adsim image #27

Merged
merged 1 commit into from
Nov 30, 2023
Merged

Changes to fix issues caused by latest adsim image #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sim/areaDetectorDock/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion sim/areaDetectorDock/config/st.cmd
View file
Open in desktop
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"
2 changes: 1 addition & 1 deletion sim/pulsedLaser/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down