Skip to content

Commit

Permalink
update to ibek 1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Sep 29, 2023
1 parent ba9f7ab commit 03405c5
Show file tree
Hide file tree
Showing 16 changed files with 5 additions and 197 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ FROM environment AS devtools
RUN apt-get update -y && apt-get upgrade -y && \
apt-get install -y --no-install-recommends \
ca-certificates \
curl \
build-essential \
busybox \
git \
Expand All @@ -52,6 +53,7 @@ RUN apt-get update -y && apt-get upgrade -y && \
re2c \
rsync \
ssh-client \
vim \
&& rm -rf /var/lib/apt/lists/* \
&& busybox --install

Expand Down Expand Up @@ -93,15 +95,14 @@ RUN make -C ${SUPPORT}/sncseq -j $(nproc)


# setup a global python venv and install ibek
RUN python3 -m venv ${VIRTUALENV} && pip install ibek==1.0.0
RUN python3 -m venv ${VIRTUALENV} && pip install ibek==1.3.0

##### runtime preparation stage ################################################

FROM developer AS runtime_prep

# get the products from the build stage and reduce to runtime assets only
WORKDIR /min_files
RUN bash /epics/scripts/minimize.sh ${EPICS_BASE} ${IOC} $(ls -d ${SUPPORT}/*/)
RUN ibek ioc extract-runtime-assets /assets --no-defaults --extras /venv

##### runtime stage ############################################################

Expand All @@ -115,6 +116,5 @@ RUN apt-get update -y && apt-get upgrade -y && \
&& rm -rf /var/lib/apt/lists/*

# add products from build stage
COPY --from=runtime_prep /min_files /
COPY --from=developer ${VIRTUALENV} ${VIRTUALENV}
COPY --from=runtime_prep /assets /

7 changes: 0 additions & 7 deletions epics/ioc/Makefile

This file was deleted.

10 changes: 0 additions & 10 deletions epics/ioc/config/st.cmd

This file was deleted.

30 changes: 0 additions & 30 deletions epics/ioc/configure/CONFIG

This file was deleted.

5 changes: 0 additions & 5 deletions epics/ioc/configure/CONFIG_SITE

This file was deleted.

8 changes: 0 additions & 8 deletions epics/ioc/configure/Makefile

This file was deleted.

5 changes: 0 additions & 5 deletions epics/ioc/configure/RELEASE

This file was deleted.

7 changes: 0 additions & 7 deletions epics/ioc/configure/RULES

This file was deleted.

2 changes: 0 additions & 2 deletions epics/ioc/configure/RULES.ioc

This file was deleted.

2 changes: 0 additions & 2 deletions epics/ioc/configure/RULES_DIRS

This file was deleted.

3 changes: 0 additions & 3 deletions epics/ioc/configure/RULES_TOP

This file was deleted.

24 changes: 0 additions & 24 deletions epics/ioc/iocApp/src/Makefile.jinja

This file was deleted.

20 changes: 0 additions & 20 deletions epics/ioc/iocApp/src/iocMain.cpp

This file was deleted.

47 changes: 0 additions & 47 deletions epics/scripts/minimize.sh

This file was deleted.

9 changes: 0 additions & 9 deletions epics/support/Makefile

This file was deleted.

13 changes: 0 additions & 13 deletions epics/support/configure/RELEASE

This file was deleted.

0 comments on commit 03405c5

Please sign in to comment.