Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source 
Closes gh-16637
This commit is contained in:
Andy Wilkinson 2019-04-24 10:19:31 +01:00
commit d182ee2246
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile
View File

@ -1,9 +1,8 @@
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

13
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile
View File

@ -1,9 +1,8 @@
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