From 8bd2e69915602a8b87bf18a3fe3ca641ed803b47 Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Tue, 20 Sep 2016 10:35:52 +0200 Subject: [PATCH] Update Docker images used by launch script integration tests --- .../conf/CentOS/{5.11-7f8a8084 => 5.11-f5ac6bb5}/Dockerfile | 4 ++-- .../conf/CentOS/{6.7-4f6d8f79 => 6.8-699d6ab3}/Dockerfile | 4 ++-- .../Ubuntu/{xenial-20160503 => trusty-20160914}/Dockerfile | 2 +- .../Ubuntu/{trusty-20160503.1 => xenial-20160914}/Dockerfile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/{5.11-7f8a8084 => 5.11-f5ac6bb5}/Dockerfile (80%) rename spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/{6.7-4f6d8f79 => 6.8-699d6ab3}/Dockerfile (80%) rename spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/{xenial-20160503 => trusty-20160914}/Dockerfile (93%) rename spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/{trusty-20160503.1 => xenial-20160914}/Dockerfile (92%) diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11-7f8a8084/Dockerfile b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11-f5ac6bb5/Dockerfile similarity index 80% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11-7f8a8084/Dockerfile rename to spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11-f5ac6bb5/Dockerfile index c5a3f33a0e1..2e3a8e9a31c 100644 --- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11-7f8a8084/Dockerfile +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11-f5ac6bb5/Dockerfile @@ -1,5 +1,5 @@ -# 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 && \ diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.7-4f6d8f79/Dockerfile b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.8-699d6ab3/Dockerfile similarity index 80% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.7-4f6d8f79/Dockerfile rename to spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.8-699d6ab3/Dockerfile index 0105fcf61bd..1c319721345 100644 --- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.7-4f6d8f79/Dockerfile +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.8-699d6ab3/Dockerfile @@ -1,5 +1,5 @@ -# 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 && \ diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160503/Dockerfile b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile similarity index 93% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160503/Dockerfile rename to spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile index a24e1ad41d3..41b96a8fcb8 100644 --- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160503/Dockerfile +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile @@ -1,4 +1,4 @@ -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 && \ diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160503.1/Dockerfile b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile similarity index 92% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160503.1/Dockerfile rename to spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile index e214d361810..93ac9d080cb 100644 --- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160503.1/Dockerfile +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile @@ -1,4 +1,4 @@ -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 && \