summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2025-11-26 10:30:24 -0600
committerTom Rini <[email protected]>2025-11-26 10:30:24 -0600
commit0ae3dc6809ffb6568b5e46d9022829e36d473d36 (patch)
treefbacae08d7b735181090807651a15b18bba88d37
parent4dfa4c14b8e5b37885f9eb281b3bc230938c5972 (diff)
CI: Update to latest container
- Move to jammy-20251013 tag - Bring in tkinter so that FATtools should run and more tests should be run. - Update to QEMU 10.0.6 - Pick tags for (most of) trace-cmd Signed-off-by: Tom Rini <[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 3f671dd078d..0c7c38ba730 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-20251001-04Nov2025
+ ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20251013-26Nov2025
# Ensure we do a shallow clone
Agent.Source.Git.ShallowFetchDepth: 1
# Add '-u 0' options for Azure pipelines, otherwise we get "permission
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86d3c741ea1..e7234e003ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,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-20251001-04Nov2025
+image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20251013-26Nov2025
# We run some tests in different order, to catch some failures quicker.
stages:
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 960e4a7177f..8ab1cff5584 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-20251001
+FROM ubuntu:jammy-20251013
LABEL org.opencontainers.image.authors="Tom Rini <[email protected]>"
LABEL org.opencontainers.image.description=" This image is for building U-Boot inside a container"