Merge pull request #2442 from znz/fix-is_tag_force_available

Fix `is_tag_force_available` bug when docker major version up
This commit is contained in:
Michael Hobbs authored and GitHub committed 2016-09-29 07:55:50 -07:00
commit 1834ec8087
1 file changed
+3 -1
+3 -1
View File
@@ -9,7 +9,9 @@ is_tag_force_available() {
PATCH_VERSION=$(echo "$CLIENT_VERSION_STRING" | awk '{split($0,a,"."); print a[3]}') PATCH_VERSION=$(echo "$CLIENT_VERSION_STRING" | awk '{split($0,a,"."); print a[3]}')
# docker tag -f was dropped in 1.12.0 # docker tag -f was dropped in 1.12.0
if [[ "$MAJOR_VERSION" -ge 1 ]] && [[ "$MINOR_VERSION" -ge 12 ]]; then if [[ "$MAJOR_VERSION" -gt 1 ]]; then
return 1
elif [[ "$MAJOR_VERSION" -eq 1 ]] && [[ "$MINOR_VERSION" -ge 12 ]]; then
return 1 return 1
else else
return 0 return 0