diff mbox series

[v2,01/15] docker/tricore: Use stretch-slim as a base image

Message ID 20200604085441.103087-2-kbastian@mail.uni-paderborn.de
State New
Headers show
Series tests/tcg: Add TriCore tests | expand

Commit Message

Bastian Koppelmann June 4, 2020, 8:54 a.m. UTC
we get an authentication errror when trying to pull qemu:debian9. Thus
just start from a plain debian image.

Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
---
 .../dockerfiles/debian-tricore-cross.docker      | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

Comments

Alex Bennée June 4, 2020, 3:41 p.m. UTC | #1
Bastian Koppelmann <kbastian@mail.uni-paderborn.de> writes:

> we get an authentication errror when trying to pull qemu:debian9. Thus
> just start from a plain debian image.

Ahh I see a breakage in tests/docker/Makefile.include where the line
should be:

docker-image-debian-tricore-cross: docker-image-debian9

to ensure qemu:debian9 is built before this one.

>
> Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
> ---
>  .../dockerfiles/debian-tricore-cross.docker      | 16 ++++++++++++++--
>  1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker
> index 4a0f7706a3..544d7814f8 100644
> --- a/tests/docker/dockerfiles/debian-tricore-cross.docker
> +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
> @@ -7,10 +7,22 @@
>  #
>  # SPDX-License-Identifier: GPL-2.0-or-later
>  #
> -FROM qemu:debian9
> -
> +FROM debian:stretch-slim

Any reason not to up the base to debian10 to stay ahead of the
deprecation curve?
diff mbox series

Patch

diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker
index 4a0f7706a3..544d7814f8 100644
--- a/tests/docker/dockerfiles/debian-tricore-cross.docker
+++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
@@ -7,10 +7,22 @@ 
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
-FROM qemu:debian9
-
+FROM debian:stretch-slim
 MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
 
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
+    DEBIAN_FRONTEND=noninteractive eatmydata \
+    apt-get install -y --no-install-recommends \
+        bison \
+        build-essential \
+        ca-certificates \
+        curl \
+        flex \
+        gettext \
+        git \
+        python3-minimal
+
 RUN git clone --single-branch \
         https://github.com/bkoppelmann/tricore-binutils.git \
         /usr/src/binutils && \