Merge branch '2.2.x'

This commit is contained in:
Madhura Bhave 2020-04-03 10:11:29 -07:00
commit c027487d72
4 changed files with 4 additions and 2 deletions

View File

@ -27,9 +27,8 @@ test -f /opt/openjdk/bin/javac
###########################################################
# DOCKER
###########################################################
DOCKER_URL=$( ./get-docker-url.sh )
cd /
DOCKER_URL=$( ./get-docker-url.sh )
curl -L ${DOCKER_URL} | tar zx
mv /docker/* /bin/
chmod +x /bin/docker*

View File

@ -3,6 +3,7 @@ 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
ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH

View File

@ -3,6 +3,7 @@ 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
ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH

View File

@ -3,6 +3,7 @@ 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
ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH