aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-02-12 19:07:36 -0500
committerTom Rini <trini@konsulko.com>2024-02-12 21:14:35 -0500
commit5cfe584a2ad91752650982154370006c58638fbf (patch)
tree0c68f61bd383242ad03c8df1b074ec3d33ce112c
parentc44002cacc818ccc65cb4b53ccfa0c2213962669 (diff)
downloadu-boot-WIP/12Feb2024.zip
u-boot-WIP/12Feb2024.tar.gz
u-boot-WIP/12Feb2024.tar.bz2
CI: Move to latest container imageWIP/12Feb2024
This moves us to our latest container image, which is now based on the current "Jammy" tag. Signed-off-by: Tom Rini <trini@konsulko.com>
-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 31e0dc0..d1ae522 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -2,7 +2,7 @@ variables:
windows_vm: windows-2019
ubuntu_vm: ubuntu-22.04
macos_vm: macOS-12
- ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20240111-17Jan2024
+ ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20240125-12Feb2024
# 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 b57bb85..6a1df16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ default:
# 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-20240111-17Jan2024
+image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20240125-12Feb2024
# We run some tests in different order, to catch some failures quicker.
stages:
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 3d04465..2742554 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-20240111
+FROM ubuntu:jammy-20240125
MAINTAINER Tom Rini <trini@konsulko.com>
LABEL Description=" This image is for building U-Boot inside a container"