chore: rollback

Dup4 · Dup4 · commit c9884c0a6bcd · 2024-10-31T09:02:58.000+08:00
Signed-off-by: Dup4 &lt;lyuzhi.pan@gmail.com&gt;
diff --git a/docker/judgehost/Dockerfile b/docker/judgehost/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM debian:bookworm
 LABEL org.opencontainers.image.authors="DOMjudge team <team@domjudge.org>"
 
 ENV DEBIAN_FRONTEND=noninteractive \
diff --git a/docker/judgehost/Dockerfile.build b/docker/judgehost/Dockerfile.build
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy 
+FROM debian:bookworm-slim
 LABEL org.opencontainers.image.authors="DOMjudge team <team@domjudge.org>"
 
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/docker/judgehost/chroot-and-tar.sh b/docker/judgehost/chroot-and-tar.sh
@@ -3,10 +3,7 @@
 set -euo pipefail
 
 # Usage: https://github.com/DOMjudge/domjudge/blob/main/misc-tools/dj_make_chroot.in#L58-L87
-/opt/domjudge/judgehost/bin/dj_make_chroot \
-    -D Ubuntu \
-    -R jammy \
-    -i openjdk-17-jdk-headless,openjdk-17-jre-headless
+/opt/domjudge/judgehost/bin/dj_make_chroot
 
 cd /
 echo "[..] Compressing chroot"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ubuntu:jammy`
	`1`	`+FROM debian:bookworm`
`2`	`2`	`LABEL org.opencontainers.image.authors="DOMjudge team <[email protected]>"`
`3`	`3`
`4`	`4`	`ENV DEBIAN_FRONTEND=noninteractive \`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ubuntu:jammy`
	`1`	`+FROM debian:bookworm-slim`
`2`	`2`	`LABEL org.opencontainers.image.authors="DOMjudge team <[email protected]>"`
`3`	`3`
`4`	`4`	`ENV DEBIAN_FRONTEND=noninteractive`