diff --git a/tests/Dockerfile.adsimdetector b/tests/Dockerfile.adsimdetector index 4a8db72..dd4dc93 100644 --- a/tests/Dockerfile.adsimdetector +++ b/tests/Dockerfile.adsimdetector @@ -1,13 +1,15 @@ ##### build stage ############################################################## ARG TARGET_ARCHITECTURE -ARG BASE=7.0.7+ec1 +ARG BASE ARG REGISTRY=ghcr.io/epics-containers FROM ${REGISTRY}/epics-base-${TARGET_ARCHITECTURE}-developer:${BASE} AS developer +RUN pip install --upgrade ibek + # In a devcontainer this folder is mounted on the host's clone of ioc-adsimdetector -WORKDIR /workspaces/ioc-adsimdetector/ibek-support +WORKDIR /epics/ioc-adsimdetector/ibek-support # copy the global ibek files COPY ibek-support/_global/ _global @@ -31,7 +33,6 @@ COPY ibek-support/ADSimDetector/ ADSimDetector/ RUN ADSimDetector/install.sh R2-10 # Make the IOC -RUN ibek ioc generate-makefile RUN ibek ioc compile ##### runtime preparation stage ################################################ diff --git a/tests/Dockerfile.asyn b/tests/Dockerfile.asyn index 6582b71..88a458e 100644 --- a/tests/Dockerfile.asyn +++ b/tests/Dockerfile.asyn @@ -6,8 +6,10 @@ ARG TARGET_ARCHITECTURE FROM ${REGISTRY}/epics-base-${TARGET_ARCHITECTURE}-developer:${BASE} AS developer +RUN pip install --upgrade ibek + # In a devcontainer this folder is mounted on the host's clone of ioc-adsimdetector -WORKDIR /workspaces/ioc-adsimdetector/ibek-support +WORKDIR /epics/ioc-adsimdetector/ibek-support # copy the global ibek files COPY ibek-support/_global/ _global @@ -16,7 +18,6 @@ COPY ibek-support/asyn/ asyn/ RUN asyn/install.sh R4-42 # Make the IOC -RUN ibek ioc generate-makefile RUN ibek ioc compile ##### runtime preparation stage ################################################ diff --git a/tests/Dockerfile.busy b/tests/Dockerfile.busy index 4b53d5e..71b2393 100644 --- a/tests/Dockerfile.busy +++ b/tests/Dockerfile.busy @@ -6,8 +6,10 @@ ARG TARGET_ARCHITECTURE FROM ${REGISTRY}/epics-base-${TARGET_ARCHITECTURE}-developer:${BASE} AS developer +RUN pip install --upgrade ibek + # In a devcontainer this folder is mounted on the host's clone of ioc-adsimdetector -WORKDIR /workspaces/ioc-adsimdetector/ibek-support +WORKDIR /epics/ioc-adsimdetector/ibek-support # copy the global ibek files COPY ibek-support/_global/ _global @@ -22,7 +24,6 @@ COPY ibek-support/busy/ busy/ RUN busy/install.sh R1-7-3 # Make the IOC -RUN ibek ioc generate-makefile RUN ibek ioc compile ##### runtime preparation stage ################################################ diff --git a/tests/ioc.yaml b/tests/ioc.yaml index 0434b02..ac94b68 100644 --- a/tests/ioc.yaml +++ b/tests/ioc.yaml @@ -1,4 +1,4 @@ -# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adaravis/releases/download/23.9.1/adaravis.ibek.ioc.schema.json +# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adaravis/releases/download/23.9.4/ibek.ioc.schema.json ioc_name: bl45p-ea-ioc-01 description: Sample and overview cameras IOC for BL45P