From cd59d44cfd5daebaab4b01a0a5f2931f9e4ed834 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 3 Feb 2022 08:38:34 -0500 Subject: [PATCH] Dockfile, CI: Update to latest focal tag and build - Latest focal tag - Add libgnutls to image Signed-off-by: Tom Rini --- .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 f2aa332be5..81ab77e134 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-20220105-10Jan2022 + ci_runner_image: trini/u-boot-gitlab-ci-runner:focal-20220113-03Feb2022 # 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 75ad67fab0..85b5296634 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-20220105-10Jan2022 +image: trini/u-boot-gitlab-ci-runner:focal-20220113-03Feb2022 # We run some tests in different order, to catch some failures quicker. stages: diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 141260cce1..7a3f5cbade 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-20220105 +FROM ubuntu:focal-20220113 MAINTAINER Tom Rini LABEL Description=" This image is for building U-Boot inside a container" -- 2.39.5