Skip to content

Commit

Permalink
perhaps fix the bojank redirect for secondary commands
Browse files Browse the repository at this point in the history
  • Loading branch information
AdamSimpson committed Feb 8, 2018
1 parent e9515e6 commit 44fbb66
Showing 1 changed file with 3 additions and 3 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 @@ -31,19 +31,19 @@ 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
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
Expand Down

0 comments on commit 44fbb66

Please sign in to comment.