Skip to content

Commit 56a8125

Browse files
committed
Upgrade docker images to Ubuntu Focal
Closes gh-23492
1 parent abe169d commit 56a8125

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

ci/images/ci-image-jdk11/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:bionic-20200903
1+
FROM ubuntu:focal-20200916
22

33
ADD setup.sh /setup.sh
44
ADD get-jdk-url.sh /get-jdk-url.sh

ci/images/ci-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:bionic-20200903
1+
FROM ubuntu:focal-20200916
22

33
ADD setup.sh /setup.sh
44
ADD get-jdk-url.sh /get-jdk-url.sh

ci/images/setup.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ set -ex
55
# UTILS
66
###########################################################
77

8+
export DEBIAN_FRONTEND=noninteractive
89
apt-get update
9-
apt-get install --no-install-recommends -y ca-certificates net-tools libxml2-utils git curl libudev1 libxml2-utils iptables iproute2 jq
10+
apt-get install --no-install-recommends -y tzdata ca-certificates net-tools libxml2-utils git curl libudev1 libxml2-utils iptables iproute2 jq
11+
ln -fs /usr/share/zoneinfo/UTC /etc/localtime
12+
dpkg-reconfigure --frontend noninteractive tzdata
1013
rm -rf /var/lib/apt/lists/*
1114

1215
curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.2/concourse-java.sh > /opt/concourse-java.sh

ci/scripts/detect-ubuntu-image-updates.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
ISSUE_TITLE="Upgrade Ubuntu version in CI images"
44

5-
ubuntu="bionic"
5+
ubuntu="focal"
66
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]}' )
77
current=$( grep "ubuntu:$ubuntu" git-repo/ci/images/spring-boot-ci-image/Dockerfile | awk '{split($0, parts, "-"); print parts[2]}' )
88

0 commit comments

Comments
 (0)