diff --git a/Deploy/prepare b/Deploy/prepare index cf963c10a..82c647d15 100755 --- a/Deploy/prepare +++ b/Deploy/prepare @@ -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) diff --git a/README.md b/README.md index 5ea1064e4..9b517f219 100644 --- a/README.md +++ b/README.md @@ -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 DataMan     SlamTec     CaiCloud diff --git a/favicon.ico b/favicon.ico old mode 100755 new mode 100644 index 0c25bae41..8b3d01243 Binary files a/favicon.ico and b/favicon.ico differ diff --git a/static/resources/css/header.css b/static/resources/css/header.css index 4085ac542..f21aaaf17 100644 --- a/static/resources/css/header.css +++ b/static/resources/css/header.css @@ -35,7 +35,7 @@ nav .container-custom { } .navbar-brand > img { - margin-top: -30px; + margin-top: -25px; } .navbar-form { diff --git a/static/resources/img/Harbor_Logo_rec.png b/static/resources/img/Harbor_Logo_rec.png index 3a603109e..d318e5312 100644 Binary files a/static/resources/img/Harbor_Logo_rec.png and b/static/resources/img/Harbor_Logo_rec.png differ