mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '1.3.x'
This commit is contained in:
commit
5d2177038f
@ -36,7 +36,7 @@
|
||||
<dependency>
|
||||
<groupId>com.github.docker-java</groupId>
|
||||
<artifactId>docker-java</artifactId>
|
||||
<version>2.2.2</version>
|
||||
<version>2.2.3</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
@ -0,0 +1,9 @@
|
||||
FROM ubuntu:trusty-20160503.1
|
||||
RUN apt-get update && \
|
||||
apt-get install -y software-properties-common && \
|
||||
add-apt-repository ppa:webupd8team/java -y && \
|
||||
apt-get update && \
|
||||
echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
|
||||
apt-get install -y oracle-java8-installer && \
|
||||
apt-get install -y curl && \
|
||||
apt-get clean
|
@ -1,5 +1,6 @@
|
||||
FROM ubuntu:trusty-20160317
|
||||
RUN apt-get install -y software-properties-common && \
|
||||
FROM ubuntu:xenial-20160503
|
||||
RUN apt-get update && \
|
||||
apt-get install -y software-properties-common && \
|
||||
add-apt-repository ppa:webupd8team/java -y && \
|
||||
apt-get update && \
|
||||
echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
|
Loading…
Reference in New Issue
Block a user