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 81% rename from docker/Linux-GraalVM20/Dockerfile rename to docker/Linux-GraalVM-JDK21/Dockerfile index e73870eb9..b04284b0f 100644 --- a/docker/Linux-GraalVM20/Dockerfile +++ b/docker/Linux-GraalVM-JDK21/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-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-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 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: