From 56a8125eee4870beb0fd69263b57e039b7c13d3d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 25 Sep 2020 12:38:44 -0700 Subject: [PATCH] Upgrade docker images to Ubuntu Focal Closes gh-23492 --- ci/images/ci-image-jdk11/Dockerfile | 2 +- ci/images/ci-image/Dockerfile | 2 +- ci/images/setup.sh | 5 ++++- ci/scripts/detect-ubuntu-image-updates.sh | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ci/images/ci-image-jdk11/Dockerfile b/ci/images/ci-image-jdk11/Dockerfile index 41f9a8568d..1c574f34f2 100644 --- a/ci/images/ci-image-jdk11/Dockerfile +++ b/ci/images/ci-image-jdk11/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:bionic-20200903 +FROM ubuntu:focal-20200916 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile index 0792027d07..90852c0617 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:bionic-20200903 +FROM ubuntu:focal-20200916 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/setup.sh b/ci/images/setup.sh index e8726b1e76..58fc4a16cb 100755 --- a/ci/images/setup.sh +++ b/ci/images/setup.sh @@ -5,8 +5,11 @@ set -ex # UTILS ########################################################### +export DEBIAN_FRONTEND=noninteractive 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/* curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.2/concourse-java.sh > /opt/concourse-java.sh diff --git a/ci/scripts/detect-ubuntu-image-updates.sh b/ci/scripts/detect-ubuntu-image-updates.sh index d45e3a682f..0d67a7b756 100755 --- a/ci/scripts/detect-ubuntu-image-updates.sh +++ b/ci/scripts/detect-ubuntu-image-updates.sh @@ -2,7 +2,7 @@ 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]}' ) current=$( grep "ubuntu:$ubuntu" git-repo/ci/images/spring-boot-ci-image/Dockerfile | awk '{split($0, parts, "-"); print parts[2]}' )