From 2c71a7256e84884f117dc9ffad302e1747915754 Mon Sep 17 00:00:00 2001 From: atj Date: Fri, 2 Feb 2018 14:26:05 -0500 Subject: [PATCH] Pull to correct directory --- Builder/scripts/docker-builder-backend.sh | 1 + Deployment/deploy-titan.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Builder/scripts/docker-builder-backend.sh b/Builder/scripts/docker-builder-backend.sh index 1147930..3632dd2 100755 --- a/Builder/scripts/docker-builder-backend.sh +++ b/Builder/scripts/docker-builder-backend.sh @@ -48,4 +48,5 @@ docker ${DEBUG_FLAG} push localhost:5000/docker_image:latest # Build the singularity container from the docker image export SINGULARITY_CACHEDIR=/home/builder/.singularity export SINGULARITY_NOHTTPS=true +export SINGULARITY_PULLFOLDER=/home/builder singularity ${DEBUG_FLAG} pull --name container.simg docker://localhost:5000/docker_image:latest \ No newline at end of file diff --git a/Deployment/deploy-titan.sh b/Deployment/deploy-titan.sh index 62b800b..d126ddb 100755 --- a/Deployment/deploy-titan.sh +++ b/Deployment/deploy-titan.sh @@ -28,7 +28,7 @@ rm -rf boost_build && mkdir boost_build && cd boost_build curl -L https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.gz -O tar xf boost_1_66_0.tar.gz cd boost_1_66_0 -./bootstrap.sh --with-libraries=filesystem,regex,system,serialization,thread,program_options --prefix=${SW_ROOT} +./bootstrap.sh --with-libraries=filesystem,regex,system,serialization,thread,program_options --prefix=${SW_ROOT} --with-toolset=gcc ./b2 install || : rm -rf /boost_1_66_0