root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

This commit is contained in:
Andy Wilkinson 2016-05-09 11:51:57 +01:00
parent 1d6b1d7d57 3891b242a3
commit 5d2177038f
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml
View File

@ -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>

9
spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160503.1/Dockerfile Normal file
View File

@ -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

5
spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160317/Dockerfile → spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160503/Dockerfile
View File

@ -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 && \