fix CI

epics-containers · Oct 2, 2023 · 4b58b30 · 4b58b30
1 parent 1fd61ea
commit 4b58b30
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git 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

diff --git 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

diff --git 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

diff --git 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