diff --git a/Builder/scripts/docker-builder-backend.sh b/Builder/scripts/docker-builder-backend.sh index ce7aab5..efe738e 100755 --- a/Builder/scripts/docker-builder-backend.sh +++ b/Builder/scripts/docker-builder-backend.sh @@ -56,9 +56,9 @@ docker ${DEBUG_FLAG} push localhost:5000/docker_image:latest &>"$OUT_FD" 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 +singularity ${DEBUG_FLAG} pull --name container.simg docker://localhost:5000/docker_image:latest >&${OUT_FD} # Workaround for PULLFOLDER not being respected: https://github.com/singularityware/singularity/pull/855 if [ -e ${SINGULARITY_CACHEDIR}/container.simg ] ; then - mv ${SINGULARITY_CACHEDIR}/container.simg ./container.simg + mv ${SINGULARITY_CACHEDIR}/container.simg ./container.simg >&${OUT_FD} fi \ No newline at end of file diff --git a/BuilderQueue/include/BuilderQueue.h b/BuilderQueue/include/BuilderQueue.h index 5e7a334..5660bae 100644 --- a/BuilderQueue/include/BuilderQueue.h +++ b/BuilderQueue/include/BuilderQueue.h @@ -18,7 +18,7 @@ class BuilderQueue { public: explicit BuilderQueue(asio::io_context &io_context) : io_context(io_context), max_builder_count(20), - max_reserve_builder_count(5), + max_reserve_builder_count(20), outstanding_create_count(0) { create_reserve_builders(); } diff --git a/Deployment/deploy-summitdev.sh b/Deployment/deploy-summitdev.sh index 8d919d4..4aba853 100755 --- a/Deployment/deploy-summitdev.sh +++ b/Deployment/deploy-summitdev.sh @@ -26,7 +26,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