Migrate new judge component from judge2 package.

mraron · Apr 9, 2024 · 78e5fc8 · 78e5fc8
1 parent 980aaa2
commit 78e5fc8
Show file tree

Hide file tree

Showing 23 changed files with 155 additions and 1,235 deletions.
diff --git a/cmd/glue.go b/cmd/glue.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/mraron/njudge/internal/glue"
-	"github.com/mraron/njudge/internal/judge2"
+	"github.com/mraron/njudge/internal/judge"
 	"github.com/mraron/njudge/internal/web/helpers/config"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

diff --git a/cmd/judge.go b/cmd/judge.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"github.com/mraron/njudge/internal/judge2"
+	"github.com/mraron/njudge/internal/judge"
 	"github.com/mraron/njudge/pkg/language"
 	"github.com/mraron/njudge/pkg/language/sandbox"
 	"github.com/mraron/njudge/pkg/problems"

diff --git a/internal/glue/glue.go b/internal/glue/glue.go
@@ -3,7 +3,7 @@ package glue
 import (
 	"context"
 	"fmt"
-	"github.com/mraron/njudge/internal/judge2"
+	"github.com/mraron/njudge/internal/judge"
 	"github.com/mraron/njudge/internal/njudge/db"
 	"github.com/mraron/njudge/internal/web/helpers/config"
 	"strconv"

diff --git a/internal/glue/glue_test.go b/internal/glue/glue_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"github.com/mraron/njudge/internal/glue"
-	"github.com/mraron/njudge/internal/judge2"
+	"github.com/mraron/njudge/internal/judge"
 	"github.com/mraron/njudge/internal/njudge"
 	"github.com/mraron/njudge/internal/njudge/memory"
 	"github.com/mraron/njudge/pkg/language"
@@ -216,7 +216,7 @@ func TestGlue_ProcessSubmission(t *testing.T) {
 func TestJudgeIntegration(t *testing.T) {
 	s1, _ := sandbox.NewDummy()
 	s2, _ := sandbox.NewDummy()
-	store := problems.NewFsStore("../judge2/testdata")
+	store := problems.NewFsStore("../judge/testdata")
 	_ = store.UpdateProblems()
 
 	judge := &judge2.Judge{

diff --git a/internal/judge/Dockerfile b/internal/judge/Dockerfile
@@ -3,31 +3,19 @@ ARG PROJECT_NAME
 FROM ubuntu:22.04 as judge_deps
 RUN apt-get update && apt-get install -y wget gcc g++ git build-essential libcap-dev
 WORKDIR /app
-RUN git clone https://github.com/ioi/isolate.git
+RUN git clone --depth 1 --branch v1.10.1 https://github.com/ioi/isolate.git
 WORKDIR /app/isolate
 RUN make isolate
 
-WORKDIR /
-RUN mkdir languages
-
-WORKDIR /languages
-RUN wget https://julialang-s3.julialang.org/bin/linux/x64/1.8/julia-1.8.4-linux-x86_64.tar.gz && \
-    tar zxvf julia-1.8.4-linux-x86_64.tar.gz && \
-    rm julia-1.8.4-linux-x86_64.tar.gz
-
-RUN wget https://nim-lang.org/download/nim-1.6.10-linux_x64.tar.xz && \
-    tar xvf nim-1.6.10-linux_x64.tar.xz && \
-    rm nim-1.6.10-linux_x64.tar.xz
-
 FROM ${PROJECT_NAME}-base
 
 COPY --from=judge_deps /app/isolate /app/isolate
 WORKDIR /app/isolate
 RUN make install
 
-COPY --from=judge_deps /languages/* /languages/
-RUN ln -s /languages/julia-1.8.4/bin/julia /usr/local/bin/julia && \
-    ln -s /languages/nim-1.6.10/bin/nim /usr/bin/nim
+COPY --from=julia:1.10.1 /usr/local/julia/ /usr/local/julia
+COPY --from=nimlang/nim:1.6.18 /usr/bin/nim /usr/bin/nim
+RUN ln -s /usr/local/julia/bin/julia /usr/local/bin/julia
 
 WORKDIR /app
 COPY configs/docker/judge_docker.json ./judge.json

diff --git a/internal/judge/callback.go b/internal/judge/callback.go
diff --git a/internal/judge/client.go b/internal/judge/client.go
diff --git a/internal/judge2/judge.go → internal/judge/judge.go b/internal/judge2/judge.go → internal/judge/judge.go
diff --git a/internal/judge2/judge_test.go → internal/judge/judge_test.go b/internal/judge2/judge_test.go → internal/judge/judge_test.go