Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-01-03 06:28:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #926 from yhua123/dev

Browse Source 
LGTM
This commit is contained in:
kun wang 2016-10-24 17:00:08 +08:00 committed by GitHub
commit 60ae6fba1b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -325,8 +325,8 @@ cleanimage:
- $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_DB):$(VERSIONTAG) - $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_DB):$(VERSIONTAG)
- $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) - $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG)
- $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_LOG):$(VERSIONTAG) - $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_LOG):$(VERSIONTAG)
- $(DOCKERRMIMAGE) -f registry:2.5.0 #- $(DOCKERRMIMAGE) -f registry:2.5.0
- $(DOCKERRMIMAGE) -f nginx:1.9 #- $(DOCKERRMIMAGE) -f nginx:1.9
cleandockercomposefile: cleandockercomposefile:
@echo "cleaning $(DOCKERCOMPOSEFILEPATH)/docker-compose.$(VERSIONTAG).yml" @echo "cleaning $(DOCKERCOMPOSEFILEPATH)/docker-compose.$(VERSIONTAG).yml"

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]}