Skip to content

Commit f606b62

Browse files
committed
Add JDK 8 to the Docker images to support running Clouseau
This change makes it possible to run tests that require the Search functionality to be configured. Therefore the test coverage could be increased and issues could be caught with the related applications, such as Dreyfus and the `text` searches in Mango.
1 parent 0065863 commit f606b62

File tree

8 files changed

+48
-0
lines changed

8 files changed

+48
-0
lines changed

dockerfiles/almalinux-8

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ ENV JAVA_HOME=/opt/java/openjdk
2424
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
2525
ENV PATH="${JAVA_HOME}/bin:${PATH}"
2626

27+
# These are needed for the Clouseau integration
28+
ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8
29+
COPY --from=eclipse-temurin:8 /opt/java/openjdk $CLOUSEAU_JAVA_HOME
30+
ENV PATH=/usr/local/lib/erlang/bin:"${PATH}"
31+
2732
# Choose whether to install SpiderMonkey 1.8.5, default yes
2833
ARG js=js
2934
# Choose whether to install Erlang, default yes

dockerfiles/almalinux-9

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ ENV JAVA_HOME=/opt/java/openjdk
2424
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
2525
ENV PATH="${JAVA_HOME}/bin:${PATH}"
2626

27+
# These are needed for the Clouseau integration
28+
ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8
29+
COPY --from=eclipse-temurin:8 /opt/java/openjdk $CLOUSEAU_JAVA_HOME
30+
ENV PATH=/usr/local/lib/erlang/bin:"${PATH}"
31+
2732
# Choose whether to install SpiderMonkey 1.8.5, default yes
2833
ARG js=js
2934
# Choose whether to install Erlang, default yes
@@ -55,6 +60,10 @@ RUN ERLANGVERSION=$erlangversion \
5560
NODEVERSION=$nodeversion \
5661
/root/couchdb-ci/bin/install-dependencies.sh $js $erlang
5762

63+
# This are needed for the Clouseau integration
64+
ENV CLOUSEAU_JAVA_HOME=/opt/java/clouseaujdk
65+
ENV PATH=/usr/local/lib/erlang/bin:${PATH}
66+
5867
# Allow Jenkins to sudo
5968
RUN echo "jenkins ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/jenkins
6069

dockerfiles/centos-7

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ ENV JAVA_HOME=/opt/java/openjdk
2424
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
2525
ENV PATH="${JAVA_HOME}/bin:${PATH}"
2626

27+
# These are needed for the Clouseau integration
28+
ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8
29+
COPY --from=eclipse-temurin:8 /opt/java/openjdk $CLOUSEAU_JAVA_HOME
30+
ENV PATH=/usr/local/lib/erlang/bin:"${PATH}"
31+
2732
# Choose whether to install SpiderMonkey 1.8.5, default yes
2833
ARG js=js
2934
# Choose whether to install Erlang, default yes

dockerfiles/debian-bullseye

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ ENV JAVA_HOME=/opt/java/openjdk
2626
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
2727
ENV PATH="${JAVA_HOME}/bin:${PATH}"
2828

29+
# These are needed for the Clouseau integration
30+
ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8
31+
COPY --from=eclipse-temurin:8 /opt/java/openjdk $CLOUSEAU_JAVA_HOME
32+
ENV PATH=/usr/local/lib/erlang/bin:"${PATH}"
33+
2934
# Choose whether to install SpiderMonkey 1.8.5, default yes
3035
ARG js=js
3136
# Choose whether to install Erlang, default yes

dockerfiles/debian-buster

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ ENV JAVA_HOME=/opt/java/openjdk
2626
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
2727
ENV PATH="${JAVA_HOME}/bin:${PATH}"
2828

29+
# These are needed for the Clouseau integration
30+
ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8
31+
COPY --from=eclipse-temurin:8 /opt/java/openjdk $CLOUSEAU_JAVA_HOME
32+
ENV PATH=/usr/local/lib/erlang/bin:"${PATH}"
33+
2934
# Choose whether to install SpiderMonkey 1.8.5, default yes
3035
ARG js=js
3136
# Choose whether to install Erlang, default yes
@@ -54,6 +59,10 @@ RUN ERLANGVERSION=$erlangversion \
5459
NODEVERSION=$nodeversion \
5560
/root/couchdb-ci/bin/install-dependencies.sh $js $erlang
5661

62+
# This are needed for the Clouseau integration
63+
ENV CLOUSEAU_JAVA_HOME=/opt/java/clouseaujdk
64+
ENV PATH=/usr/local/lib/erlang/bin:${PATH}
65+
5766
# Allow Jenkins to sudo
5867
RUN echo "jenkins ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/jenkins
5968

dockerfiles/ubuntu-bionic

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ ENV JAVA_HOME=/opt/java/openjdk
2424
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
2525
ENV PATH="${JAVA_HOME}/bin:${PATH}"
2626

27+
# These are needed for the Clouseau integration
28+
ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8
29+
COPY --from=eclipse-temurin:8 /opt/java/openjdk $CLOUSEAU_JAVA_HOME
30+
ENV PATH=/usr/local/lib/erlang/bin:"${PATH}"
31+
2732
# Choose whether to install SpiderMonkey 1.8.5, default yes
2833
ARG js=js
2934
# Choose whether to install Erlang, default yes

dockerfiles/ubuntu-focal

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ ENV JAVA_HOME=/opt/java/openjdk
2424
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
2525
ENV PATH="${JAVA_HOME}/bin:${PATH}"
2626

27+
# These are needed for the Clouseau integration
28+
ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8
29+
COPY --from=eclipse-temurin:8 /opt/java/openjdk $CLOUSEAU_JAVA_HOME
30+
ENV PATH=/usr/local/lib/erlang/bin:"${PATH}"
31+
2732
# Choose whether to install SpiderMonkey 1.8.5, default yes
2833
ARG js=js
2934
# Choose whether to install Erlang, default yes

dockerfiles/ubuntu-jammy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ ENV JAVA_HOME=/opt/java/openjdk
2424
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
2525
ENV PATH="${JAVA_HOME}/bin:${PATH}"
2626

27+
# These are needed for the Clouseau integration
28+
ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8
29+
COPY --from=eclipse-temurin:8 /opt/java/openjdk $CLOUSEAU_JAVA_HOME
30+
ENV PATH=/usr/local/lib/erlang/bin:"${PATH}"
31+
2732
# Choose whether to install SpiderMonkey 1.8.5, default yes
2833
ARG js=js
2934
# Choose whether to install Erlang, default yes

0 commit comments

Comments
 (0)