Skip to content
This repository has been archived by the owner on May 9, 2019. It is now read-only.

Removed the docker -e flag #24

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed the docker -e flag #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions install/tar/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,20 +331,20 @@ dockerip=`oc get route -n default | grep docker-registry | tr -s ' ' | cut -d '
dockerport=443

echo "Attempting Docker login using secure remote route"
docker login -u blackduck -e [email protected] -p ${dockertoken} ${dockerip}:${dockerport}
docker login -u blackduck -p ${dockertoken} ${dockerip}:${dockerport}

if [ $? -ne 0 ]
then
echo "Attempting Docker login using insecure remote route"
dockerport=80
docker login -u blackduck -e [email protected] -p ${dockertoken} ${dockerip}:${dockerport}
docker login -u blackduck -p ${dockertoken} ${dockerip}:${dockerport}
if [ $? -ne 0 ]
then
# Fixed issue if docker registry has Containered Gluster
dockerip=`oc get svc | egrep "^docker-registry[[:space:]].+$" | tr -s ' ' | cut -d ' ' -f 2`
dockerport=`oc get svc | egrep "^docker-registry[[:space:]].+$" | tr -s ' ' | cut -d ' ' -f 4 | cut -d '/' -f 1`

docker login -u blackduck -e [email protected] -p ${dockertoken} ${dockerip}:${dockerport}
docker login -u blackduck -p ${dockertoken} ${dockerip}:${dockerport}

if [ $? -ne 0 ]
then
Expand Down