diff --git a/CHANGES.md b/CHANGES.md index 854dcef..3c8a721 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,10 @@ * base: add lakeshore340 module. by @guirodrigueslima in https://github.com/cnpem/epics-in-docker/pull/123 +* ioc: copy locally installed software from build stages. by @henriquesimoes in + https://github.com/cnpem/epics-in-docker/pull/55 + * This allows the IOC build phase to install custom software, available at + runtime, under `/usr/local` tree for all targets. ## v0.14.1 diff --git a/Dockerfile b/Dockerfile index 7e140d9..7bf039b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -71,6 +71,7 @@ LABEL br.lnls.epics-in-docker.rundir=${RUNDIR} LABEL br.lnls.epics-in-docker.target="no-build" COPY --from=pruned-build /opt /opt +COPY --from=pruned-build /usr/local /usr/local FROM build-image AS build-stage @@ -117,6 +118,7 @@ LABEL br.lnls.epics-in-docker.rundir=${RUNDIR} LABEL br.lnls.epics-in-docker.target="dynamic-link" COPY --from=dynamic-build /opt /opt +COPY --from=dynamic-build /usr/local /usr/local FROM build-stage AS static-build @@ -137,3 +139,4 @@ ARG REPONAME LABEL br.lnls.epics-in-docker.target="static-link" COPY --from=static-build /opt/${REPONAME} /opt/${REPONAME} +COPY --from=static-build /usr/local /usr/local