Commit 24044d48 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Alex Bennée
Browse files

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: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
[AJB: extend commit msg]
Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
parent ed7023b0

tests/docker/Makefile.include

+3 −3
Original line number Diff line number Diff line
@@ -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), \

tests/docker/dockerfiles/debian-arm64-cross.docker

+2 −2
Original line number Diff line number Diff line 
#

# 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

tests/docker/dockerfiles/debian-armhf-cross.docker

+2 −2
Original line number Diff line number Diff line 
#

# 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

tests/docker/dockerfiles/debian-mipsel-cross.docker

+2 −2
Original line number Diff line number Diff line 
#

# 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

tests/docker/dockerfiles/debian.docker→tests/docker/dockerfiles/debian9.docker

+9 −4
Original line number Diff line number Diff line 
#

# 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