From ddfaaf5024875a1b87b026da30e4f9460e8e4a4e Mon Sep 17 00:00:00 2001 From: Jeroen van den Muyzenberg Date: Thu, 13 Jul 2023 10:02:24 +1000 Subject: [PATCH 1/2] Added --raw-output option to jq in Dockerfile.build --- containers/Dockerfile.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/Dockerfile.build b/containers/Dockerfile.build index 2025719..b20ac3a 100644 --- 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` From ad4818330b161011c054089d45a7e15c6fe74045 Mon Sep 17 00:00:00 2001 From: Jeroen van den Muyzenberg Date: Fri, 14 Jul 2023 10:12:29 +1000 Subject: [PATCH 2/2] Added build_arg SPACK_PACKAGES_VERSION to build spack base shell script --- containers/build_dockerfile.base-spack.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/containers/build_dockerfile.base-spack.sh b/containers/build_dockerfile.base-spack.sh index cffb4c2..2533605 100755 --- 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 \