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

No scan all policy if Clair is not installed.

Browse Source 
This commit fixes #5283 by not registering scan all policy when Harbor
is not deployed with Clair.
This commit is contained in:
Daniel Jiang 2018-07-25 18:34:55 +08:00
parent 9fba539bd4
commit 97fb67f835
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ui/main.go
View File

@ -95,15 +95,6 @@ func main() {
if err := dao.InitDatabase(database); err != nil { if err := dao.InitDatabase(database); err != nil {
log.Fatalf("failed to initialize database: %v", err) log.Fatalf("failed to initialize database: %v", err)
} }
if config.WithClair() {
clairDB, err := config.ClairDB()
if err != nil {
log.Fatalf("failed to load clair database information: %v", err)
}
if err := dao.InitClairDB(clairDB); err != nil {
log.Fatalf("failed to initialize clair database: %v", err)
}
}
password, err := config.InitialAdminPassword() password, err := config.InitialAdminPassword()
if err != nil { if err != nil {
@ -126,6 +117,14 @@ func main() {
log.Errorf("failed to subscribe scan all policy change topic: %v", err) log.Errorf("failed to subscribe scan all policy change topic: %v", err)
} }
if config.WithClair() {
clairDB, err := config.ClairDB()
if err != nil {
log.Fatalf("failed to load clair database information: %v", err)
}
if err := dao.InitClairDB(clairDB); err != nil {
log.Fatalf("failed to initialize clair database: %v", err)
}
//Get policy configuration. //Get policy configuration.
scanAllPolicy := config.ScanAllPolicy() scanAllPolicy := config.ScanAllPolicy()
if scanAllPolicy.Type == notifier.PolicyTypeDaily { if scanAllPolicy.Type == notifier.PolicyTypeDaily {
@ -142,6 +141,7 @@ func main() {
log.Errorf("failed to publish scan all policy topic: %v", err) log.Errorf("failed to publish scan all policy topic: %v", err)
} }
} }
}
if err := core.Init(); err != nil { if err := core.Init(); err != nil {
log.Errorf("failed to initialize the replication controller: %v", err) log.Errorf("failed to initialize the replication controller: %v", err)