Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
56a8125e
Commit
56a8125e
authored
Sep 25, 2020
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade docker images to Ubuntu Focal
Closes gh-23492
parent
abe169d5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
Dockerfile
ci/images/ci-image-jdk11/Dockerfile
+1
-1
Dockerfile
ci/images/ci-image/Dockerfile
+1
-1
setup.sh
ci/images/setup.sh
+4
-1
detect-ubuntu-image-updates.sh
ci/scripts/detect-ubuntu-image-updates.sh
+1
-1
No files found.
ci/images/ci-image-jdk11/Dockerfile
View file @
56a8125e
FROM
ubuntu:
bionic-20200903
FROM
ubuntu:
focal-20200916
ADD
setup.sh /setup.sh
ADD
get-jdk-url.sh /get-jdk-url.sh
...
...
ci/images/ci-image/Dockerfile
View file @
56a8125e
FROM
ubuntu:
bionic-20200903
FROM
ubuntu:
focal-20200916
ADD
setup.sh /setup.sh
ADD
get-jdk-url.sh /get-jdk-url.sh
...
...
ci/images/setup.sh
View file @
56a8125e
...
...
@@ -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
...
...
ci/scripts/detect-ubuntu-image-updates.sh
View file @
56a8125e
...
...
@@ -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]}'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment