From 723d407a87ba03d0880fed7158c0ecf69ee20204 Mon Sep 17 00:00:00 2001
From: Stefan Wallentowitz <stefan.wallentowitz@hm.edu>
Date: Tue, 26 May 2020 20:38:43 +0200
Subject: [PATCH] [docker] Unify docker files (#2371)

Unify the actions in the Dockerfiles between the runtime environment
and the run containers.

Fixes #2345

Signed-off-by: Stefan Wallentowitz <stefan.wallentowitz@hm.edu>
---
 ci/docker/buildenv/Dockerfile | 4 ++++
 ci/docker/run/Dockerfile      | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ci/docker/buildenv/Dockerfile b/ci/docker/buildenv/Dockerfile
index 05ab3a830..f3008bb97 100644
--- a/ci/docker/buildenv/Dockerfile
+++ b/ci/docker/buildenv/Dockerfile
@@ -16,6 +16,7 @@ RUN apt-get update \
                         bison \
                         build-essential \
                         ca-certificates \
+                        ccache \
                         clang \
                         cmake \
                         flex \
@@ -24,6 +25,7 @@ RUN apt-get update \
                         gtkwave \
                         libfl2 \
                         libfl-dev \
+                        libgoogle-perftools-dev \
                         libsystemc \
                         libsystemc-dev \
                         numactl \
@@ -49,4 +51,6 @@ COPY build.sh /tmp/build.sh
 
 ENV VERILATOR_AUTHOR_SITE=1
 
+WORKDIR /work
+
 ENTRYPOINT [ "/tmp/build.sh" ]
diff --git a/ci/docker/run/Dockerfile b/ci/docker/run/Dockerfile
index 4a10ec336..18c40483f 100644
--- a/ci/docker/run/Dockerfile
+++ b/ci/docker/run/Dockerfile
@@ -9,6 +9,7 @@
 FROM ubuntu:20.04
 
 RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive \
     && apt-get install --no-install-recommends -y \
                         autoconf \
                         bc \