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 GraalVM to use JDK 21 #720

Merged
merged 5 commits into from
Dec 18, 2024
Merged

Update GraalVM to use JDK 21 #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc4a1c5
Update GraalVM to 22.2.0
jcoyne Dec 16, 2024
d68621e
Bump GraalVM to 22.3.3
jcoyne Dec 16, 2024
c5699d8
Switch to jdk 17 for GraalVM
jcoyne Dec 16, 2024
fbc5782
Upgrade GraalVM to JDK 21
jcoyne Dec 16, 2024
19d007f
Rename GraalVM docker directory to reflect openjdk21
jcoyne Dec 16, 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/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: docker compose -f docker/Linux-JDK21/compose.yaml up --build --exit-code-from cantaloupe
- name: Test in Linux GraalVM
if: matrix.os == 'ubuntu-latest' && matrix.java == 'graalvm'
run: docker compose -f docker/Linux-GraalVM20/compose.yaml up --build --exit-code-from cantaloupe
run: docker compose -f docker/Linux-GraalVM-JDK21/compose.yaml up --build --exit-code-from cantaloupe
- name: Test in Windows JDK 17 (LTS)
if: matrix.os == 'windows-latest' && matrix.java == 'jdk17'
run: docker compose -f docker/Windows-JDK17/compose.yaml up --build --exit-code-from cantaloupe
Expand Down
12 changes: 6 additions & 6 deletions docker/Linux-GraalVM20/Dockerfile → docker/Linux-GraalVM-JDK21/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM ubuntu:noble

ENV JAVA_HOME=/opt/graalvm-ce-java11-20.3.0
ENV GRAALVM_HOME=/opt/graalvm-ce-java11-20.3.0
ENV PATH=$PATH:/opt/graalvm-ce-java11-20.3.0/bin
ENV JAVA_HOME=/opt/graalvm-community-openjdk-21.0.2+13.1
ENV GRAALVM_HOME=/opt/graalvm-community-openjdk-21.0.2+13.1
ENV PATH=$PATH:/opt/graalvm-community-openjdk-21.0.2+13.1/bin

ARG DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -39,9 +39,9 @@ COPY dist/deps/Linux-x86-64/lib/* /usr/lib/
# && dpkg -i ./libgrokj2k1_7.6.5-1_amd64.deb \

# Install GraalVM
RUN wget -q https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.3.0/graalvm-ce-java11-linux-amd64-20.3.0.tar.gz \
&& tar xfz graalvm-ce-java11-linux-amd64-20.3.0.tar.gz \
&& mv graalvm-ce-java11-20.3.0 /opt
RUN wget -q https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_linux-x64_bin.tar.gz \
&& tar xfz graalvm-community-jdk-21.0.2_linux-x64_bin.tar.gz \
&& mv graalvm-community-openjdk-21.0.2+13.1 /opt

# A non-root user is needed for some FilesystemSourceTest tests to work.
ARG user=cantaloupe
Expand Down
2 changes: 1 addition & 1 deletion docker/Linux-GraalVM20/compose.yaml → docker/Linux-GraalVM-JDK21/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
cantaloupe:
build:
context: ../../
dockerfile: $PWD/docker/Linux-GraalVM20/Dockerfile
dockerfile: $PWD/docker/Linux-GraalVM-JDK21/Dockerfile
minio:
image: minio/minio
environment:
Expand Down
Loading