From 3891b242a38a2d64ad221487cc2385b4aa18208a Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Thu, 5 May 2016 09:33:28 +0200 Subject: [PATCH] Update launch script integration tests - Use the latest Docker image for Ubuntu 14.04 LTS based tests - Add Ubuntu 16.04 LTS based tests Closes gh-5868 --- .../resources/conf/Ubuntu/trusty-20160503.1/Dockerfile | 9 +++++++++ .../{trusty-20160317 => xenial-20160503}/Dockerfile | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160503.1/Dockerfile rename spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/{trusty-20160317 => xenial-20160503}/Dockerfile (73%) 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/trusty-20160503.1/Dockerfile new file mode 100644 index 0000000000..e214d36181 --- /dev/null +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160503.1/Dockerfile @@ -0,0 +1,9 @@ +FROM ubuntu:trusty-20160503.1 +RUN apt-get update && \ + apt-get install -y software-properties-common && \ + add-apt-repository ppa:webupd8team/java -y && \ + apt-get update && \ + echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \ + apt-get install -y oracle-java8-installer && \ + apt-get install -y curl && \ + apt-get clean diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160317/Dockerfile b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160503/Dockerfile similarity index 73% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160317/Dockerfile rename to spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160503/Dockerfile index f1bdb04e9b..a24e1ad41d 100644 --- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160317/Dockerfile +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160503/Dockerfile @@ -1,5 +1,6 @@ -FROM ubuntu:trusty-20160317 -RUN apt-get install -y software-properties-common && \ +FROM ubuntu:xenial-20160503 +RUN apt-get update && \ + apt-get install -y software-properties-common && \ add-apt-repository ppa:webupd8team/java -y && \ apt-get update && \ echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \