mrva/mrvacommander
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Provide MRVA_SERVER_ROOT via environment variable

Browse Source
This commit is contained in:
Michael Hohn
2024-06-11 20:13:13 -07:00
committed by =Michael Hohn
parent 4b721b5969
commit 765a76f75a
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@@ -37,6 +37,8 @@ services:
server: server:
image: ubuntu:22.04 image: ubuntu:22.04
container_name: server container_name: server
environment:
- MRVA_SERVER_ROOT=/mrva/mrvacommander/cmd/server
command: sh -c "apt-get update && apt-get install -y curl && tail -f /dev/null" command: sh -c "apt-get update && apt-get install -y curl && tail -f /dev/null"
ports: ports:
- "8080:8080" - "8080:8080"

19
pkg/agent/agent.go
View File

@@ -82,21 +82,20 @@ func (r *RunnerSingle) RunAnalysis(job common.AnalyzeJob) (string, error) {
queryPackID, dbOwner, dbRepo := queryPackID, dbOwner, dbRepo :=
job.QueryPackId, job.ORepo.Owner, job.ORepo.Repo job.QueryPackId, job.ORepo.Owner, job.ORepo.Repo
// FIXME Provide this via environment or explicit argument serverRoot := os.Getenv("MRVA_SERVER_ROOT")
gmsRoot := "/Users/hohn/work-gh/mrva/mrvacommander/cmd/server"
// Set up derived paths // Set up derived paths
dbPath := filepath.Join(gmsRoot, "var/codeql/dbs", dbOwner, dbRepo) dbPath := filepath.Join(serverRoot, "var/codeql/dbs", dbOwner, dbRepo)
dbZip := filepath.Join(gmsRoot, "codeql/dbs", dbOwner, dbRepo, dbZip := filepath.Join(serverRoot, "codeql/dbs", dbOwner, dbRepo,
fmt.Sprintf("%s_%s_db.zip", dbOwner, dbRepo)) fmt.Sprintf("%s_%s_db.zip", dbOwner, dbRepo))
dbExtract := filepath.Join(gmsRoot, "var/codeql/dbs", dbOwner, dbRepo) dbExtract := filepath.Join(serverRoot, "var/codeql/dbs", dbOwner, dbRepo)
queryPack := filepath.Join(gmsRoot, queryPack := filepath.Join(serverRoot,
"var/codeql/querypacks", fmt.Sprintf("qp-%d.tgz", queryPackID)) "var/codeql/querypacks", fmt.Sprintf("qp-%d.tgz", queryPackID))
queryExtract := filepath.Join(gmsRoot, queryExtract := filepath.Join(serverRoot,
"var/codeql/querypacks", fmt.Sprintf("qp-%d", queryPackID)) "var/codeql/querypacks", fmt.Sprintf("qp-%d", queryPackID))
queryOutDir := filepath.Join(gmsRoot, queryOutDir := filepath.Join(serverRoot,
"var/codeql/sarif/localrun", dbOwner, dbRepo) "var/codeql/sarif/localrun", dbOwner, dbRepo)
queryOutFile := filepath.Join(queryOutDir, queryOutFile := filepath.Join(queryOutDir,
fmt.Sprintf("%s_%s.sarif", dbOwner, dbRepo)) fmt.Sprintf("%s_%s.sarif", dbOwner, dbRepo))
@@ -108,7 +107,7 @@ func (r *RunnerSingle) RunAnalysis(job common.AnalyzeJob) (string, error) {
} }
if err := unzipFile(dbZip, dbExtract); err != nil { if err := unzipFile(dbZip, dbExtract); err != nil {
slog.Error("Failed to unzip DB %s: %v", dbZip, err) slog.Error("Failed to unzip DB", dbZip, err)
return "", err return "", err
} }
@@ -133,7 +132,7 @@ func (r *RunnerSingle) RunAnalysis(job common.AnalyzeJob) (string, error) {
cmd := exec.Command("codeql", "database", "analyze", cmd := exec.Command("codeql", "database", "analyze",
"--format=sarif-latest", "--rerun", "--output", queryOutFile, "--format=sarif-latest", "--rerun", "--output", queryOutFile,
"-j8", dbPath, queryExtract) "-j8", dbPath, queryExtract)
cmd.Dir = gmsRoot cmd.Dir = serverRoot
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr