From 24044d48251fc9cd163e005a3d41d299819d2092 Mon Sep 17 00:00:00 2001 From: Philippe Mathieu-Daudé Date: Mon, 17 Jul 2017 21:31:33 -0300 Subject: docker: rename debian stable -> 9 (Stretch) We'll also want to support some older Debian combinations for architectures that didn't make the Debian 9 cut. Signed-off-by: Philippe Mathieu-Daudé [AJB: extend commit msg] Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 6 +++--- tests/docker/dockerfiles/debian-arm64-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-armhf-cross.docker | 4 ++-- .../docker/dockerfiles/debian-mipsel-cross.docker | 4 ++-- tests/docker/dockerfiles/debian.docker | 20 ----------------- tests/docker/dockerfiles/debian9.docker | 25 ++++++++++++++++++++++ 6 files changed, 34 insertions(+), 29 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian.docker create mode 100644 tests/docker/dockerfiles/debian9.docker (limited to 'tests') 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é # Add the foreign architecture we want and install dependencies diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker deleted file mode 100644 index 10953b2425..0000000000 --- a/tests/docker/dockerfiles/debian.docker +++ /dev/null @@ -1,20 +0,0 @@ -# -# 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. -# -# 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 - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list - -# Install common build utilities -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 diff --git a/tests/docker/dockerfiles/debian9.docker b/tests/docker/dockerfiles/debian9.docker new file mode 100644 index 0000000000..c74f71283c --- /dev/null +++ b/tests/docker/dockerfiles/debian9.docker @@ -0,0 +1,25 @@ +# +# Docker multiarch cross-compiler target +# +# 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:stretch-slim + +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list + +# Install common build utilities +RUN apt update +RUN DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + bison \ + build-essential \ + ca-certificates \ + clang \ + flex \ + git -- cgit v1.2.3-55-g7522