aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-11-13 18:37:00 -0500
committerTom Rini <trini@konsulko.com>2021-11-14 10:30:48 -0500
commit99cffa233c730a432ae157742840b8877a5a9c90 (patch)
tree52ce7834c5ac62b3d8f95573c95a56cf4e8979e5
parent8a87d1ae95853b2febd2e2631ddeef856c029b5c (diff)
downloadu-boot-99cffa233c730a432ae157742840b8877a5a9c90.zip
u-boot-99cffa233c730a432ae157742840b8877a5a9c90.tar.gz
u-boot-99cffa233c730a432ae157742840b8877a5a9c90.tar.bz2
Dockerfile, CI: Update to latest "focal" tagWIP/14Nov2021
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 41b34ea..8801ff7 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -2,7 +2,7 @@ variables:
windows_vm: windows-2019
ubuntu_vm: ubuntu-18.04
macos_vm: macOS-10.15
- ci_runner_image: trini/u-boot-gitlab-ci-runner:focal-20210921-05Oct2021
+ ci_runner_image: trini/u-boot-gitlab-ci-runner:focal-20211006-14Nov2021
# 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 e7c65eb..4c89dae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
# Grab our configured image. The source for this is found at:
# https://source.denx.de/u-boot/gitlab-ci-runner
-image: trini/u-boot-gitlab-ci-runner:focal-20210921-05Oct2021
+image: trini/u-boot-gitlab-ci-runner:focal-20211006-14Nov2021
# We run some tests in different order, to catch some failures quicker.
stages:
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 79b7e1d..fb422e7 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:focal-20210921
+FROM ubuntu:focal-20211006
MAINTAINER Tom Rini <trini@konsulko.com>
LABEL Description=" This image is for building U-Boot inside a container"