Merge branch '2.1.x' into 2.2.x

This commit is contained in:
Madhura Bhave 2020-04-03 12:27:26 -07:00
commit d7c376adf6
3 changed files with 3 additions and 3 deletions

View File

@ -2,8 +2,8 @@ FROM ubuntu:bionic-20200219
ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh
RUN ./setup.sh java8
ADD get-docker-url.sh /get-docker-url.sh
RUN ./setup.sh java8
ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH

View File

@ -2,8 +2,8 @@ FROM ubuntu:bionic-20200219
ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh
RUN ./setup.sh java11
ADD get-docker-url.sh /get-docker-url.sh
RUN ./setup.sh java11
ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH

View File

@ -2,8 +2,8 @@ FROM ubuntu:bionic-20200219
ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh
RUN ./setup.sh java14
ADD get-docker-url.sh /get-docker-url.sh
RUN ./setup.sh java14
ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH