root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Upgrade docker images to Ubuntu Focal 

Closes gh-23492
This commit is contained in:
Phillip Webb 2020-09-25 12:38:44 -07:00
parent abe169d593
commit 56a8125eee
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/images/ci-image-jdk11/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic-20200903 FROM ubuntu:focal-20200916
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

2
ci/images/ci-image/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic-20200903 FROM ubuntu:focal-20200916
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

5
ci/images/setup.sh
View File

@ -5,8 +5,11 @@ set -ex
# UTILS # UTILS
########################################################### ###########################################################
export DEBIAN_FRONTEND=noninteractive
apt-get update apt-get update
apt-get install --no-install-recommends -y ca-certificates net-tools libxml2-utils git curl libudev1 libxml2-utils iptables iproute2 jq apt-get install --no-install-recommends -y tzdata ca-certificates net-tools libxml2-utils git curl libudev1 libxml2-utils iptables iproute2 jq
ln -fs /usr/share/zoneinfo/UTC /etc/localtime
dpkg-reconfigure --frontend noninteractive tzdata
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.2/concourse-java.sh > /opt/concourse-java.sh curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.2/concourse-java.sh > /opt/concourse-java.sh

2
ci/scripts/detect-ubuntu-image-updates.sh
View File

@ -2,7 +2,7 @@
ISSUE_TITLE="Upgrade Ubuntu version in CI images" ISSUE_TITLE="Upgrade Ubuntu version in CI images"
ubuntu="bionic" ubuntu="focal"
latest=$( curl -s "https://hub.docker.com/v2/repositories/library/ubuntu/tags/?page_size=1&page=1&name=$ubuntu" | jq -c -r '.results[0].name' | awk '{split($0, parts, "-"); print parts[2]}' ) latest=$( curl -s "https://hub.docker.com/v2/repositories/library/ubuntu/tags/?page_size=1&page=1&name=$ubuntu" | jq -c -r '.results[0].name' | awk '{split($0, parts, "-"); print parts[2]}' )
current=$( grep "ubuntu:$ubuntu" git-repo/ci/images/spring-boot-ci-image/Dockerfile | awk '{split($0, parts, "-"); print parts[2]}' ) current=$( grep "ubuntu:$ubuntu" git-repo/ci/images/spring-boot-ci-image/Dockerfile | awk '{split($0, parts, "-"); print parts[2]}' )