mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.1.x' into 2.2.x
This commit is contained in:
commit
2b862d2409
@ -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*
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user