Skip to content

S
spring-boot
Commit 38dd7620 authored by Madhura Bhave's avatar Madhura Bhave
Browse files
Options

Merge branch '2.2.x'

parents c027487d d7c376ad
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
ci/images/spring-boot-ci-image/Dockerfile
View file @ 38dd7620
...@@ -2,8 +2,8 @@ FROM ubuntu:bionic-20200219 ...@@ -2,8 +2,8 @@ FROM ubuntu:bionic-20200219
ADD setup.sh /setup.sh ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh ADD get-jdk-url.sh /get-jdk-url.sh
RUN ./setup.sh java8
ADD get-docker-url.sh /get-docker-url.sh ADD get-docker-url.sh /get-docker-url.sh
RUN ./setup.sh java8
ENV JAVA_HOME /opt/openjdk ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH ENV PATH $JAVA_HOME/bin:$PATH
......
ci/images/spring-boot-jdk11-ci-image/Dockerfile
View file @ 38dd7620
...@@ -2,8 +2,8 @@ FROM ubuntu:bionic-20200219 ...@@ -2,8 +2,8 @@ FROM ubuntu:bionic-20200219
ADD setup.sh /setup.sh ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh ADD get-jdk-url.sh /get-jdk-url.sh
RUN ./setup.sh java11
ADD get-docker-url.sh /get-docker-url.sh ADD get-docker-url.sh /get-docker-url.sh
RUN ./setup.sh java11
ENV JAVA_HOME /opt/openjdk ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH ENV PATH $JAVA_HOME/bin:$PATH
......
ci/images/spring-boot-jdk14-ci-image/Dockerfile
View file @ 38dd7620
...@@ -2,8 +2,8 @@ FROM ubuntu:bionic-20200219 ...@@ -2,8 +2,8 @@ FROM ubuntu:bionic-20200219
ADD setup.sh /setup.sh ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh ADD get-jdk-url.sh /get-jdk-url.sh
RUN ./setup.sh java14
ADD get-docker-url.sh /get-docker-url.sh ADD get-docker-url.sh /get-docker-url.sh
RUN ./setup.sh java14
ENV JAVA_HOME /opt/openjdk ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH ENV PATH $JAVA_HOME/bin:$PATH
......
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