From c425d183f7ab8f1cb162c3139b07d0dcc3f5aee2 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Tue, 1 Dec 2020 16:12:10 +0000
Subject: [PATCH] Fix setup with local spack package overrides
---
.gitlab-ci.yml | 2 ++
containers/builder/Dockerfile | 4 +---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fdc538aa9..0d02cf3ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,7 @@ builder:stable:
- tags
- master
script:
+ - cp -r spack containers/builder/np-spack
- cd containers/builder
- head Dockerfile
- make login
@@ -28,6 +29,7 @@ builder:unstable:
- if: '$CI_COMMIT_BRANCH == "develop"'
when: always
script:
+ - cp -r spack containers/builder/np-spack
- cd containers/builder
- head Dockerfile
- make login
diff --git a/containers/builder/Dockerfile b/containers/builder/Dockerfile
index 8cb543afe..343109069 100644
--- a/containers/builder/Dockerfile
+++ b/containers/builder/Dockerfile
@@ -32,11 +32,9 @@ COPY spack.yaml /opt/spack-environment/spack.yaml
## and only initialize the custom packages here for more
## transparency
RUN rm -rf $SPACK_ROOT/np-spack \
- && pwd \
- && cp -r ../../spack $SPACK_ROOT/np-spack \
- && cd $SPACK_ROOT/np-spack \
&& echo "repos:" > $SPACK_ROOT/etc/spack/repos.yaml \
&& echo " - $SPACK_ROOT/np-spack" >> $SPACK_ROOT/etc/spack/repos.yaml
+COPY np-spack $SPACK_ROOT/np-spack
## Install the software, no garbage collection at this stage
## as this is a raw builder image
--
GitLab