This is an automated email from the ASF dual-hosted git repository. vatamane pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
commit 866d89f40928f28b80bb34dcd787426c1082bd30 Author: Gabor Pali <[email protected]> AuthorDate: Wed Nov 26 02:24:17 2025 +0100 Remove Java 8 with the deprecation of Clouseau 2.x The use of Clouseau 2.x is not recommended any longer. We are in the transition over to Clouseau 3.x instead, which works with Java 21 at the moment. See [1] for further information. [1] https://github.com/apache/couchdb/pull/5761 --- bin/yum-dependencies.sh | 1 - dockerfiles/almalinux-8 | 6 ++++-- dockerfiles/almalinux-9 | 6 ++++-- dockerfiles/debian-bookworm | 6 ++++-- dockerfiles/debian-bullseye | 6 ++++-- dockerfiles/debian-trixie | 6 ++++-- dockerfiles/ubuntu-jammy | 6 ++++-- dockerfiles/ubuntu-noble | 6 ++++-- 8 files changed, 28 insertions(+), 15 deletions(-) diff --git a/bin/yum-dependencies.sh b/bin/yum-dependencies.sh index f5e2b16..bb853cf 100755 --- a/bin/yum-dependencies.sh +++ b/bin/yum-dependencies.sh @@ -159,7 +159,6 @@ else fi # remove openjdk8 and jna, java 21 is installed and should be the default -# and clouseau installs it's own JRE 8 in /opt via a docker layer dnf remove -y java-1.8.0-openjdk-headless jna # clean up diff --git a/dockerfiles/almalinux-8 b/dockerfiles/almalinux-8 index 99a6675..8632ff6 100644 --- a/dockerfiles/almalinux-8 +++ b/dockerfiles/almalinux-8 @@ -22,8 +22,10 @@ FROM almalinux:8 # Java 21 installed via RPM: java-21-openjdk-devel # These are needed for the Clouseau integration -ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8 -COPY --from=ibm-semeru-runtimes:open-8-jre /opt/java/openjdk $CLOUSEAU_JAVA_HOME +# This is the same as for Nouveau for the moment, but perhaps it is better to +# keep it separate as there is no guarantee that they will be bumped at the +# same pace. +ENV CLOUSEAU_JAVA_HOME="${JAVA_HOME}" ENV PATH=/usr/local/lib/erlang/bin:"${PATH}" # Choose whether to install SpiderMonkey 1.8.5, default yes diff --git a/dockerfiles/almalinux-9 b/dockerfiles/almalinux-9 index fd31436..73f31e4 100644 --- a/dockerfiles/almalinux-9 +++ b/dockerfiles/almalinux-9 @@ -22,8 +22,10 @@ FROM almalinux:9 # Java 21 installed via RPM: java-21-openjdk-devel # These are needed for the Clouseau integration -ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8 -COPY --from=ibm-semeru-runtimes:open-8-jre /opt/java/openjdk $CLOUSEAU_JAVA_HOME +# This is the same as for Nouveau for the moment, but perhaps it is better to +# keep it separate as there is no guarantee that they will be bumped at the +# same pace. +ENV CLOUSEAU_JAVA_HOME="${JAVA_HOME}" ENV PATH=/usr/local/lib/erlang/bin:"${PATH}" # Choose whether to install SpiderMonkey 1.8.5, default yes diff --git a/dockerfiles/debian-bookworm b/dockerfiles/debian-bookworm index 89e67b8..6a13ae6 100644 --- a/dockerfiles/debian-bookworm +++ b/dockerfiles/debian-bookworm @@ -27,8 +27,10 @@ COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" # These are needed for the Clouseau integration -ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8 -COPY --from=ibm-semeru-runtimes:open-8-jre /opt/java/openjdk $CLOUSEAU_JAVA_HOME +# This is the same as for Nouveau for the moment, but perhaps it is better to +# keep it separate as there is no guarantee that they will be bumped at the +# same pace. +ENV CLOUSEAU_JAVA_HOME="${JAVA_HOME}" ENV PATH=/usr/local/lib/erlang/bin:"${PATH}" # Choose whether to install SpiderMonkey 1.8.5, default yes diff --git a/dockerfiles/debian-bullseye b/dockerfiles/debian-bullseye index eff092b..32499a9 100644 --- a/dockerfiles/debian-bullseye +++ b/dockerfiles/debian-bullseye @@ -27,8 +27,10 @@ COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" # These are needed for the Clouseau integration -ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8 -COPY --from=ibm-semeru-runtimes:open-8-jre /opt/java/openjdk $CLOUSEAU_JAVA_HOME +# This is the same as for Nouveau for the moment, but perhaps it is better to +# keep it separate as there is no guarantee that they will be bumped at the +# same pace. +ENV CLOUSEAU_JAVA_HOME="${JAVA_HOME}" ENV PATH=/usr/local/lib/erlang/bin:"${PATH}" # Choose whether to install SpiderMonkey 1.8.5, default yes diff --git a/dockerfiles/debian-trixie b/dockerfiles/debian-trixie index a8288e8..536643c 100644 --- a/dockerfiles/debian-trixie +++ b/dockerfiles/debian-trixie @@ -27,8 +27,10 @@ COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" # These are needed for the Clouseau integration -ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8 -COPY --from=ibm-semeru-runtimes:open-8-jre /opt/java/openjdk $CLOUSEAU_JAVA_HOME +# This is the same as for Nouveau for the moment, but perhaps it is better to +# keep it separate as there is no guarantee that they will be bumped at the +# same pace. +ENV CLOUSEAU_JAVA_HOME="${JAVA_HOME}" ENV PATH=/usr/local/lib/erlang/bin:"${PATH}" # Choose whether to install SpiderMonkey 1.8.5, default yes diff --git a/dockerfiles/ubuntu-jammy b/dockerfiles/ubuntu-jammy index 98cb035..450fc0e 100644 --- a/dockerfiles/ubuntu-jammy +++ b/dockerfiles/ubuntu-jammy @@ -25,8 +25,10 @@ COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" # These are needed for the Clouseau integration -ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8 -COPY --from=ibm-semeru-runtimes:open-8-jre /opt/java/openjdk $CLOUSEAU_JAVA_HOME +# This is the same as for Nouveau for the moment, but perhaps it is better to +# keep it separate as there is no guarantee that they will be bumped at the +# same pace. +ENV CLOUSEAU_JAVA_HOME="${JAVA_HOME}" ENV PATH=/usr/local/lib/erlang/bin:"${PATH}" # Choose whether to install SpiderMonkey 1.8.5, default yes diff --git a/dockerfiles/ubuntu-noble b/dockerfiles/ubuntu-noble index da41d91..244bc9b 100644 --- a/dockerfiles/ubuntu-noble +++ b/dockerfiles/ubuntu-noble @@ -25,8 +25,10 @@ COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" # These are needed for the Clouseau integration -ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8 -COPY --from=ibm-semeru-runtimes:open-8-jre /opt/java/openjdk $CLOUSEAU_JAVA_HOME +# This is the same as for Nouveau for the moment, but perhaps it is better to +# keep it separate as there is no guarantee that they will be bumped at the +# same pace. +ENV CLOUSEAU_JAVA_HOME="${JAVA_HOME}" ENV PATH=/usr/local/lib/erlang/bin:"${PATH}" # Choose whether to install SpiderMonkey 1.8.5, default yes
