From dc4a1c5c5e30f31ccb30de1b69d94a4de73502ad Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Mon, 16 Dec 2024 09:12:57 -0600 Subject: [PATCH 1/5] Update GraalVM to 22.2.0 --- docker/Linux-GraalVM20/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/Linux-GraalVM20/Dockerfile b/docker/Linux-GraalVM20/Dockerfile index e73870eb9..8b91e0afd 100644 --- a/docker/Linux-GraalVM20/Dockerfile +++ b/docker/Linux-GraalVM20/Dockerfile @@ -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-ce-java11-22.2.0 +ENV GRAALVM_HOME=/opt/graalvm-ce-java11-22.2.0 +ENV PATH=$PATH:/opt/graalvm-ce-java11-22.2.0/bin ARG DEBIAN_FRONTEND=noninteractive @@ -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/vm-22.2.0/graalvm-ce-java11-linux-amd64-22.2.0.tar.gz \ + && tar xfz graalvm-ce-java11-linux-amd64-22.2.0.tar.gz \ + && mv graalvm-ce-java11-22.2.0 /opt # A non-root user is needed for some FilesystemSourceTest tests to work. ARG user=cantaloupe From d68621ea86b340eec425feb7a36c68e53ec42357 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Mon, 16 Dec 2024 09:58:44 -0600 Subject: [PATCH 2/5] Bump GraalVM to 22.3.3 --- docker/Linux-GraalVM20/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/Linux-GraalVM20/Dockerfile b/docker/Linux-GraalVM20/Dockerfile index 8b91e0afd..2ec14b258 100644 --- a/docker/Linux-GraalVM20/Dockerfile +++ b/docker/Linux-GraalVM20/Dockerfile @@ -1,8 +1,8 @@ FROM ubuntu:noble -ENV JAVA_HOME=/opt/graalvm-ce-java11-22.2.0 -ENV GRAALVM_HOME=/opt/graalvm-ce-java11-22.2.0 -ENV PATH=$PATH:/opt/graalvm-ce-java11-22.2.0/bin +ENV JAVA_HOME=/opt/graalvm-ce-java11-22.3.3 +ENV GRAALVM_HOME=/opt/graalvm-ce-java11-22.3.3 +ENV PATH=$PATH:/opt/graalvm-ce-java11-22.3.3/bin ARG DEBIAN_FRONTEND=noninteractive @@ -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-22.2.0/graalvm-ce-java11-linux-amd64-22.2.0.tar.gz \ - && tar xfz graalvm-ce-java11-linux-amd64-22.2.0.tar.gz \ - && mv graalvm-ce-java11-22.2.0 /opt +RUN wget -q https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.3/graalvm-ce-java11-linux-amd64-22.3.3.tar.gz \ + && tar xfz graalvm-ce-java11-linux-amd64-22.3.3.tar.gz \ + && mv graalvm-ce-java11-22.3.3 /opt # A non-root user is needed for some FilesystemSourceTest tests to work. ARG user=cantaloupe From c5699d8e1ac5b64d60a8813e6cf5f9ea7c3da6a2 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Mon, 16 Dec 2024 10:30:52 -0600 Subject: [PATCH 3/5] Switch to jdk 17 for GraalVM --- docker/Linux-GraalVM20/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/Linux-GraalVM20/Dockerfile b/docker/Linux-GraalVM20/Dockerfile index 2ec14b258..a3ac6ff43 100644 --- a/docker/Linux-GraalVM20/Dockerfile +++ b/docker/Linux-GraalVM20/Dockerfile @@ -1,8 +1,8 @@ FROM ubuntu:noble -ENV JAVA_HOME=/opt/graalvm-ce-java11-22.3.3 -ENV GRAALVM_HOME=/opt/graalvm-ce-java11-22.3.3 -ENV PATH=$PATH:/opt/graalvm-ce-java11-22.3.3/bin +ENV JAVA_HOME=/opt/graalvm-ce-java17-22.3.3 +ENV GRAALVM_HOME=/opt/graalvm-ce-java17-22.3.3 +ENV PATH=$PATH:/opt/graalvm-ce-java17-22.3.3/bin ARG DEBIAN_FRONTEND=noninteractive @@ -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-22.3.3/graalvm-ce-java11-linux-amd64-22.3.3.tar.gz \ - && tar xfz graalvm-ce-java11-linux-amd64-22.3.3.tar.gz \ - && mv graalvm-ce-java11-22.3.3 /opt +RUN wget -q https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.3/graalvm-ce-java17-linux-amd64-22.3.3.tar.gz \ + && tar xfz graalvm-ce-java17-linux-amd64-22.3.3.tar.gz \ + && mv graalvm-ce-java17-22.3.3 /opt # A non-root user is needed for some FilesystemSourceTest tests to work. ARG user=cantaloupe From fbc5782f2e7d2e4cee5a64cb51d2436c01b2864b Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Mon, 16 Dec 2024 10:55:21 -0600 Subject: [PATCH 4/5] Upgrade GraalVM to JDK 21 --- docker/Linux-GraalVM20/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/Linux-GraalVM20/Dockerfile b/docker/Linux-GraalVM20/Dockerfile index a3ac6ff43..b04284b0f 100644 --- a/docker/Linux-GraalVM20/Dockerfile +++ b/docker/Linux-GraalVM20/Dockerfile @@ -1,8 +1,8 @@ FROM ubuntu:noble -ENV JAVA_HOME=/opt/graalvm-ce-java17-22.3.3 -ENV GRAALVM_HOME=/opt/graalvm-ce-java17-22.3.3 -ENV PATH=$PATH:/opt/graalvm-ce-java17-22.3.3/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 @@ -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-22.3.3/graalvm-ce-java17-linux-amd64-22.3.3.tar.gz \ - && tar xfz graalvm-ce-java17-linux-amd64-22.3.3.tar.gz \ - && mv graalvm-ce-java17-22.3.3 /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 From 19d007f0847e6b59ae09128f2b08620d27b022e6 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Mon, 16 Dec 2024 11:36:35 -0600 Subject: [PATCH 5/5] Rename GraalVM docker directory to reflect openjdk21 --- .github/workflows/ci.yml | 2 +- docker/{Linux-GraalVM20 => Linux-GraalVM-JDK21}/Dockerfile | 0 docker/{Linux-GraalVM20 => Linux-GraalVM-JDK21}/compose.yaml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename docker/{Linux-GraalVM20 => Linux-GraalVM-JDK21}/Dockerfile (100%) rename docker/{Linux-GraalVM20 => Linux-GraalVM-JDK21}/compose.yaml (87%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03c083792..c7908f154 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/docker/Linux-GraalVM20/Dockerfile b/docker/Linux-GraalVM-JDK21/Dockerfile similarity index 100% rename from docker/Linux-GraalVM20/Dockerfile rename to docker/Linux-GraalVM-JDK21/Dockerfile diff --git a/docker/Linux-GraalVM20/compose.yaml b/docker/Linux-GraalVM-JDK21/compose.yaml similarity index 87% rename from docker/Linux-GraalVM20/compose.yaml rename to docker/Linux-GraalVM-JDK21/compose.yaml index 210ac32d4..07b6db732 100644 --- a/docker/Linux-GraalVM20/compose.yaml +++ b/docker/Linux-GraalVM-JDK21/compose.yaml @@ -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: