From 6f223f3c1d4e3a9f5c039886d23d46ea101cc043 Mon Sep 17 00:00:00 2001 From: Rien Maertens Date: Mon, 12 Feb 2024 17:09:38 +0100 Subject: [PATCH 1/3] Update Java from 17 to 21 --- dodona-java17.dockerfile => dodona-java21.dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename dodona-java17.dockerfile => dodona-java21.dockerfile (69%) diff --git a/dodona-java17.dockerfile b/dodona-java21.dockerfile similarity index 69% rename from dodona-java17.dockerfile rename to dodona-java21.dockerfile index b3a39e5..8e8b8b5 100644 --- a/dodona-java17.dockerfile +++ b/dodona-java21.dockerfile @@ -1,13 +1,13 @@ -FROM openjdk:17-slim +FROM eclipse-temurin:21-jdk-alpine # Install jq for json querying in bash -RUN apt-get update && apt-get install -y --no-install-recommends jq=1.6-2.1 \ - && rm -rf /var/lib/apt/lists/* \ +RUN apk add --update-cache jq \ # 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 -S runner \ + && rm -rf /var/cache/apk/* # As the runner user USER runner From 01fba0abc0c2605797980073571841e03b449b7b Mon Sep 17 00:00:00 2001 From: Rien Maertens Date: Mon, 12 Feb 2024 17:17:24 +0100 Subject: [PATCH 2/3] Update workflows for Java 21 update --- .github/workflows/build.yml | 2 +- .github/workflows/lint.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c1dcc0f..328a8f0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - image: [assembly, bash, c, compilers, csharp, haskell, html, java, java17, nodejs, prolog, python, r, scheme, sqlite, tested] + image: [assembly, bash, c, compilers, csharp, haskell, html, java, java21, nodejs, prolog, python, r, scheme, sqlite, tested] runs-on: ubuntu-latest steps: - uses: actions/checkout@master diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ab7e8e1..3796f87 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - image: [assembly, bash, c, compilers, csharp, haskell, html, java, java17, nodejs, prolog, python, r, scheme, sqlite, tested] + image: [assembly, bash, c, compilers, csharp, haskell, html, java, java21, nodejs, prolog, python, r, scheme, sqlite, tested] runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 From e289fb4640d45cdc4d20fd26f6b97d7e5ae7ac01 Mon Sep 17 00:00:00 2001 From: Rien Maertens Date: Mon, 12 Feb 2024 17:19:36 +0100 Subject: [PATCH 3/3] Java: pin jq version --- dodona-java21.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dodona-java21.dockerfile b/dodona-java21.dockerfile index 8e8b8b5..5829cc0 100644 --- a/dodona-java21.dockerfile +++ b/dodona-java21.dockerfile @@ -1,7 +1,7 @@ FROM eclipse-temurin:21-jdk-alpine # Install jq for json querying in bash -RUN apk add --update-cache jq \ +RUN apk add --no-cache jq=1.7.1-r0 \ # Make sure the students can't find our secret path, which is mounted in # /mnt with a secure random name. && chmod 711 /mnt \