Skip to content

S
spring-boot
Commit ec032b37 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge branch '2.2.x' into 2.3.x 

Closes gh-23941
parents 05f0022f 719d71e3
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
ci/images/ci-image-jdk11/Dockerfile
View file @ ec032b37
FROM ubuntu:focal-20200925 FROM ubuntu:focal-20201008
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 @ ec032b37
FROM ubuntu:focal-20200925 FROM ubuntu:focal-20201008
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 @ ec032b37
FROM ubuntu:focal-20200925 FROM ubuntu:focal-20201008
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