From 3990bc06868ac5282a3502c591ab4791e1c156da Mon Sep 17 00:00:00 2001 From: Oscar Esteban Date: Mon, 13 Jan 2025 13:01:39 +0100 Subject: [PATCH] fix: containers report wrong version (revision) This finally resolves the problem of a wrong version being set in container images. Resolves: #1354. Overrides: #1357. --- Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4fd53e7f..8553a4fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,9 @@ FROM python:slim AS src RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive \ apt-get install -y --no-install-recommends git +ARG VERSION +ENV SETUPTOOLS_SCM_PRETEND_VERSION=$VERSION + RUN python -m pip install -U pip build COPY . /src RUN python -m build /src @@ -197,11 +200,14 @@ RUN find $HOME -type d -exec chmod go=u {} + && \ # Best practices RUN ldconfig +# Update version +RUN export VERSION=$(python -m mriqc --version | awk '{print $NF}') \ + && echo "VERSION=$VERSION" >> /etc/environment + WORKDIR /tmp/ # Run mriqc by default ENTRYPOINT ["/opt/conda/bin/mriqc"] -ARG VERSION ARG BUILD_DATE ARG VCS_REF LABEL org.label-schema.build-date=$BUILD_DATE \