Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-18 14:47:38 +01:00
Code Issues Projects Releases Wiki Activity

fix(scanner): move RemoveImmutableScanners before EnsureScanners (#12957)

Browse Source 
RemoveImmutableScanners may delete the default scanner, so move it
before the EnsureScanners.

Closes #12938

Signed-off-by: He Weiwei <hweiwei@vmware.com>
This commit is contained in:
He Weiwei 2020-09-03 11:11:16 +08:00 committed by GitHub
parent 262f22f5ef
commit f4938ca966
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/main.go
View File

@ -259,6 +259,10 @@ func registerScanners() {
uninstallScannerNames = append(uninstallScannerNames, clairScanner) uninstallScannerNames = append(uninstallScannerNames, clairScanner)
} }
if err := scan.RemoveImmutableScanners(uninstallScannerNames); err != nil {
log.Warningf("failed to remove scanners: %v", err)
}
if err := scan.EnsureScanners(wantedScanners); err != nil { if err := scan.EnsureScanners(wantedScanners); err != nil {
log.Fatalf("failed to register scanners: %v", err) log.Fatalf("failed to register scanners: %v", err)
} }
@ -269,11 +273,6 @@ func registerScanners() {
log.Fatalf("failed to set default scanner: %v", err) log.Fatalf("failed to set default scanner: %v", err)
} }
} }
if err := scan.RemoveImmutableScanners(uninstallScannerNames); err != nil {
log.Warningf("failed to remove scanners: %v", err)
}
} }
func getDefaultScannerName() string { func getDefaultScannerName() string {