mirror of
https://github.com/goharbor/harbor.git
synced 2024-09-28 05:18:01 +02:00
sync with master
This commit is contained in:
commit
944ad04982
@ -6,6 +6,7 @@ import random
|
||||
import string
|
||||
import os
|
||||
import sys
|
||||
import argparse
|
||||
from io import open
|
||||
|
||||
if sys.version_info[:3][0] == 2:
|
||||
@ -20,10 +21,14 @@ def validate(conf):
|
||||
if len(conf.get("configuration", "secret_key")) != 16:
|
||||
raise Exception("Error: The length of secret key has to be 16 characters!")
|
||||
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('-conf', dest='cfgfile', default = 'harbor.cfg',type=str,help="the path of Harbor configuration file")
|
||||
args = parser.parse_args()
|
||||
|
||||
#Read configurations
|
||||
conf = StringIO.StringIO()
|
||||
conf.write("[configuration]\n")
|
||||
conf.write(open("harbor.cfg").read())
|
||||
conf.write(open(args.cfgfile).read())
|
||||
conf.seek(0, os.SEEK_SET)
|
||||
rcp = ConfigParser.RawConfigParser()
|
||||
rcp.readfp(conf)
|
||||
|
@ -74,6 +74,13 @@ We welcome contributions from the community. If you wish to contribute code and
|
||||
### License
|
||||
Harbor is available under the [Apache 2 license](LICENSE).
|
||||
|
||||
This project uses open source components which have additional licensing terms. The official docker images and licensing terms for these open source components can be found at the following locations:
|
||||
|
||||
* Photon OS 1.0: [docker image](https://hub.docker.com/_/photon/), [license](https://github.com/vmware/photon/blob/master/COPYING)
|
||||
* Docker Registry 2.5: [docker image](https://hub.docker.com/_/registry/), [license](https://github.com/docker/distribution/blob/master/LICENSE)
|
||||
* MySQL 5.6: [docker image](https://hub.docker.com/_/mysql/), [license](https://github.com/docker-library/mysql/blob/master/LICENSE)
|
||||
* NGINX 1.9: [docker image](https://hub.docker.com/_/nginx/), [license](https://github.com/nginxinc/docker-nginx/blob/master/LICENSE)
|
||||
|
||||
### Partners
|
||||
<a href="https://www.shurenyun.com/" border="0" target="_blank"><img alt="DataMan" src="docs/img/dataman.png"></a> <a href="http://www.slamtec.com" target="_blank" border="0"><img alt="SlamTec" src="docs/img/slamteclogo.png"></a>
|
||||
<a href="https://www.caicloud.io" border="0"><img alt="CaiCloud" src="docs/img/caicloudLogoWeb.png"></a>
|
||||
|
BIN
favicon.ico
Executable file → Normal file
BIN
favicon.ico
Executable file → Normal file
Binary file not shown.
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 7.3 KiB |
@ -35,7 +35,7 @@ nav .container-custom {
|
||||
}
|
||||
|
||||
.navbar-brand > img {
|
||||
margin-top: -30px;
|
||||
margin-top: -25px;
|
||||
}
|
||||
|
||||
.navbar-form {
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 5.2 KiB |
Loading…
Reference in New Issue
Block a user