Skip to content

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

Merge branch '1.5.x'

parents 2913ea97 af67deca
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11-7f8a8084/Dockerfile → spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11-f5ac6bb5/Dockerfile
View file @ 50c19250
# CentOS 5.11 from 22/03/2016
FROM centos@sha256:7f8a808416f712da6931ac65e4308fede7fe86bcf15364b6f63af88840fe6131
# CentOS 5.11 from 30/08/2016
FROM centos@sha256:f5ac6bb54c5042387c79c83fca93eff7b721da54ab995fd64a20b23f6785465d
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/6.7-4f6d8f79/Dockerfile → spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.8-699d6ab3/Dockerfile
View file @ 50c19250
# CentOS 6.7 from 22/03/2016
FROM centos@sha256:4f6d8f794af3574eca603b965fc0b63fdf852be29c17d3ab4cad7ec2272b82bd
# CentOS 6.8 from 30/08/2016
FROM centos@sha256:699d6ab3b404f286b5f5e88415e05668b7af39413d2941aa2bdf1a843b77e9ed
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/xenial-20160503/Dockerfile → spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile
View file @ 50c19250
FROM ubuntu:xenial-20160503
FROM ubuntu:trusty-20160914
RUN apt-get update && \
apt-get install -y software-properties-common && \
add-apt-repository ppa:webupd8team/java -y && \
......
spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160503.1/Dockerfile → spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile
View file @ 50c19250
FROM ubuntu:trusty-20160503.1
FROM ubuntu:xenial-20160914
RUN apt-get update && \
apt-get install -y software-properties-common && \
add-apt-repository ppa:webupd8team/java -y && \
......
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