diff --git a/Dockerfile b/Dockerfile index 57475f4..4a481ac 100644 --- 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 index cf52a39..eb79846 160000 --- a/ibek-support +++ b/ibek-support @@ -1 +1 @@ -Subproject commit cf52a39c8a0f6d3b5d590ea911b8e7870306834d +Subproject commit eb79846664378c9c2382a90952b8b16b43818d17 diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index cea131a..0000000 --- a/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -ibek==1.5.0 -# to install direct from github during development in the dev branch: -#git+https://github.com/epics-containers/ibek.git@dev