summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2024-12-08 11:07:32 -0600
committerTom Rini <[email protected]>2024-12-21 12:27:46 -0600
commitb0f5ae8e5eee0c651cb937bbee131d68a5a95deb (patch)
treef4e6f1ef4b0f2f28815505b130e9c0440216a889
parente82922ae119d7d3f337081524cfad936db8d36f8 (diff)
docker: Update to latest "Jammy" tag
Bring us up to the current Ubuntu "Jammy" tag. Signed-off-by: Tom Rini <[email protected]> Reviewed-by: Simon Glass <[email protected]>
-rw-r--r--.azure-pipelines.yml2
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--tools/docker/Dockerfile2
3 files changed, 3 insertions, 3 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index c577a724c82..df3f82074af 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -2,7 +2,7 @@ variables:
windows_vm: windows-2022
ubuntu_vm: ubuntu-24.04
macos_vm: macOS-14
- ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20240808-03Dec2024
+ ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20240911.1-08Dec2024
# Add '-u 0' options for Azure pipelines, otherwise we get "permission
# denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer",
# since our $(ci_runner_image) user is not root.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 696d3cb1bd7..a7bae035319 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ workflow:
# Grab our configured image. The source for this is found
# in the u-boot tree at tools/docker/Dockerfile
-image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20240808-03Dec2024
+image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20240911.1-08Dec2024
# We run some tests in different order, to catch some failures quicker.
stages:
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 348605a2b6a..d2848ab85f3 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -2,7 +2,7 @@
# This Dockerfile is used to build an image containing basic stuff to be used
# to build U-Boot and run our test suites.
-FROM ubuntu:jammy-20240808
+FROM ubuntu:jammy-20240911.1
LABEL org.opencontainers.image.authors="Tom Rini <[email protected]>"
LABEL org.opencontainers.image.description=" This image is for building U-Boot inside a container"