Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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