[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] tests/docker: Update the xtensa container to debian 10
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH] tests/docker: Update the xtensa container to debian 10 |
Date: |
Mon, 18 Jan 2021 13:47:09 +0100 |
Align the Xtensa docker image with the other Debian-based ones.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
.gitlab-ci.d/containers.yml | 2 ++
tests/docker/Makefile.include | 1 +
tests/docker/dockerfiles/debian-xtensa-cross.docker | 12 +++---------
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index 910754a699f..08bccd96901 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -204,6 +204,8 @@ tricore-debian-cross-container:
xtensa-debian-cross-container:
<<: *container_job_definition
+ stage: containers-layer2
+ needs: ['amd64-debian10-container']
variables:
NAME: debian-xtensa-cross
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index c254ac38d0a..464740533e9 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -134,6 +134,7 @@ docker-image-travis: NOUSER=1
# Specialist build images, sometimes very limited tools
docker-image-debian-tricore-cross: docker-image-debian10
+docker-image-debian-xtensa-cross: docker-image-debian10
docker-image-debian-all-test-cross: docker-image-debian10
docker-image-debian-arm64-test-cross: docker-image-debian11
diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker
b/tests/docker/dockerfiles/debian-xtensa-cross.docker
index ba4148299c5..f89f1d9e247 100644
--- a/tests/docker/dockerfiles/debian-xtensa-cross.docker
+++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker
@@ -1,22 +1,16 @@
#
# Docker cross-compiler target
#
-# This docker target builds on the debian stretch base image,
+# This docker target builds on the debian Buster base image,
# using a prebuilt toolchains for Xtensa cores from:
# https://github.com/foss-xtensa/toolchain/releases
#
-FROM debian:stretch-slim
+FROM qemu/debian10
RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
DEBIAN_FRONTEND=noninteractive eatmydata \
apt-get install -y --no-install-recommends \
- build-essential \
- ca-certificates \
- curl \
- gettext \
- git \
- python3-minimal
+ curl
ENV CPU_LIST dc232b dc233c de233_fpu dsp3400
ENV TOOLCHAIN_RELEASE 2020.07
--
2.26.2
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] tests/docker: Update the xtensa container to debian 10,
Philippe Mathieu-Daudé <=