Skip to content

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

Merge branch '2.1.x' 

Closes gh-16637
parents 86b5b226 ed857358
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 14 deletions
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile
View file @ d182ee22
FROM ubuntu:trusty-20160914 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 curl && \
add-apt-repository ppa:webupd8team/java -y && \ mkdir -p /opt/openjdk && \
apt-get update && \ cd /opt/openjdk && \
echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \ curl -L https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u202-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz | tar zx --strip-components=1
apt-get install -y oracle-java8-installer && \ ENV JAVA_HOME /opt/openjdk
apt-get install -y curl && \ ENV PATH $JAVA_HOME/bin:$PATH
apt-get clean
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile
View file @ d182ee22
FROM ubuntu:xenial-20160914 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 curl && \
add-apt-repository ppa:webupd8team/java -y && \ mkdir -p /opt/openjdk && \
apt-get update && \ cd /opt/openjdk && \
echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \ curl -L https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u202-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz | tar zx --strip-components=1
apt-get install -y oracle-java8-installer && \ ENV JAVA_HOME /opt/openjdk
apt-get install -y curl && \ ENV PATH $JAVA_HOME/bin:$PATH
apt-get clean
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