diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 96aba41..ffbeb9b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -33,6 +33,8 @@ jobs: with: platforms: linux/amd64,linux/arm64 push: true + build-args: + - PKG_VERSION=${{ env.DOCKER_TAG }} tags: | ${{ env.DOCKER_ORG }}/${{ env.DOCKER_REPO }}:latest ${{ env.DOCKER_ORG }}/${{ env.DOCKER_REPO }}:${{ env.DOCKER_TAG }} diff --git a/Dockerfile b/Dockerfile index 9831951..5c15f3d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,17 +2,14 @@ FROM python:3.10.6 WORKDIR /usr/src/app -ARG PSEUDO_VERSION=1 +ARG PKG_VERSION=1 RUN pip install --no-cache-dir pipenv COPY setup.* Pipfile* ./ COPY src ./src/ -RUN SETUPTOOLS_SCM_PRETEND_VERSION_FOR_SAGETASKS=${PSEUDO_VERSION} \ - pipenv install --system - -RUN --mount=source=.git,target=.git,type=bind \ +RUN SETUPTOOLS_SCM_PRETEND_VERSION_FOR_SAGETASKS=${PKG_VERSION} \ pipenv install --system CMD [ "python", "-c", "import sagetasks" ]