From 44fbb668ea8c266750f57d2b57535990e16a554e Mon Sep 17 00:00:00 2001 From: AdamSimpson Date: Thu, 8 Feb 2018 15:34:34 -0500 Subject: [PATCH] perhaps fix the bojank redirect for secondary commands --- Builder/scripts/docker-builder-backend.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Builder/scripts/docker-builder-backend.sh b/Builder/scripts/docker-builder-backend.sh index b8d19d1..a94e92f 100755 --- a/Builder/scripts/docker-builder-backend.sh +++ b/Builder/scripts/docker-builder-backend.sh @@ -31,7 +31,7 @@ grep 'FROM code.ornl.gov:4567' ./container.def GREP_RC=$? if [[ ${GREP_RC} -eq 0 ]] ; then echo "Using OLCF Gitlab registry login credentials" - docker login code.ornl.gov:4567 -u ${GITLAB_READONLY_USERNAME} -p ${GITLAB_READONLY_TOKEN} 2>&1 >&${OUT_FD} + docker login code.ornl.gov:4567 -u ${GITLAB_READONLY_USERNAME} -p ${GITLAB_READONLY_TOKEN} 2>&${OUT_FD} 1>&${OUT_FD} fi # provide read only access to the private olcf dockerhub repository @@ -39,11 +39,11 @@ grep 'FROM olcf/' ./container.def GREP_RC=$? if [[ ${GREP_RC} -eq 0 ]] ; then echo "Using OLCF Dockerhub registry login credentials" - docker login -u ${DOCKERHUB_READONLY_USERNAME} -p ${DOCKERHUB_READONLY_TOKEN} 2>&1 >&${OUT_FD} + docker login -u ${DOCKERHUB_READONLY_USERNAME} -p ${DOCKERHUB_READONLY_TOKEN} 2>&${OUT_FD} 1>&${OUT_FD} fi # Spin up local registry -docker ${DEBUG_FLAG} run -d -p 5000:5000 --restart=always --name registry registry:2 2>&1 >&${OUT_FD} +docker ${DEBUG_FLAG} run -d -p 5000:5000 --restart=always --name registry registry:2 2>&${OUT_FD} 1>&${OUT_FD} # Build the Dockerfile docker image in the current directory mv ./container.def Dockerfile