CASSANDRA-15835 Update Docker image w/ JAVA8_HOME via ENV
diff --git a/docker/testing/ubuntu1810_j11.docker b/docker/testing/ubuntu1810_j11.docker
index 835d2ad..58fea47 100644
--- a/docker/testing/ubuntu1810_j11.docker
+++ b/docker/testing/ubuntu1810_j11.docker
@@ -80,6 +80,11 @@
echo 'export JAVA11_HOME=/usr/lib/jvm/java-11-openjdk-amd64' >> /home/cassandra/.bashrc && \
echo 'export JAVA_HOME=$JAVA8_HOME' >> /home/cassandra/.bashrc
+ENV ANT_HOME=/usr/share/ant \
+ JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 \
+ JAVA8_HOME=/usr/lib/jvm/java-8-openjdk-amd64 \
+ JAVA11_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+
# run pip commands and setup virtualenv (note we do this after we switch to cassandra user so we
# setup the virtualenv for the cassandra user and not the root user by accident)
RUN virtualenv --python=python3.6 --no-site-packages env
diff --git a/docker/testing/ubuntu18_j11.docker b/docker/testing/ubuntu18_j11.docker
index 7e92c0f..3e6fe6b 100644
--- a/docker/testing/ubuntu18_j11.docker
+++ b/docker/testing/ubuntu18_j11.docker
@@ -80,6 +80,11 @@
echo 'export JAVA11_HOME=/usr/lib/jvm/java-11-openjdk-amd64' >> /home/cassandra/.bashrc && \
echo 'export JAVA_HOME=$JAVA8_HOME' >> /home/cassandra/.bashrc
+ENV ANT_HOME=/usr/share/ant \
+ JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 \
+ JAVA8_HOME=/usr/lib/jvm/java-8-openjdk-amd64 \
+ JAVA11_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+
# run pip commands and setup virtualenv (note we do this after we switch to cassandra user so we
# setup the virtualenv for the cassandra user and not the root user by accident)
RUN virtualenv --python=python3.6 --no-site-packages env
diff --git a/docker/testing/ubuntu1910_j11.docker b/docker/testing/ubuntu1910_j11.docker
index 38f60bb..70dd44b 100644
--- a/docker/testing/ubuntu1910_j11.docker
+++ b/docker/testing/ubuntu1910_j11.docker
@@ -92,6 +92,11 @@
echo 'export JAVA11_HOME=/usr/lib/jvm/java-11-openjdk-amd64' >> /home/cassandra/.bashrc && \
echo 'export JAVA_HOME=$JAVA8_HOME' >> /home/cassandra/.bashrc
+ENV ANT_HOME=/usr/share/ant \
+ JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 \
+ JAVA8_HOME=/usr/lib/jvm/java-8-openjdk-amd64 \
+ JAVA11_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+
# run pip commands and setup virtualenv (note we do this after we switch to cassandra user so we
# setup the virtualenv for the cassandra user and not the root user by accident) for Python 3.6/3.7/3.8
RUN virtualenv --python=python3.6 env3.6
