diff mbox series

gitlab-ci.yml: opensbi: Move to Ubuntu 22.04

Message ID 20230222154938.9201-1-palmer@rivosinc.com
State New
Headers show
Series gitlab-ci.yml: opensbi: Move to Ubuntu 22.04 | expand

Commit Message

Palmer Dabbelt Feb. 22, 2023, 3:49 p.m. UTC 
It looks like the Ubuntu 18.04 Docker images are tripping up our CI with

    $ docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --tag $IMAGE_TAG .gitlab-ci.d/opensbi
    Step 1/7 : FROM ubuntu:18.04
    18.04: Pulling from library/ubuntu
    mediaType in manifest should be 'application/vnd.docker.distribution.manifest.v2+json' not 'application/vnd.oci.image.manifest.v1+json'

Since 18.04 hits EOL at the end of April (a few months), let's just move
to 22.04 now.

Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
---
I don't even know how to test this, as I've not touched the CI yet.  The
hope is that it fixes the failures in
<https://gitlab.com/qemu-project/qemu/-/jobs/3808319659>.
---
 .gitlab-ci.d/opensbi/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/.gitlab-ci.d/opensbi/Dockerfile b/.gitlab-ci.d/opensbi/Dockerfile
index 4ba8a4de86..2fbc9a9ee7 100644
--- a/.gitlab-ci.d/opensbi/Dockerfile
+++ b/.gitlab-ci.d/opensbi/Dockerfile
@@ -1,7 +1,7 @@ 
 #
 # Docker image to cross-compile OpenSBI firmware binaries
 #
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 MAINTAINER Bin Meng <bmeng.cn@gmail.com>