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

Merge pull request #4624 from yixingjia/clairdbconfigurable

Browse Source 
Add dbname paramter in dburl
This commit is contained in:
Daniel Jiang 2018-04-11 18:43:52 +08:00 committed by GitHub
commit ebc9d04479
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/common/templates/clair/config.yaml
View File

@ -2,7 +2,7 @@ clair:
database: database:
type: pgsql type: pgsql
options: options:
source: postgresql://$username:$password@$host:$port?sslmode=disable source: postgresql://$username:$password@$host:$port/$dbname?sslmode=disable
# Number of elements kept in the cache # Number of elements kept in the cache
# Values unlikely to change (e.g. namespaces) are cached in order to save prevent needless roundtrips to the database. # Values unlikely to change (e.g. namespaces) are cached in order to save prevent needless roundtrips to the database.

6
make/prepare
View File

@ -565,8 +565,10 @@ if args.clair_mode:
password = clair_db_password, password = clair_db_password,
username = clair_db_username, username = clair_db_username,
host = clair_db_host, host = clair_db_host,
port = clair_db_port) port = clair_db_port,
# config http proxy for Clair dbname = clair_db)
# config http proxy for Clair
http_proxy = rcp.get("configuration", "http_proxy").strip() http_proxy = rcp.get("configuration", "http_proxy").strip()
https_proxy = rcp.get("configuration", "https_proxy").strip() https_proxy = rcp.get("configuration", "https_proxy").strip()
no_proxy = rcp.get("configuration", "no_proxy").strip() no_proxy = rcp.get("configuration", "no_proxy").strip()