From b4a528be434eb21845678661476618b27d346fd6 Mon Sep 17 00:00:00 2001
From: Bart Mesuere <Bart.Mesuere@UGent.be>
Date: Tue, 25 Feb 2025 16:15:23 +0100
Subject: [PATCH 1/3] Update dodona-java.dockerfile

---
 dodona-java.dockerfile | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/dodona-java.dockerfile b/dodona-java.dockerfile
index c463037..d6c215f 100644
--- a/dodona-java.dockerfile
+++ b/dodona-java.dockerfile
@@ -1,14 +1,21 @@
-FROM openjdk:8
+FROM eclipse-temurin:8-jdk-noble
 
 # Install jq for json querying in bash
-RUN apt-get update \
- && apt-get install -y --no-install-recommends jshon=20131010-3+b1 \
- && rm -rf /var/lib/apt/lists/* \
- # Make sure the students can't find our secret path, which is mounted in
- # /mnt with a secure random name.
- && chmod 711 /mnt \
- # Add the user which will run the student's code and the judge.
- && useradd -m runner
+RUN <<EOF
+  set -eux
+
+  apt-get update
+  apt-get install -y --no-install-recommends jshon
+
+  rm -rf /var/lib/apt/lists/*
+  apt-get clean
+
+  # Make sure the students can't find our secret path, which is mounted in
+  # /mnt with a secure random name.
+  chmod 711 /mnt
+  # Add the user which will run the student's code and the judge.
+  useradd -m runner
+EOF
 
 # As the runner user
 USER runner

From 629e231a7e51ed9420844152c3a437a23ad8261e Mon Sep 17 00:00:00 2001
From: Bart Mesuere <Bart.Mesuere@UGent.be>
Date: Tue, 25 Feb 2025 18:09:18 +0100
Subject: [PATCH 2/3] Replace jshon with jq in Dockerfile

---
 dodona-java.dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dodona-java.dockerfile b/dodona-java.dockerfile
index d6c215f..a4bc07c 100644
--- a/dodona-java.dockerfile
+++ b/dodona-java.dockerfile
@@ -1,11 +1,11 @@
 FROM eclipse-temurin:8-jdk-noble
 
-# Install jq for json querying in bash
 RUN <<EOF
   set -eux
 
+  # Install jq for json querying in bash
   apt-get update
-  apt-get install -y --no-install-recommends jshon
+  apt-get install -y --no-install-recommends jq
 
   rm -rf /var/lib/apt/lists/*
   apt-get clean

From d7662970560cf11ad4f198bf328f0abc34658ee9 Mon Sep 17 00:00:00 2001
From: Bart Mesuere <Bart.Mesuere@UGent.be>
Date: Tue, 25 Feb 2025 20:41:46 +0100
Subject: [PATCH 3/3] Switch base image to amazoncorretto

---
 dodona-java.dockerfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dodona-java.dockerfile b/dodona-java.dockerfile
index a4bc07c..367e644 100644
--- a/dodona-java.dockerfile
+++ b/dodona-java.dockerfile
@@ -1,20 +1,20 @@
-FROM eclipse-temurin:8-jdk-noble
+FROM amazoncorretto:8-alpine-jdk
 
+# Install jq for json querying in bash
 RUN <<EOF
   set -eux
 
-  # Install jq for json querying in bash
-  apt-get update
-  apt-get install -y --no-install-recommends jq
+  apk add --no-cache jq
 
-  rm -rf /var/lib/apt/lists/*
-  apt-get clean
 
   # Make sure the students can't find our secret path, which is mounted in
   # /mnt with a secure random name.
   chmod 711 /mnt
+
   # Add the user which will run the student's code and the judge.
-  useradd -m runner
+  adduser -u 1000 -S runner
+  rm -rf /var/cache/apk/*
+
 EOF
 
 # As the runner user