On Mon, 07/17 15:48, Alex Bennée wrote:
> From: Philippe Mathieu-Daudé <f4...@amsat.org>
Why?
>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> Signed-off-by: Alex Bennée <alex.ben...@linaro.org>
> ---
> tests/docker/Makefile.include | 6 +++---
> tests/docker/dockerfiles/debian-arm64-cross.docker | 4 ++--
> tests/docker/dockerfiles/debian-armhf-cross.docker | 4 ++--
> tests/docker/dockerfiles/debian-mipsel-cross.docker | 4 ++--
> tests/docker/dockerfiles/{debian.docker => debian9.docker} | 13 +++++++++----
> 5 files changed, 18 insertions(+), 13 deletions(-)
> rename tests/docker/dockerfiles/{debian.docker => debian9.docker} (62%)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 012a2fc1af..72bb52ad7b 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -56,9 +56,9 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker
> "BUILD","$*")
>
> # Enforce dependancies for composite images
> -docker-image-debian-armhf-cross: docker-image-debian
> -docker-image-debian-arm64-cross: docker-image-debian
> -docker-image-debian-mipsel-cross: docker-image-debian
> +docker-image-debian-armhf-cross: docker-image-debian9
> +docker-image-debian-arm64-cross: docker-image-debian9
> +docker-image-debian-mipsel-cross: docker-image-debian9
>
> # Expand all the pre-requistes for each docker image and test combination
> $(foreach i,$(DOCKER_IMAGES), \
> diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker
> b/tests/docker/dockerfiles/debian-arm64-cross.docker
> index 45b891d57a..f1bfa64160 100644
> --- a/tests/docker/dockerfiles/debian-arm64-cross.docker
> +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
> @@ -1,9 +1,9 @@
> #
> # Docker arm64 cross-compiler target
> #
> -# This docker target builds on the base debian image.
> +# This docker target builds on the debian Stretch base image.
> #
> -FROM qemu:debian
> +FROM qemu:debian9
>
> # Add the foreign architecture we want and install dependencies
> RUN dpkg --add-architecture arm64
> diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker
> b/tests/docker/dockerfiles/debian-armhf-cross.docker
> index e67dfdccc5..2beacef49b 100644
> --- a/tests/docker/dockerfiles/debian-armhf-cross.docker
> +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
> @@ -1,9 +1,9 @@
> #
> # Docker armhf cross-compiler target
> #
> -# This docker target builds on the base debian image.
> +# This docker target builds on the debian Stretch base image.
> #
> -FROM qemu:debian
> +FROM qemu:debian9
>
> # Add the foreign architecture we want and install dependencies
> RUN dpkg --add-architecture armhf
> diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker
> b/tests/docker/dockerfiles/debian-mipsel-cross.docker
> index 2156bdb28d..9ee997aa54 100644
> --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
> +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
> @@ -1,9 +1,9 @@
> #
> # Docker mipsel cross-compiler target
> #
> -# This docker target builds on the base debian image.
> +# This docker target builds on the debian Stretch base image.
> #
> -FROM qemu:debian
> +FROM qemu:debian9
> MAINTAINER Philippe Mathieu-Daudé <f4...@amsat.org>
>
> # Add the foreign architecture we want and install dependencies
> diff --git a/tests/docker/dockerfiles/debian.docker
> b/tests/docker/dockerfiles/debian9.docker
> similarity index 62%
> rename from tests/docker/dockerfiles/debian.docker
> rename to tests/docker/dockerfiles/debian9.docker
> index 10953b2425..c74f71283c 100644
> --- a/tests/docker/dockerfiles/debian.docker
> +++ b/tests/docker/dockerfiles/debian9.docker
> @@ -1,13 +1,13 @@
> #
> # Docker multiarch cross-compiler target
> #
> -# This docker target is builds on Debian and Emdebian's cross compiler
> targets
> -# to build distro with a selection of cross compilers for building test
> binaries.
> +# This docker target is builds on Debian cross compiler targets to build
> distro
> +# with a selection of cross compilers for building test binaries.
> #
> # On its own you can't build much but the docker-foo-cross targets
> # build on top of the base debian image.
> #
> -FROM debian:stable-slim
> +FROM debian:stretch-slim
>
> # Duplicate deb line as deb-src
> RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >>
> /etc/apt/sources.list
> @@ -17,4 +17,9 @@ RUN apt update
> RUN DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata
> RUN DEBIAN_FRONTEND=noninteractive eatmydata \
> apt install -y --no-install-recommends \
> - ca-certificates build-essential clang git bison flex
> + bison \
> + build-essential \
> + ca-certificates \
> + clang \
> + flex \
> + git
> --
> 2.13.0
>
Fam
