[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stable-7.2.12 02/19] gitlab/opensbi: Move to docker:stable
From: |
Michael Tokarev |
Subject: |
[Stable-7.2.12 02/19] gitlab/opensbi: Move to docker:stable |
Date: |
Mon, 27 May 2024 09:40:33 +0300 |
From: Palmer Dabbelt <palmer@rivosinc.com>
The OpenSBI build has been using docker:19.03.1, which appears to be old
enough that v2 of the manifest is no longer supported. Something has
started serving us those manifests, resulting in errors along the lines
of
$ 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'
This moves to docker:stable, as was suggested by the template. It also
adds the python3 package via apt, as OpenSBI requires that to build.
Reviewed-by: Bin Meng <bmeng@tinylab.org>
Message-ID: <20230303202448.11911-2-palmer@rivosinc.com>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
(cherry picked from commit 7bc1286b81d4e8380b3083beed1771c67ce87af3)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml
index 04ed5a3ea1..9a651465d8 100644
--- a/.gitlab-ci.d/opensbi.yml
+++ b/.gitlab-ci.d/opensbi.yml
@@ -42,9 +42,9 @@
docker-opensbi:
extends: .opensbi_job_rules
stage: containers
- image: docker:19.03.1
+ image: docker:stable
services:
- - docker:19.03.1-dind
+ - docker:stable-dind
variables:
GIT_DEPTH: 3
IMAGE_TAG: $CI_REGISTRY_IMAGE:opensbi-cross-build
diff --git a/.gitlab-ci.d/opensbi/Dockerfile b/.gitlab-ci.d/opensbi/Dockerfile
index 4ba8a4de86..5ccf4151f4 100644
--- a/.gitlab-ci.d/opensbi/Dockerfile
+++ b/.gitlab-ci.d/opensbi/Dockerfile
@@ -15,6 +15,7 @@ RUN apt update \
ca-certificates \
git \
make \
+ python3 \
wget \
&& \
\
--
2.39.2
- [Stable-7.2.12 00/19] Patch Round-up for stable 7.2.12, freeze on 2024-06-07, Michael Tokarev, 2024/05/27
- [Stable-7.2.12 01/19] gitlab-ci: Remove job building EDK2 firmware binaries, Michael Tokarev, 2024/05/27
- [Stable-7.2.12 03/19] linux-user: do_setsockopt: fix SOL_ALG.ALG_SET_KEY, Michael Tokarev, 2024/05/27
- [Stable-7.2.12 07/19] tests/avocado: update sunxi kernel from armbian to 6.6.16, Michael Tokarev, 2024/05/27
- [Stable-7.2.12 04/19] nbd/server: do not poll within a coroutine context, Michael Tokarev, 2024/05/27
- [Stable-7.2.12 09/19] hw/dmax/xlnx_dpdma: fix handling of address_extension descriptor fields, Michael Tokarev, 2024/05/27
- [Stable-7.2.12 02/19] gitlab/opensbi: Move to docker:stable,
Michael Tokarev <=
- [Stable-7.2.12 05/19] nbd/server: Mark negotiation functions as coroutine_fn, Michael Tokarev, 2024/05/27
- [Stable-7.2.12 06/19] backends/cryptodev-builtin: Fix local_error leaks, Michael Tokarev, 2024/05/27
- [Stable-7.2.12 08/19] .gitlab-ci.d/cirrus.yml: Shorten the runtime of the macOS and FreeBSD jobs, Michael Tokarev, 2024/05/27
- [Stable-7.2.12 10/19] hw/arm/npcm7xx: Store derivative OTP fuse key in little endian, Michael Tokarev, 2024/05/27
- [Stable-7.2.12 11/19] target/i386: Give IRQs a chance when resetting HF_INHIBIT_IRQ_MASK, Michael Tokarev, 2024/05/27
- [Stable-7.2.12 12/19] hw/remote/vfio-user: Fix config space access byte order, Michael Tokarev, 2024/05/27
- [Stable-7.2.12 17/19] target-i386: hyper-v: Correct kvm_hv_handle_exit return value, Michael Tokarev, 2024/05/27
- [Stable-7.2.12 13/19] target/i386: fix operand size for DATA16 REX.W POPCNT, Michael Tokarev, 2024/05/27
- [Stable-7.2.12 16/19] ui/gtk: Check if fence_fd is equal to or greater than 0, Michael Tokarev, 2024/05/27
- [Stable-7.2.12 19/19] target/i386: no single-step exception after MOV or POP SS, Michael Tokarev, 2024/05/27