From 7f4e3463021e3185d9cbf6a89720c8f397ccda1d Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sat, 24 Jun 2023 07:39:58 +0000
Subject: [PATCH] feat: set named build-context to spack-environment
---
.gitlab-ci.yml | 2 +-
containers/jug/dev.Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a533381dc..70f4f1a4b 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 bf2f61bec..7ee3f9643 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} \
--
GitLab