Merge branch 'main' into 6-spack-packages-option

ACCESS-NRI · Jul 14, 2023 · 059f16f · 059f16f
2 parents c2df3c5 + ad48183
commit 059f16f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/containers/Dockerfile.build b/containers/Dockerfile.build
@@ -27,4 +27,4 @@ RUN spack -d install --only dependencies ${PACKAGE}%${COMPILER_NAME}@${COMPILER_
 # `spack find --json | jq .[].name`
 # This returns all currently installed spec names
 RUN dnf -y install jq
-RUN spack -d buildcache create -a -m s3_buildcache `spack find --json | jq .[].name`
+RUN spack -d buildcache create -a -m s3_buildcache `spack find --json | jq --raw-output .[].name`
diff --git a/containers/build_dockerfile.base-spack.sh b/containers/build_dockerfile.base-spack.sh
@@ -5,6 +5,7 @@
 
 DOCKER_BUILDKIT=1 \
   docker build \
+  --build-arg SPACK_PACKAGES_VERSION="main" \
   --secret id=S3_ACCESS_KEY_ID \
   --secret id=S3_ACCESS_KEY_SECRET \
   --secret id=access-nri.priv,src=./keys/access-nri.priv \