fix: fixed build errors on unix

Gurkengewuerz · Nov 4, 2024 · 6e21aa3 · 6e21aa3
1 parent 520567f
commit 6e21aa3
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 19 deletions.
diff --git a/docker/compose.yml b/docker/compose.yml
@@ -3,6 +3,7 @@ services:
     image: ghcr.io/gurkengewuerz/gitcodejudge-server:latest
     restart: unless-stopped
     networks: [traefik]
+
     volumes:
       - ${CONTAINER_DIR}/judge/tests:/test_cases
       - ${CONTAINER_DIR}/judge/db:/db
@@ -18,6 +19,9 @@ services:
       - DB_PATH=/db
       - PDF_FOOTER_COPYRIGHT=Copyright by Gurkengewuerz
       - LEADERBOARD_ENABLED=true
+      - OAUTH2_ISSUER=${OAUTH2_ISSUER:-}
+      - OAUTH2_CLIENT_ID=${OAUTH2_CLIENT_ID:-}
+      - OAUTH2_SECRET=${OAUTH2_SECRET:-}
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=traefik"

diff --git a/docker/judge/entrypoint.sh b/docker/judge/entrypoint.sh
@@ -1,6 +1,13 @@
 #!/usr/bin/env ash
 set -e
 
+trim() {
+  local s2 s="$*"
+  until s2="${s#[[:space:]]}"; [ "$s2" = "$s" ]; do s="$s2"; done
+  until s2="${s%[[:space:]]}"; [ "$s2" = "$s" ]; do s="$s2"; done
+  echo "$s"
+}
+
 # Check if required environment variables are set
 if [ -z "$JUDGE_WORKSHOP" ] || [ -z "$JUDGE_TASK" ]; then
     >&2 echo "Error: JUDGE_WORKSHOP and JUDGE_TASK environment variables must be set"
@@ -9,6 +16,7 @@ fi
 
 # Define the solutions directory
 SOLUTIONS_DIR="/repo/${JUDGE_WORKSHOP}/${JUDGE_TASK}"
+SOLUTIONS_DIR=$(trim "$SOLUTIONS_DIR")
 INPUT_FILE="/judge/input.txt"
 
 # Check if solutions directory exists

diff --git a/internal/judge/docker.go b/internal/judge/docker.go
@@ -1,21 +1,21 @@
 package judge
 
 import (
-	"bytes"
-	"context"
-	"fmt"
-	"github.com/docker/docker/api/types/image"
-	"github.com/docker/docker/pkg/stdcopy"
-	"github.com/gurkengewuerz/GitCodeJudge/internal/config"
-	"github.com/gurkengewuerz/GitCodeJudge/internal/models"
-	log "github.com/sirupsen/logrus"
-	"io"
-	"os"
-	"path/filepath"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/client"
+    "bytes"
+    "context"
+    "fmt"
+    "github.com/docker/docker/api/types/image"
+    "github.com/docker/docker/pkg/stdcopy"
+    "github.com/gurkengewuerz/GitCodeJudge/internal/config"
+    "github.com/gurkengewuerz/GitCodeJudge/internal/models"
+    log "github.com/sirupsen/logrus"
+    "io"
+    "os"
+    "path/filepath"
+    "time"
+
+    "github.com/docker/docker/api/types/container"
+    "github.com/docker/docker/client"
 )
 
 type DockerExecutor struct {
@@ -97,8 +97,8 @@ func (e *DockerExecutor) RunCode(ctx context.Context, testCase models.TestCase)
 		&container.Config{
 			Image: config.CFG.DockerImage,
 			Env: []string{
-				fmt.Sprintf("JUDGE_WORKSHOP=%s", testCase.Solution.Workshop),
-				fmt.Sprintf("JUDGE_TASK=%s", testCase.Solution.Task),
+				fmt.Sprintf("JUDGE_WORKSHOP=%s", Trim(testCase.Solution.Workshop)),
+				fmt.Sprintf("JUDGE_TASK=%s", Trim(testCase.Solution.Task)),
 			},
 			WorkingDir: "/judge",
 		},

diff --git a/internal/judge/pool.go b/internal/judge/pool.go
@@ -63,7 +63,7 @@ func (p *Pool) worker() {
 		}
 
 		owner, repo := parts[0], parts[1]
-		targetURL := fmt.Sprintf("%s/results/%s", submission.BaseURL, submission.CommitID)
+		targetURL := fmt.Sprintf("%s/results/%s", appConfig.CFG.BaseURL, submission.CommitID)
 
 		if err := submission.GitClient.PostStarting(owner, repo, submission.CommitID, targetURL, status.StatusNone, "Judge started"); err != nil {
 			log.WithFields(fields).WithError(err).Error("Failed to post starting")

diff --git a/internal/models/submission.go b/internal/models/submission.go
@@ -34,7 +34,6 @@ type Submission struct {
 	CloneURL   string
 	Solutions  []Solution
 	GitClient  *gitea.GiteaClient
-	BaseURL    string
 }
 
 type TestResult struct {