This is an automated email from the ASF dual-hosted git repository. snazy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/master by this push: new 45dc010 CASSANDRA-15835 Update Docker image w/ JAVA8_HOME via ENV 45dc010 is described below commit 45dc010227d75bf05e34617729de5389e62f8f99 Author: Robert Stupp <sn...@snazy.de> AuthorDate: Tue Jun 2 12:43:30 2020 +0200 CASSANDRA-15835 Update Docker image w/ JAVA8_HOME via ENV --- docker/testing/ubuntu1810_j11.docker | 5 +++++ docker/testing/ubuntu18_j11.docker | 5 +++++ docker/testing/ubuntu1910_j11.docker | 5 +++++ 3 files changed, 15 insertions(+) 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 @@ RUN echo 'export ANT_HOME=/usr/share/ant' >> /home/cassandra/.bashrc && \ 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 @@ RUN echo 'export ANT_HOME=/usr/share/ant' >> /home/cassandra/.bashrc && \ 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 @@ RUN echo 'export ANT_HOME=/usr/share/ant' >> /home/cassandra/.bashrc && \ 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 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org