Skip to content

Commit

Permalink
Go back to more verbose build
Browse files Browse the repository at this point in the history
  • Loading branch information
AdamSimpson committed Feb 5, 2018
1 parent 9fad3da commit 1b929f2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Builder/scripts/docker-builder-backend.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ mv ./container.def Dockerfile
/usr/bin/unbuffer docker ${DEBUG_FLAG} build -t localhost:5000/docker_image:latest . || { echo 'Build Failed' ; exit 1; }

# Push to the local registry
docker ${DEBUG_FLAG} push localhost:5000/docker_image:latest &>"$OUT_FD"
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
/usr/bin/unbuffer singularity ${DEBUG_FLAG} pull --name container.simg docker://localhost:5000/docker_image:latest 2>&1 >&${OUT_FD}
/usr/bin/unbuffer singularity ${DEBUG_FLAG} pull --name container.simg docker://localhost:5000/docker_image:latest

# 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 2>&1 >&${OUT_FD}
mv ${SINGULARITY_CACHEDIR}/container.simg ./container.simg
fi
2 changes: 1 addition & 1 deletion BuilderQueue/include/BuilderQueue.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ class BuilderQueue {
// Maximum number of builders to spin and keep up in reserve
const std::size_t max_reserve_builder_count;

// Number of build requests that have been requested but not yet compelted
// Number of build requests that have been requested but not yet completed
int outstanding_create_count;
};

0 comments on commit 1b929f2

Please sign in to comment.