From 7df0134db8e96d14dd1412ea4fffde4a31cdb2ea Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Thu, 21 Nov 2024 09:30:07 +0100 Subject: [PATCH] cmake(ci): Fix almalinux and rockylinux java jobs. --- cmake/docker/almalinux/java.Dockerfile | 4 +++- cmake/docker/rockylinux/java.Dockerfile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/docker/almalinux/java.Dockerfile b/cmake/docker/almalinux/java.Dockerfile index 73b0d9cde8..8354e0b087 100644 --- a/cmake/docker/almalinux/java.Dockerfile +++ b/cmake/docker/almalinux/java.Dockerfile @@ -1,9 +1,11 @@ FROM ortools/cmake:almalinux_swig AS env RUN dnf -y update \ -&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \ +&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \ && dnf clean all \ && rm -rf /var/cache/dnf +RUN alternatives --set java /usr/lib/jvm/java-11-openjdk*.x86_64/bin/java +ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk FROM env AS devel WORKDIR /home/project diff --git a/cmake/docker/rockylinux/java.Dockerfile b/cmake/docker/rockylinux/java.Dockerfile index 957033eafa..dcb4c750ac 100644 --- a/cmake/docker/rockylinux/java.Dockerfile +++ b/cmake/docker/rockylinux/java.Dockerfile @@ -1,9 +1,11 @@ FROM ortools/cmake:rockylinux_swig AS env RUN dnf -y update \ -&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \ +&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \ && dnf clean all \ && rm -rf /var/cache/dnf +RUN alternatives --set java /usr/lib/jvm/java-11-openjdk-11.*.x86_64/bin/java +ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk FROM env AS devel WORKDIR /home/project