From 9e287ef61137493a6bd8cce7403f9ac79d1ef7aa Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Sun, 13 Mar 2016 13:39:58 +0100 Subject: [PATCH] Improve repeatability of launch script tests Previously, tags were used for CentOS and Ubuntu images that may change over time. This commit updates the Dockerfiles to use fixed base images. For Ubuntu, a fixed tag is available. For CentOS we have to resort to using the digest. Closes gh-5397 --- .../resources/conf/CentOS/{6.7 => 5.11-7f8a8084}/Dockerfile | 3 ++- .../resources/conf/CentOS/{5.11 => 6.7-4f6d8f79}/Dockerfile | 3 ++- .../conf/Ubuntu/{14.04.3 => trusty-20160317}/Dockerfile | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/{6.7 => 5.11-7f8a8084}/Dockerfile (80%) rename spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/{5.11 => 6.7-4f6d8f79}/Dockerfile (80%) rename spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/{14.04.3 => trusty-20160317}/Dockerfile (92%) diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.7/Dockerfile b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11-7f8a8084/Dockerfile similarity index 80% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.7/Dockerfile rename to spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11-7f8a8084/Dockerfile index 919ab0f991..c5a3f33a0e 100644 --- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.7/Dockerfile +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11-7f8a8084/Dockerfile @@ -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 && \ diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11/Dockerfile b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.7-4f6d8f79/Dockerfile similarity index 80% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11/Dockerfile rename to spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.7-4f6d8f79/Dockerfile index e5b17b24ec..0105fcf61b 100644 --- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/5.11/Dockerfile +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.7-4f6d8f79/Dockerfile @@ -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 && \ diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/14.04.3/Dockerfile b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160317/Dockerfile similarity index 92% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/14.04.3/Dockerfile rename to spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160317/Dockerfile index 935cd05dd2..f1bdb04e9b 100644 --- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/14.04.3/Dockerfile +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160317/Dockerfile @@ -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 && \