aboutsummaryrefslogtreecommitdiffstats
path: root/tools/docker
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2020-08-22 17:17:11 +0200
committerDmitry Vyukov <dvyukov@google.com>2020-08-22 21:26:42 +0200
commit0dba77942f44965df41ae0cec26668cdb176b1a5 (patch)
tree11d6dd329340283b904fa45ad67f7bbcd460dd50 /tools/docker
parent6436ce4bcd8e2c7dcca0b171ac91f51e96d973f8 (diff)
tools/docker/env: install qemu-user
qemu-user allows to run cross-arch binaries in tests.
Diffstat (limited to 'tools/docker')
-rw-r--r--tools/docker/env/Dockerfile5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/docker/env/Dockerfile b/tools/docker/env/Dockerfile
index 25a4f3ddb..a10fdec0d 100644
--- a/tools/docker/env/Dockerfile
+++ b/tools/docker/env/Dockerfile
@@ -27,7 +27,10 @@ RUN dpkg --add-architecture i386 && \
g++-mips64el-linux-gnuabi64 g++-s390x-linux-gnu g++-riscv64-linux-gnu \
libc6-dev:i386 linux-libc-dev:i386 lib32gcc-8-dev lib32stdc++-8-dev \
# These are needed to build Linux kernel:
- flex bison bc libelf-dev libssl-dev && \
+ flex bison bc libelf-dev libssl-dev \
+ # qemu-user is required to run alien arch binaries in pkg/cover tests.
+ qemu-user \
+ && \
apt-get -y autoremove && \
apt-get clean autoclean && \
rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/*