GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #6957 from Vedran Pavić 

* gh-6957:
  Update Docker images used by launch script integration tests
pull/7457/head
Andy Wilkinson 9 years ago
parent
617a8259b4 8bd2e69915
commit
af67decab6
4 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11-f5ac6bb5/Dockerfile
  2. 4
      spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.8-699d6ab3/Dockerfile
  3. 2
      spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile
  4. 2
      spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile

4
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
Unescape View File

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

4
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
Unescape View File

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

2
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
Unescape View File

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

2
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
Unescape View File

@ -1,4 +1,4 @@
FROM ubuntu:trusty-20160503.1 FROM ubuntu:xenial-20160914
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y software-properties-common && \ apt-get install -y software-properties-common && \
add-apt-repository ppa:webupd8team/java -y && \ add-apt-repository ppa:webupd8team/java -y && \
Write Preview
Loading…
Cancel
Save