mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.1.x'
Closes gh-16637
This commit is contained in:
commit
d182ee2246
@ -1,9 +1,8 @@
|
|||||||
FROM ubuntu:trusty-20160914
|
FROM ubuntu:trusty-20160914
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y software-properties-common && \
|
apt-get install -y software-properties-common curl && \
|
||||||
add-apt-repository ppa:webupd8team/java -y && \
|
mkdir -p /opt/openjdk && \
|
||||||
apt-get update && \
|
cd /opt/openjdk && \
|
||||||
echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
|
curl -L https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u202-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz | tar zx --strip-components=1
|
||||||
apt-get install -y oracle-java8-installer && \
|
ENV JAVA_HOME /opt/openjdk
|
||||||
apt-get install -y curl && \
|
ENV PATH $JAVA_HOME/bin:$PATH
|
||||||
apt-get clean
|
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
FROM ubuntu:xenial-20160914
|
FROM ubuntu:xenial-20160914
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y software-properties-common && \
|
apt-get install -y software-properties-common curl && \
|
||||||
add-apt-repository ppa:webupd8team/java -y && \
|
mkdir -p /opt/openjdk && \
|
||||||
apt-get update && \
|
cd /opt/openjdk && \
|
||||||
echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
|
curl -L https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u202-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz | tar zx --strip-components=1
|
||||||
apt-get install -y oracle-java8-installer && \
|
ENV JAVA_HOME /opt/openjdk
|
||||||
apt-get install -y curl && \
|
ENV PATH $JAVA_HOME/bin:$PATH
|
||||||
apt-get clean
|
|
||||||
|
Loading…
Reference in New Issue
Block a user