diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a533381dcf46c2b776ee7cb7b8977139790582f3..70f4f1a4bc4700a81201f15f6d8b573b90a293c0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -258,7 +258,7 @@ jug_dev:default: --build-arg S3_SECRET_KEY=${S3_SECRET_KEY} --build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD) --build-arg jobs=${JOBS} - --build-context spack=. + --build-context spack-environment=spack-environment --secret id=mirrors,src=mirrors.yaml containers/jug ; done diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile index bf2f61becec4e8165ff099e003be2c1ce51cee36..7ee3f9643f11fb5f39f0c5fb876f95acb3f25a27 100644 --- a/containers/jug/dev.Dockerfile +++ b/containers/jug/dev.Dockerfile @@ -101,7 +101,7 @@ RUN git clone https://github.com/${EICSPACK_ORGREPO}.git ${EICSPACK_ROOT} \ && spack repo add --scope site "${EICSPACK_ROOT}" ## Setup our custom environment (secret mount for write-enabled mirror) -COPY --from=spack spack-environment/ /opt/spack-environment/ +COPY --from=spack-environment . /opt/spack-environment/ ARG ENV=dev ENV SPACK_ENV=/opt/spack-environment/${ENV} RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \