Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-23 00:57:44 +01:00
Code Issues Projects Releases Wiki Activity

update for fix #925

Browse Source
This commit is contained in:
yhua 2016-10-24 16:51:42 +08:00
parent ebc852b7cc
commit 271787dd94
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
make/checkenv.sh
View File

@ -69,7 +69,7 @@ function check_golang {
fi fi
# docker has been installed and check its version # docker has been installed and check its version
if [[ $(go version) =~ (([0-9]+)\.([0-9]+)\.([0-9]*)) ]] if [[ $(go version) =~ (([0-9]+)\.([0-9]+)([\.0-9]*)) ]]
then then
golang_version=${BASH_REMATCH[1]} golang_version=${BASH_REMATCH[1]}
golang_version_part1=${BASH_REMATCH[2]} golang_version_part1=${BASH_REMATCH[2]}
@ -97,7 +97,7 @@ function check_docker {
fi fi
# docker has been installed and check its version # docker has been installed and check its version
if [[ $(docker --version) =~ (([0-9]+)\.([0-9]+)\.([0-9]*)) ]] if [[ $(docker --version) =~ (([0-9]+)\.([0-9]+)([\.0-9]*)) ]]
then then
docker_version=${BASH_REMATCH[1]} docker_version=${BASH_REMATCH[1]}
docker_version_part1=${BASH_REMATCH[2]} docker_version_part1=${BASH_REMATCH[2]}
@ -125,7 +125,7 @@ function check_dockercompose {
fi fi
# docker-compose has been installed, check its version # docker-compose has been installed, check its version
if [[ $(docker-compose --version) =~ (([0-9]+)\.([0-9]+)\.([0-9]*)) ]] if [[ $(docker-compose --version) =~ (([0-9]+)\.([0-9]+)([\.0-9]*)) ]]
then then
docker_compose_version=${BASH_REMATCH[1]} docker_compose_version=${BASH_REMATCH[1]}
docker_compose_version_part1=${BASH_REMATCH[2]} docker_compose_version_part1=${BASH_REMATCH[2]}