diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2017-07-17 21:31:33 -0300 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2017-07-18 10:54:30 +0100 |
| commit | 24044d48251fc9cd163e005a3d41d299819d2092 (patch) | |
| tree | 8e73ad5d8e11faed95e5d467d417f75682b8e1d8 /tests/docker/dockerfiles | |
| parent | ed7023b05b06a38fc32ca5ef9a8c49d6fcbad572 (diff) | |
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é <f4bug@amsat.org>
[AJB: extend commit msg]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker/dockerfiles')
| -rw-r--r-- | tests/docker/dockerfiles/debian-arm64-cross.docker | 4 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/debian-armhf-cross.docker | 4 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/debian-mipsel-cross.docker | 4 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/debian9.docker (renamed from tests/docker/dockerfiles/debian.docker) | 13 |
4 files changed, 15 insertions, 10 deletions
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é <f4bug@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 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 |