Skip to content

Modern Docker Management, Designed for Everyone

refactor: use trivy-db mirrors from arcane-tools (#2646)

Kyle Mendell146cc8e7d425
diff --git a/backend/internal/services/vulnerability_service.go b/backend/internal/services/vulnerability_service.go
index d5f3e4563..ef7ae244d 100644
--- a/backend/internal/services/vulnerability_service.go
+++ b/backend/internal/services/vulnerability_service.go
@@ -45,22 +45,25 @@ const (
DefaultArcaneToolsImage = "ghcr.io/getarcaneapp/tools:latest"
// DefaultTrivyImage preserves the existing setting name, but now points at
// the shared Arcane tools image that includes the Trivy binary.
- DefaultTrivyImage = DefaultArcaneToolsImage
- DefaultTrivyNetworkMode = "bridge"
- trivyCacheVolumeName = "arcane-trivy-cache"
- trivyCacheMountTarget = "/root/.cache"
- trivyCacheSlotRootDir = trivyCacheMountTarget + "/arcane-scan-slots"
- scanStaleTimeout = 30 * time.Minute
- defaultTrivyCPULimitCores = 1.0
- defaultTrivyMemoryLimitMB int64 = 0
- trivyNanoCPUsPerCore = int64(1_000_000_000)
- trivyBytesPerMB = int64(1024 * 1024)
- trivyErrorExcerptSize = int64(32 * 1024)
- defaultScanSaveRetryAttempts = 3
- defaultScanSaveRetryDelay = 200 * time.Millisecond
- defaultScanSaveRetryMaxDelay = 2 * time.Second
- trivyOutputPathPrefix = "/tmp/arcane-trivy-result-"
- defaultDockerHostURI = "unix:///var/run/docker.sock"
+ DefaultTrivyImage = DefaultArcaneToolsImage
+ DefaultTrivyNetworkMode = "bridge"
+ trivyCacheVolumeName = "arcane-trivy-cache"
+ trivyCacheMountTarget = "/root/.cache"
+ trivyCacheSlotRootDir = trivyCacheMountTarget + "/arcane-scan-slots"
+ scanStaleTimeout = 30 * time.Minute
+ defaultTrivyCPULimitCores = 1.0
+ defaultTrivyMemoryLimitMB int64 = 0
+ trivyNanoCPUsPerCore = int64(1_000_000_000)
+ trivyBytesPerMB = int64(1024 * 1024)
+ trivyErrorExcerptSize = int64(32 * 1024)
+ defaultScanSaveRetryAttempts = 3
+ defaultScanSaveRetryDelay = 200 * time.Millisecond
+ defaultScanSaveRetryMaxDelay = 2 * time.Second
+ trivyOutputPathPrefix = "/tmp/arcane-trivy-result-"
+ defaultDockerHostURI = "unix:///var/run/docker.sock"
+ DefaultTrivyDBRepository = "ghcr.io/getarcaneapp/trivy-db:2"
+ DefaultTrivyJavaDBRepository = "ghcr.io/getarcaneapp/trivy-java-db:1"
+ DefaultTrivyChecksBundleRepository = "ghcr.io/getarcaneapp/trivy-checks:1"
)
type trivyRuntimeOptions struct {
@@ -1400,6 +1403,7 @@ func (s *VulnerabilityService) execTrivyScanInContainer(ctx context.Context, con
execCmd := []string{"trivy", "image", "--format", "json", "--quiet", "--output", outputPath, "--timeout", trivyTimeout}
execCmd = append(execCmd, trivyScanCacheBackendArgsInternal()...)
+ execCmd = append(execCmd, trivyDefaultRepositoryArgsInternal()...)
execCmd = append(execCmd, imageName)
execCfg := client.ExecCreateOptions{
@@ -2135,6 +2139,14 @@ func trivyScanCacheBackendArgsInternal() []string {
return trivyScanCacheBackendArgsForArchInternal(runtime.GOARCH)
}
+func trivyDefaultRepositoryArgsInternal() []string {
+ return []string{
+ "--db-repository", DefaultTrivyDBRepository,
+ "--java-db-repository", DefaultTrivyJavaDBRepository,
+ "--checks-bundle-repository", DefaultTrivyChecksBundleRepository,
+ }
+}
+
func (s *VulnerabilityService) buildTrivyCommandArgs(
ctx context.Context,
imageName string,
@@ -2145,6 +2157,7 @@ func (s *VulnerabilityService) buildTrivyCommandArgs(
) ([]string, []string) {
cmdArgs := []string{"image", "--format", "json", "--quiet", "--timeout", s.getTrivyScanTimeoutArg()}
cmdArgs = append(cmdArgs, trivyScanCacheBackendArgsInternal()...)
+ cmdArgs = append(cmdArgs, trivyDefaultRepositoryArgsInternal()...)
var tempFiles []string
if strings.TrimSpace(configContent) != "" {
diff --git a/backend/internal/services/vulnerability_service_test.go b/backend/internal/services/vulnerability_service_test.go
index cae1715da..6f5e9c2d8 100644
--- a/backend/internal/services/vulnerability_service_test.go
+++ b/backend/internal/services/vulnerability_service_test.go
@@ -290,6 +290,18 @@ func TestBuildTrivyCommandArgs_WithoutCacheDir(t *testing.T) {
require.Equal(t, "alpine:3.20", cmdArgs[len(cmdArgs)-1])
}
+func TestBuildTrivyCommandArgs_IncludesDefaultRepositories(t *testing.T) {
+ svc := &VulnerabilityService{}
+ cmdArgs, _ := svc.buildTrivyCommandArgs(context.Background(), "alpine:3.20", "", "", "", "/tmp/out.json")
+
+ require.Contains(t, cmdArgs, "--db-repository")
+ require.Contains(t, cmdArgs, DefaultTrivyDBRepository)
+ require.Contains(t, cmdArgs, "--java-db-repository")
+ require.Contains(t, cmdArgs, DefaultTrivyJavaDBRepository)
+ require.Contains(t, cmdArgs, "--checks-bundle-repository")
+ require.Contains(t, cmdArgs, DefaultTrivyChecksBundleRepository)
+}
+
func TestTrivyScanCacheBackendArgsForArch(t *testing.T) {
memoryBackend := []string{"--cache-backend", "memory"}