From 1b929f2101b078beb66b4bc2a122d0c2906d6d52 Mon Sep 17 00:00:00 2001
From: AdamSimpson <adambsimpson@gmail.com>
Date: Mon, 5 Feb 2018 09:39:22 -0500
Subject: [PATCH] Go back to more verbose build

---
 Builder/scripts/docker-builder-backend.sh | 6 +++---
 BuilderQueue/include/BuilderQueue.h       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Builder/scripts/docker-builder-backend.sh b/Builder/scripts/docker-builder-backend.sh
index 760247a..e5049cc 100755
--- a/Builder/scripts/docker-builder-backend.sh
+++ b/Builder/scripts/docker-builder-backend.sh
@@ -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
\ No newline at end of file
diff --git a/BuilderQueue/include/BuilderQueue.h b/BuilderQueue/include/BuilderQueue.h
index 5660bae..b4194f4 100644
--- a/BuilderQueue/include/BuilderQueue.h
+++ b/BuilderQueue/include/BuilderQueue.h
@@ -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;
 };
\ No newline at end of file