This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/trunk by this push:
new cbdad2c Add JDK 17 to the testing images patch by Ekaterina
Dimitrova; reviewed by Michael Semb Wever and Brandon Williams for
CASSANDRA-17854
cbdad2c is described below
commit cbdad2c546d4f6dc8ab9321a4c05be75311498c3
Author: Ekaterina Dimitrova <[email protected]>
AuthorDate: Wed Aug 24 11:08:24 2022 -0400
Add JDK 17 to the testing images
patch by Ekaterina Dimitrova; reviewed by Michael Semb Wever and Brandon
Williams for CASSANDRA-17854
---
docker/testing/ubuntu2004_j11.docker | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/docker/testing/ubuntu2004_j11.docker
b/docker/testing/ubuntu2004_j11.docker
index 38bb63a..e572a68 100644
--- a/docker/testing/ubuntu2004_j11.docker
+++ b/docker/testing/ubuntu2004_j11.docker
@@ -79,7 +79,7 @@ RUN pip3 install --upgrade wheel
# openjdk + ant
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
- apt-get install -y --no-install-recommends openjdk-8-jdk openjdk-11-jdk
ant ant-optional
+ apt-get install -y --no-install-recommends openjdk-8-jdk openjdk-11-jdk
openjdk-17-jdk ant ant-optional
# make Java 8 the default executable (we use to run all tests against Java 8)
RUN update-java-alternatives --set java-1.8.0-openjdk-$(dpkg
--print-architecture)
@@ -108,6 +108,7 @@ WORKDIR /home/cassandra
RUN echo 'export ANT_HOME=/usr/share/ant' >> /home/cassandra/.bashrc && \
echo 'export JAVA8_HOME=/usr/lib/jvm/java-8-openjdk-$(dpkg
--print-architecture)' >> /home/cassandra/.bashrc && \
echo 'export JAVA11_HOME=/usr/lib/jvm/java-11-openjdk-$(dpkg
--print-architecture)' >> /home/cassandra/.bashrc && \
+ echo 'export JAVA17_HOME=/usr/lib/jvm/java-17-openjdk-$(dpkg
--print-architecture)' >> /home/cassandra/.bashrc && \
echo 'export JAVA_HOME=$JAVA8_HOME' >> /home/cassandra/.bashrc
ENV ANT_HOME=/usr/share/ant
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
