diff options
| author | Tom Rini <trini@konsulko.com> | 2025-04-10 09:15:05 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-04-10 11:06:50 -0600 |
| commit | 206ca97fac5bc638b04b712075d8bb4656d79395 (patch) | |
| tree | 611fc70b5e6d72aad38d455cfb997d7ec079a5ef | |
| parent | 970cd1319a7867f8dfe8f7644b9fa773ccce9149 (diff) | |
CI: Move to latest container images
- Bump up "Jammy" tag to jammy-20250404
- Include most recent changes to the Dockerfile itself
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | .azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | tools/docker/Dockerfile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 593e90c7f79..ac07d87cca1 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-20240911.1-28Jan2025 + ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20250404-10Apr2025 # 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 df793e50e03..e54bdd6c4be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,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-20240911.1-28Jan2025 +image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20250404-10Apr2025 # We run some tests in different order, to catch some failures quicker. stages: diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 182560e3ea2..a0fd174ff60 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-20240911.1 +FROM ubuntu:jammy-20250404 LABEL org.opencontainers.image.authors="Tom Rini <trini@konsulko.com>" LABEL org.opencontainers.image.description=" This image is for building U-Boot inside a container" |