Skip to content

Commit

Permalink
add proxy to developer stage
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Mar 19, 2024
1 parent 84f21ea commit 01d1b2e
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG EPICS_TARGET_ARCH=linux-x86_64
ARG EPICS_HOST_ARCH=linux-x86_64
ARG IMAGE_EXT

ARG BASE=7.0.8ec2b4
ARG BASE=7.0.8ec2b5
ARG REGISTRY=ghcr.io/epics-containers
ARG RUNTIME=${REGISTRY}/epics-base${IMAGE_EXT}-runtime:${BASE}
ARG DEVELOPER=${REGISTRY}/epics-base${IMAGE_EXT}-developer:${BASE}
Expand Down Expand Up @@ -56,11 +56,14 @@ RUN pmac/install.sh 2-6-2b1
COPY ioc ${SOURCE_FOLDER}/ioc
RUN cd ${IOC} && ./install.sh && make

# install runtime proxy for non-native builds
RUN bash ${IOC}/install_proxy.sh

##### runtime preparation stage ################################################
FROM developer AS runtime_prep

# get the products from the build stage and reduce to runtime assets only
# TODO should ibek* and /venv be default assets in ibek?
# TODO ibek will default to copying ibek* and /venv
RUN ibek ioc extract-runtime-assets /assets ${SOURCE_FOLDER}/ibek* /venv

##### runtime stage ############################################################
Expand All @@ -71,8 +74,6 @@ COPY --from=runtime_prep /assets /

# install runtime system dependencies, collected from install.sh scripts
RUN ibek support apt-install-runtime-packages --skip-non-native
# install runtime proxy for non-native builds
RUN bash ${IOC}/install_proxy.sh

ENTRYPOINT ["bash", "-c", "${IOC}/start.sh"]

0 comments on commit 01d1b2e

Please sign in to comment.