diff mbox

[v6,07/18] docker: add debian/amd64

Message ID 20170711031000.24844-8-f4bug@amsat.org
State New
Headers show

Commit Message

Philippe Mathieu-Daudé July 11, 2017, 3:09 a.m. UTC
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/docker/Makefile.include                      |  1 +
 tests/docker/dockerfiles/debian-amd64-cross.docker | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 tests/docker/dockerfiles/debian-amd64-cross.docker

Comments

Alex Bennée July 17, 2017, 9:36 a.m. UTC | #1
Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  tests/docker/Makefile.include                      |  1 +
>  tests/docker/dockerfiles/debian-amd64-cross.docker | 18 ++++++++++++++++++
>  2 files changed, 19 insertions(+)
>  create mode 100644 tests/docker/dockerfiles/debian-amd64-cross.docker

I'm not sure I'll take this one as it is a) not really cross compiling,
b) adding to coverage much (if at all).

>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 59b08b4aca..d2a81b0d71 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -62,6 +62,7 @@ docker-image-debian-arm64-cross: docker-image-debian9
>  docker-image-debian-mipsel-cross: docker-image-debian9
>  docker-image-debian-ppc64el-cross: docker-image-debian9
>  docker-image-debian-s390x-cross: docker-image-debian9
> +docker-image-debian-amd64-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-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
> new file mode 100644
> index 0000000000..9d10a886df
> --- /dev/null
> +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
> @@ -0,0 +1,18 @@
> +#
> +# Docker x86_64 cross-compiler target
> +#
> +# This docker target builds on the debian Stretch base image.
> +#
> +FROM qemu:debian9
> +MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
> +
> +RUN DEBIAN_FRONTEND=noninteractive eatmydata \
> +    apt-get build-dep -yy qemu
> +
> +RUN DEBIAN_FRONTEND=noninteractive eatmydata \
> +    apt-get install -y --no-install-recommends \
> +        libbz2-dev \
> +        liblzo2-dev \
> +        librdmacm-dev \
> +        libsnappy-dev \
> +        libvte-dev


--
Alex Bennée
Alex Bennée July 17, 2017, 9:37 a.m. UTC | #2
Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  tests/docker/Makefile.include                      |  1 +
>  tests/docker/dockerfiles/debian-amd64-cross.docker | 18 ++++++++++++++++++
>  2 files changed, 19 insertions(+)
>  create mode 100644 tests/docker/dockerfiles/debian-amd64-cross.docker
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 59b08b4aca..d2a81b0d71 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -62,6 +62,7 @@ docker-image-debian-arm64-cross: docker-image-debian9
>  docker-image-debian-mipsel-cross: docker-image-debian9
>  docker-image-debian-ppc64el-cross: docker-image-debian9
>  docker-image-debian-s390x-cross: docker-image-debian9
> +docker-image-debian-amd64-cross: docker-image-debian9

Seeing the later patches maybe we should call this
debian-image-bleeding-deps or some such....

>
>  # Expand all the pre-requistes for each docker image and test combination
>  $(foreach i,$(DOCKER_IMAGES), \
> diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
> new file mode 100644
> index 0000000000..9d10a886df
> --- /dev/null
> +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
> @@ -0,0 +1,18 @@
> +#
> +# Docker x86_64 cross-compiler target
> +#
> +# This docker target builds on the debian Stretch base image.
> +#
> +FROM qemu:debian9
> +MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
> +
> +RUN DEBIAN_FRONTEND=noninteractive eatmydata \
> +    apt-get build-dep -yy qemu
> +
> +RUN DEBIAN_FRONTEND=noninteractive eatmydata \
> +    apt-get install -y --no-install-recommends \
> +        libbz2-dev \
> +        liblzo2-dev \
> +        librdmacm-dev \
> +        libsnappy-dev \
> +        libvte-dev


--
Alex Bennée
diff mbox

Patch

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 59b08b4aca..d2a81b0d71 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -62,6 +62,7 @@  docker-image-debian-arm64-cross: docker-image-debian9
 docker-image-debian-mipsel-cross: docker-image-debian9
 docker-image-debian-ppc64el-cross: docker-image-debian9
 docker-image-debian-s390x-cross: docker-image-debian9
+docker-image-debian-amd64-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-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
new file mode 100644
index 0000000000..9d10a886df
--- /dev/null
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -0,0 +1,18 @@ 
+#
+# Docker x86_64 cross-compiler target
+#
+# This docker target builds on the debian Stretch base image.
+#
+FROM qemu:debian9
+MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
+
+RUN DEBIAN_FRONTEND=noninteractive eatmydata \
+    apt-get build-dep -yy qemu
+
+RUN DEBIAN_FRONTEND=noninteractive eatmydata \
+    apt-get install -y --no-install-recommends \
+        libbz2-dev \
+        liblzo2-dev \
+        librdmacm-dev \
+        libsnappy-dev \
+        libvte-dev