Re: [PATCH v1 06/25] tests/docker: update and flatten debian-mips64-cross

[Thomas Huth]

On 26/08/2022 19.21, Alex Bennée wrote:
> 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>
> ---
>   .gitlab-ci.d/container-cross.yml                    |  1 -
>   tests/docker/Makefile.include                       |  1 -
>   tests/docker/dockerfiles/debian-mips64-cross.docker | 12 +++++++-----
>   3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
> index 15a5270f6d..a3bfa483bf 100644
> --- a/.gitlab-ci.d/container-cross.yml
> +++ b/.gitlab-ci.d/container-cross.yml
> @@ -77,7 +77,6 @@ m68k-debian-cross-container:
>   mips64-debian-cross-container:
>     extends: .container_job_template
>     stage: containers
> -  needs: ['amd64-debian10-container']
>     variables:
>       NAME: debian-mips64-cross
>   
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 95790e974e..6c2ee3b175 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -89,7 +89,6 @@ DOCKER_PARTIAL_IMAGES += fedora
>   endif
>   
>   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-sparc64-cross: docker-image-debian10
>   
> diff --git a/tests/docker/dockerfiles/debian-mips64-cross.docker b/tests/docker/dockerfiles/debian-mips64-cross.docker
> index 09c2ba584e..afcff9726f 100644
> --- a/tests/docker/dockerfiles/debian-mips64-cross.docker
> +++ b/tests/docker/dockerfiles/debian-mips64-cross.docker
> @@ -1,12 +1,14 @@
>   #
>   # 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 && \
> -    DEBIAN_FRONTEND=noninteractive eatmydata \
> -    apt install -y --no-install-recommends \
> +RUN export DEBIAN_FRONTEND=noninteractive && \
> +    apt-get update && \
> +    apt-get install -y eatmydata && \
> +    eatmydata apt-get dist-upgrade -y && \
> +    eatmydata apt-get install --no-install-recommends -y \
>           gcc-mips64-linux-gnuabi64 \
>           libc6-dev-mips64-cross

Reviewed-by: Thomas Huth <thuth@redhat.com>