From 80692720a37294c65c51f7142c8aaafd62112c3a Mon Sep 17 00:00:00 2001 From: AdamSimpson Date: Thu, 1 Feb 2018 08:42:30 -0500 Subject: [PATCH] Fix cache location as it seems to be used regardless of disabling the cache --- Builder/scripts/docker-builder-backend.sh | 2 +- Builder/scripts/singularity-builder-backend.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Builder/scripts/docker-builder-backend.sh b/Builder/scripts/docker-builder-backend.sh index ad331fd..2c42211 100755 --- a/Builder/scripts/docker-builder-backend.sh +++ b/Builder/scripts/docker-builder-backend.sh @@ -34,5 +34,5 @@ docker ${DEBUG_FLAG} build -t localhost:5000/docker_image . docker ${DEBUG_FLAG} push localhost:5000/docker_image # Build the singularity container from the docker image -export SINGULARITY_DISABLE_CACHE=True +export SINGULARITY_CACHEDIR=/home/builder/.singularity singularity ${DEBUG_FLAG} pull --name container.simg docker://localhost:5000/docker_image \ No newline at end of file diff --git a/Builder/scripts/singularity-builder-backend.sh b/Builder/scripts/singularity-builder-backend.sh index 452dcbb..e61e388 100755 --- a/Builder/scripts/singularity-builder-backend.sh +++ b/Builder/scripts/singularity-builder-backend.sh @@ -37,5 +37,5 @@ if [[ ${GREP_RC} -eq 0 ]] ; then export SINGULARITY_DOCKER_PASSWORD=${DOCKERHUB_READONLY_TOKEN} fi -export SINGULARITY_DISABLE_CACHE=True +export SINGULARITY_CACHEDIR=/home/builder/.singularity /usr/bin/unbuffer /usr/local/bin/singularity ${DEBUG_FLAG} build ./container.simg ./container.def \ No newline at end of file