CI/Docker: Update to jammy-20221130 tag

Update to the latest "jammy" tag. This requires us to list libc6-i386 as
a required package to install (for nokia_rx51 tests) that was previously
implicit.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 02cd8e4169148800f9d235f7dddf7ef7d44b71f7..5fe3b8751dc2fb5238af4c46bd45c50d1155f055 100644 (file)
--- 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-20221101-22Nov2022
+  ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20221130-11Jan2023
   # 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 afd83948c1afc6972c65e7e947f5ea7e804f9b83..8d981a388a80dff46af89d237d21a5456d71e404 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
 
 # Grab our configured image.  The source for this is found
 # in the u-boot tree at tools/docker/Dockerfile
-image: trini/u-boot-gitlab-ci-runner:jammy-20221101-22Nov2022
+image: trini/u-boot-gitlab-ci-runner:jammy-20221130-11Jan2023
 
 # We run some tests in different order, to catch some failures quicker.
 stages:

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index c92eeb51fd5fe8d9317dbd132c4671ec89e85f89..202a8145af77405aa09178ce65b200560516aad6 100644 (file)
--- 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-20221101
+FROM ubuntu:jammy-20221130
 MAINTAINER Tom Rini <trini@konsulko.com>
 LABEL Description=" This image is for building U-Boot inside a container"
 
@@ -64,6 +64,7 @@ RUN apt-get update && apt-get install -y \
        iasl \
        imagemagick \
        iputils-ping \
+       libc6-i386 \
        libconfuse-dev \
        libgit2-dev \
        libjson-glib-dev \