Skip to content

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

Merge branch '2.3.x' into 2.4.x 

Closes gh-25592
parents ddf072e2 3f241b6b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
ci/images/ci-image-jdk11/Dockerfile
View file @ 718e08cf
FROM ubuntu:focal-20210119 FROM ubuntu:focal-20210217
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/ci-image-jdk15/Dockerfile
View file @ 718e08cf
FROM ubuntu:focal-20210119 FROM ubuntu:focal-20210217
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/ci-image-jdk16/Dockerfile
View file @ 718e08cf
FROM ubuntu:focal-20210119 FROM ubuntu:focal-20210217
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/ci-image/Dockerfile
View file @ 718e08cf
FROM ubuntu:focal-20210119 FROM ubuntu:focal-20210217
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