tests/docker: update and flatten debian-mips64-cross
Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <20220914155950.804707-12-alex.bennee@linaro.org>
This commit is contained in:
parent
7785500236
commit
2d2a154be7
|
@ -77,7 +77,6 @@ m68k-debian-cross-container:
|
||||||
mips64-debian-cross-container:
|
mips64-debian-cross-container:
|
||||||
extends: .container_job_template
|
extends: .container_job_template
|
||||||
stage: containers
|
stage: containers
|
||||||
needs: ['amd64-debian10-container']
|
|
||||||
variables:
|
variables:
|
||||||
NAME: debian-mips64-cross
|
NAME: debian-mips64-cross
|
||||||
|
|
||||||
|
|
|
@ -89,7 +89,6 @@ DOCKER_PARTIAL_IMAGES += fedora
|
||||||
endif
|
endif
|
||||||
|
|
||||||
docker-image-debian-mips-cross: docker-image-debian10
|
docker-image-debian-mips-cross: docker-image-debian10
|
||||||
docker-image-debian-mips64-cross: docker-image-debian10
|
|
||||||
docker-image-debian-sh4-cross: docker-image-debian10
|
docker-image-debian-sh4-cross: docker-image-debian10
|
||||||
docker-image-debian-sparc64-cross: docker-image-debian10
|
docker-image-debian-sparc64-cross: docker-image-debian10
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,14 @@
|
||||||
#
|
#
|
||||||
# Docker cross-compiler target
|
# Docker cross-compiler target
|
||||||
#
|
#
|
||||||
# This docker target builds on the debian Buster base image.
|
# This docker target builds on the Debian Bullseye base image.
|
||||||
#
|
#
|
||||||
FROM qemu/debian10
|
FROM docker.io/library/debian:11-slim
|
||||||
|
|
||||||
RUN apt update && \
|
RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
DEBIAN_FRONTEND=noninteractive eatmydata \
|
apt-get update && \
|
||||||
apt install -y --no-install-recommends \
|
apt-get install -y eatmydata && \
|
||||||
|
eatmydata apt-get dist-upgrade -y && \
|
||||||
|
eatmydata apt-get install --no-install-recommends -y \
|
||||||
gcc-mips64-linux-gnuabi64 \
|
gcc-mips64-linux-gnuabi64 \
|
||||||
libc6-dev-mips64-cross
|
libc6-dev-mips64-cross
|
||||||
|
|
Loading…
Reference in New Issue