diff --git a/.github/workflows/base-image.yml b/.github/workflows/base-image.yml index 2f68f12..5692d02 100644 --- a/.github/workflows/base-image.yml +++ b/.github/workflows/base-image.yml @@ -45,7 +45,7 @@ jobs: *.cache-to=type=gha,mode=max,scope=${{ matrix.image.name }} push: ${{ github.event_name == 'push' && vars.PUSH_TO_REGISTRY == 'true' && github.ref_type == 'tag' }} - name: Point IOC Dockerfile to image that was just built - run: sed -i "s/v.*-dev/$TAG/" Dockerfile + run: sed -i -E "s/v[0-9]+\.[0-9]+\.[0-9]+-dev/$TAG/" Dockerfile - name: Configure builder using docker driver uses: docker/setup-buildx-action@v3 id: dockerbuilder diff --git a/Dockerfile b/Dockerfile index 29dd12c..1f2fa4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,12 +4,17 @@ FROM ghcr.io/cnpem/lnls-debian-epics-7:v0.12.0-dev AS build-image FROM debian:${DEBIAN_VERSION}-slim AS base +ARG DEBIAN_VERSION + ARG RUNDIR ARG ENTRYPOINT=/usr/local/bin/lnls-run ARG RUNTIME_PACKAGES ARG RUNTIME_TAR_PACKAGES ARG RUNTIME_PIP_PACKAGES +LABEL br.lnls.epics-in-docker.version="v0.12.0-dev" +LABEL br.lnls.epics-in-docker.debian.version=${DEBIAN_VERSION} + COPY --from=build-image /etc/apt/apt.conf.d/90-disable-sandbox.conf /etc/apt/apt.conf.d/90-disable-sandbox.conf RUN apt update -y && \ @@ -44,8 +49,9 @@ ENTRYPOINT ["./entrypoint"] FROM base AS no-build -COPY --from=build-image /opt /opt +LABEL br.lnls.epics-in-docker.target="no-build" +COPY --from=build-image /opt /opt FROM build-image AS build-stage @@ -78,8 +84,9 @@ RUN make distclean && make -j ${JOBS} && make $([ "$SKIP_TESTS" != 1 ] && echo r FROM base AS dynamic-link -COPY --from=dynamic-build /opt /opt +LABEL br.lnls.epics-in-docker.target="dynamic-link" +COPY --from=dynamic-build /opt /opt FROM build-stage AS static-build @@ -96,4 +103,6 @@ FROM base AS static-link ARG REPONAME +LABEL br.lnls.epics-in-docker.target="static-link" + COPY --from=static-build /opt/${REPONAME} /opt/${REPONAME}