Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix: Add Java update alternatives step
[releng/global-jjb.git]
/
shell
/
docker-login.sh
diff --git
a/shell/docker-login.sh
b/shell/docker-login.sh
index
97e030b
..
73d0603
100644
(file)
--- a/
shell/docker-login.sh
+++ b/
shell/docker-login.sh
@@
-79,7
+79,7
@@
set_creds() {
do_login() {
docker_version=$( docker -v | awk '{print $3}')
if version_lt "$docker_version" "17.06.0" && \
do_login() {
docker_version=$( docker -v | awk '{print $3}')
if version_lt "$docker_version" "17.06.0" && \
-
"$DOCKERHUB_REGISTRY" == "docker.io"
&& \
+
[ "$DOCKERHUB_REGISTRY" == "docker.io" ]
&& \
"$DOCKERHUB_EMAIL:-none" != 'none'
then
docker login -u "$USER" -p "$PASS" -e "$2" "$1"
"$DOCKERHUB_EMAIL:-none" != 'none'
then
docker login -u "$USER" -p "$PASS" -e "$2" "$1"