From c79621aa15ed0689bd8417363488e3d852943cb6 Mon Sep 17 00:00:00 2001 From: Giles Knap Date: Fri, 24 Nov 2023 15:34:55 +0000 Subject: [PATCH] update epics-base --- Dockerfile | 6 +----- requirements.txt | 3 --- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 requirements.txt diff --git a/Dockerfile b/Dockerfile index 0ae1317..fa6bf0c 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-adsimdetector/ibek-support diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index ca443b5..0000000 --- a/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -ibek==1.5.2 -# to install direct from github during development in the dev branch: -#git+https://github.com/epics-containers/ibek.git@dev