Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

Browse Source
This commit is contained in:
Andy Wilkinson 2016-04-06 13:29:01 +01:00
commit f1f5066786
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.7/Dockerfile → spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11-7f8a8084/Dockerfile
View File

@ -1,4 +1,5 @@
FROM centos:6.7
# CentOS 5.11 from 22/03/2016
FROM centos@sha256:7f8a808416f712da6931ac65e4308fede7fe86bcf15364b6f63af88840fe6131
RUN yum install -y wget && \
yum install -y system-config-services && \
yum install -y curl && \

3
spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11/Dockerfile → spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.7-4f6d8f79/Dockerfile
View File

@ -1,4 +1,5 @@
FROM centos:5.11
# CentOS 6.7 from 22/03/2016
FROM centos@sha256:4f6d8f794af3574eca603b965fc0b63fdf852be29c17d3ab4cad7ec2272b82bd
RUN yum install -y wget && \
yum install -y system-config-services && \
yum install -y curl && \

2
spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/14.04.3/Dockerfile → spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160317/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:14.04.3
FROM ubuntu:trusty-20160317
RUN apt-get install -y software-properties-common && \
add-apt-repository ppa:webupd8team/java -y && \
apt-get update && \