Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-17 07:45:24 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1400 from reasonerjt/dev

Browse Source 
-conf -> --conf
This commit is contained in:
Daniel Jiang 2017-02-20 14:58:34 +08:00 committed by GitHub
commit 245b54d10d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -204,7 +204,7 @@ compile:check_environment $(COMPILETAG)
prepare: prepare:
@echo "preparing..." @echo "preparing..."
@$(MAKEPATH)/$(PREPARECMD) -conf $(CONFIGPATH)/$(CONFIGFILE) @$(MAKEPATH)/$(PREPARECMD) --conf $(CONFIGPATH)/$(CONFIGFILE)
build_common: version build_common: version
@echo "buildging db container for photon..." @echo "buildging db container for photon..."

2
make/prepare
View File

@ -59,7 +59,7 @@ config_dir = os.path.join(base_dir, "common/config")
templates_dir = os.path.join(base_dir, "common/templates") templates_dir = os.path.join(base_dir, "common/templates")
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('-conf', dest='cfgfile', default=base_dir+'/harbor.cfg',type=str,help="the path of Harbor configuration file") parser.add_argument('--conf', dest='cfgfile', default=base_dir+'/harbor.cfg',type=str,help="the path of Harbor configuration file")
args = parser.parse_args() args = parser.parse_args()