Skip to content

S
spring-boot
Commit f1f50667 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.3.x'

parents 1d4e52cc d6ad4dcc
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
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 @ f1f50667
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 && \
......
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 @ f1f50667
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 && \
......
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 @ f1f50667
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 && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment