Code Review
/
releng
/
global-jjb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
(from parent 1:
9ef24ad
)
Merge "Fix docker-login to conditionally use -e"
v0.8.1
author
Andrew Grimberg
<agrimberg@linuxfoundation.org>
Tue, 5 Sep 2017 18:51:47 +0000
(18:51 +0000)
committer
Gerrit Code Review
<gerrit@linuxfoundation.org>
Tue, 5 Sep 2017 18:51:47 +0000
(18:51 +0000)
shell/docker-login.sh
patch
|
blob
|
history
diff --git
a/shell/docker-login.sh
b/shell/docker-login.sh
index
2c8a40b
..
210ce3b
100644
(file)
--- a/
shell/docker-login.sh
+++ b/
shell/docker-login.sh
@@
-56,7
+56,18
@@
do_login() {
return 1
fi
- docker login -u "$USER" -p "$PASS" -e "$2" "$1"
+ docker_version=$(docker -v | awk '{print $3}')
+ compare_value=$(echo "17.06.0 $docker_version" | \
+ tr " " "\n" | \
+ sort -V | \
+ sed -n 1p)
+ if [[ "$docker_version" == "$compare_value" && \
+ "$docker_version" != "17.06.0" ]]
+ then
+ docker login -u "$USER" -p "$PASS" -e "$2" "$1"
+ else
+ docker login -u "$USER" -p "$PASS"
+ fi
}
if [ "${DOCKER_REGISTRY:-none}" != 'none' ]