diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 87133a94..183294fd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -48,6 +48,7 @@ jobs: file: ./Docker/${{ matrix.name }}_dockerfile build-args: | NCORES=2 + GITHUB_SHA=${{ github.sha }} push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Docker/github_ci_dockerfile b/Docker/github_ci_dockerfile index 449dd78a..1864b72f 100644 --- a/Docker/github_ci_dockerfile +++ b/Docker/github_ci_dockerfile @@ -69,6 +69,10 @@ ENV OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1 ENV OMPI_MCA_rmaps_base_oversubscribe="yes" ARG NCORES=8 +# This acts as a cachebuster +ARG GITHUB_SHA=0000000000000000000000000000000000000000000000000000 +LABEL github.sha="$GITHUB_SHA" + # create source dirs RUN cd / && mkdir -p triqs && mkdir -p source diff --git a/Docker/mpich_dockerfile b/Docker/mpich_dockerfile index 511e6f12..d7bb2e65 100644 --- a/Docker/mpich_dockerfile +++ b/Docker/mpich_dockerfile @@ -114,6 +114,10 @@ ENV MKL_INTERFACE_LAYER=GNU,LP64 ENV MKL_THREADING_LAYER=SEQUENTIAL ARG NCORES=10 +# This acts as a cachebuster +ARG GITHUB_SHA=0000000000000000000000000000000000000000000000000000 +LABEL github.sha="$GITHUB_SHA" + ENV CPATH=/triqs/include:/usr/include/mkl:${CPATH} ENV PATH=/triqs/bin:${PATH} ENV LIBRARY_PATH=/triqs/lib:${LIBRARY_PATH} diff --git a/Docker/openmpi_dockerfile b/Docker/openmpi_dockerfile index 1db31cc8..c04a6a30 100644 --- a/Docker/openmpi_dockerfile +++ b/Docker/openmpi_dockerfile @@ -110,6 +110,10 @@ ENV MKL_INTERFACE_LAYER=GNU,LP64 ENV MKL_THREADING_LAYER=SEQUENTIAL ARG NCORES=10 +# This acts as a cachebuster +ARG GITHUB_SHA=0000000000000000000000000000000000000000000000000000 +LABEL github.sha="$GITHUB_SHA" + # create source dirs RUN cd / && mkdir -p triqs && mkdir -p source