Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Java from 17 to 21 #311

Merged
merged 3 commits into from
Feb 13, 2024
+6 −6
Merged

Update Java from 17 to 21 #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f223f3
Update Java from 17 to 21
rien Feb 12, 2024
01fba0a
Update workflows for Java 21 update
rien Feb 12, 2024
e289fb4
Java: pin jq version
rien Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions dodona-java17.dockerfile → dodona-java21.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM openjdk:17-slim
FROM eclipse-temurin:21-jdk-alpine

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a Debian slim base? Most of our other docker images are (indirectly) based on debian slim, so it should result in space saved if we can use that here as well.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately their slim images are Ubuntu-based. So I don't think we can share there.

# 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 --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 \
# 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
Expand Down
Loading