Skip to content

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

Merge branch '2.1.x' into 2.2.x 

Closes gh-22655
parents 9b6c9797 ac732773
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
ci/images/spring-boot-ci-image/Dockerfile
View file @ e1617185
FROM ubuntu:bionic-20200630
FROM ubuntu:bionic-20200713
ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh
......
ci/images/spring-boot-jdk11-ci-image/Dockerfile
View file @ e1617185
FROM ubuntu:bionic-20200630
FROM ubuntu:bionic-20200713
ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh
......
ci/images/spring-boot-jdk14-ci-image/Dockerfile
View file @ e1617185
FROM ubuntu:bionic-20200630
FROM ubuntu:bionic-20200713
ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh
......
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