From 99cffa233c730a432ae157742840b8877a5a9c90 Mon Sep 17 00:00:00 2001 From: Tom Rini <trini@konsulko.com> Date: Sat, 13 Nov 2021 18:37:00 -0500 Subject: [PATCH] Dockerfile, CI: Update to latest "focal" tag Signed-off-by: Tom Rini <trini@konsulko.com> --- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- tools/docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 41b34ea7de..8801ff7d81 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 e7c65ebbce..4c89daeadc 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 79b7e1d0fb..fb422e7588 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" -- 2.39.5