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-hppa-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 802e332205..6c1d765463 100644
> --- a/.gitlab-ci.d/container-cross.yml
> +++ b/.gitlab-ci.d/container-cross.yml
> @@ -65,7 +65,6 @@ hexagon-cross-container:
> hppa-debian-cross-container:
> extends: .container_job_template
> stage: containers
> - needs: ['amd64-debian10-container']
> variables:
> NAME: debian-hppa-cross
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index c565aa5e7b..e39597d35c 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -88,7 +88,6 @@ DOCKER_PARTIAL_IMAGES += debian-s390x-cross
> DOCKER_PARTIAL_IMAGES += fedora
> endif
>
> -docker-image-debian-hppa-cross: docker-image-debian10
> docker-image-debian-m68k-cross: docker-image-debian10
> docker-image-debian-mips-cross: docker-image-debian10
> docker-image-debian-mips64-cross: docker-image-debian10
> diff --git a/tests/docker/dockerfiles/debian-hppa-cross.docker b/tests/docker/dockerfiles/debian-hppa-cross.docker
> index 3d6c65a3ef..af1c8403d8 100644
> --- a/tests/docker/dockerfiles/debian-hppa-cross.docker
> +++ b/tests/docker/dockerfiles/debian-hppa-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-hppa-linux-gnu \
> libc6-dev-hppa-cross
Reviewed-by: Thomas Huth <thuth@redhat.com>