update to epics-base 7.0.7ec3

epics-containers · Nov 27, 2023 · f3f67df · f3f67df
1 parent 0733cb2
commit f3f67df
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,15 +1,11 @@
 ##### build stage ##############################################################
 
 ARG TARGET_ARCHITECTURE
-ARG BASE=7.0.7ec2
+ARG BASE=7.0.7ec3
 ARG REGISTRY=ghcr.io/epics-containers
 
 FROM  ${REGISTRY}/epics-base-${TARGET_ARCHITECTURE}-developer:${BASE} AS developer
 
-# Get latest ibek while in development. Will come from epics-base when stable
-COPY requirements.txt requirements.txt
-RUN pip install --upgrade -r requirements.txt
-
 # The devcontainer mounts the project root to /epics/ioc-adsimdetector. Using
 # the same location here makes devcontainer/runtime differences transparent.
 WORKDIR /epics/ioc-pmac/ibek-support
@@ -41,9 +37,6 @@ RUN motor/install.sh R7-2-3b1
 COPY ibek-support/pmac/ pmac/
 RUN pmac/install.sh 2-4-10
 
-COPY ibek-support/ADAravis/ ADAravis/
-RUN ADAravis/install.sh R2-3
-
 # create IOC source tree, generate Makefile and compile IOC Instance
 RUN ibek ioc build
 

diff --git a/ibek-support b/ibek-support
diff --git a/requirements.txt b/requirements.txt
+13 −0		ADAravis/ADAravis.ibek.support.yaml
+85 −88		ADAravis/arvFeature.pvi.device.yaml
+1,347 −0		ADGenICam/GenICamFeature.pvi.device.yaml
+56 −46		motor/motor.ibek.support.yaml
+150 −148		pmac/pmac.ibek.support.yaml
+19 −4		pvi-generate.sh