File tree Expand file tree Collapse file tree 4 files changed +9
-11
lines changed Expand file tree Collapse file tree 4 files changed +9
-11
lines changed Original file line number Diff line number Diff line change @@ -112,7 +112,7 @@ yum groupinstall -y 'Development Tools'
112112# help2man is for docs
113113yum install -y sudo git wget which autoconf autoconf-archive automake curl-devel libicu-devel \
114114 libtool ncurses-devel nspr-devel zip readline-devel unzip perl \
115- createrepo xfsprogs-devel rpmdevtools
115+ createrepo xfsprogs-devel java-21-openjdk-devel rpmdevtools
116116if [[ ${VERSION_ID} -eq 9 ]]; then
117117 dnf --enablerepo=crb install -y help2man
118118else
181181 yum install -y libffi-devel
182182fi
183183
184+ # remove openjdk8 and jna, java 21 is installed and should be the default
185+ # and clouseau installs it's won JRE 8 in /opt
186+ yum remove -y java-1.8.0-openjdk-headless jna
187+
184188# clean up
185189yum clean all -y
Original file line number Diff line number Diff line change @@ -46,8 +46,8 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4646# When updating the images, consider updating pull-all-couchdbdev-docker
4747# script as well
4848#
49- DEBIANS=" debian-bullseye debian-bookworm"
50- UBUNTUS=" ubuntu-focal ubuntu-jammy"
49+ DEBIANS=" " # debian-bullseye debian-bookworm"
50+ UBUNTUS=" " # ubuntu-focal ubuntu-jammy"
5151CENTOSES=" almalinux-8 almalinux-9"
5252
5353XPLAT_BASE=" debian-bookworm"
Original file line number Diff line number Diff line change 1919
2020FROM almalinux:8
2121
22- # Install Java
23- ENV JAVA_HOME=/opt/java/openjdk
24- COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
25- ENV PATH="${JAVA_HOME}/bin:${PATH}"
22+ # Java 21 installed via RPM: java-21-openjdk-devel
2623
2724# These are needed for the Clouseau integration
2825ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8
Original file line number Diff line number Diff line change 1919
2020FROM almalinux:9
2121
22- # Install Java
23- ENV JAVA_HOME=/opt/java/openjdk
24- COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
25- ENV PATH="${JAVA_HOME}/bin:${PATH}"
22+ # Java 21 installed via RPM: java-21-openjdk-devel
2623
2724# These are needed for the Clouseau integration
2825ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8
You can’t perform that action at this time.
0 commit comments