Skip to content

S
spring-boot
Commit 487329fa authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '2.1.x' into 2.2.x 

Closes gh-21260
parents 9e0f7ad2 e54b7d07
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
ci/images/spring-boot-ci-image/Dockerfile
View file @ 487329fa
FROM ubuntu:bionic-20200311 FROM ubuntu:bionic-20200403
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
......
ci/images/spring-boot-jdk11-ci-image/Dockerfile
View file @ 487329fa
FROM ubuntu:bionic-20200311 FROM ubuntu:bionic-20200403
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
......
ci/images/spring-boot-jdk14-ci-image/Dockerfile
View file @ 487329fa
FROM ubuntu:bionic-20200311 FROM ubuntu:bionic-20200403
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
......
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