summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorIvan Komissarov <ABBAPOH@gmail.com>2020-08-29 10:47:00 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2020-08-31 09:34:44 +0000
commit9cd40aae3048010e7138bfe2e28eb14a45344879 (patch)
treef44e7ea26aaaee92d676985a75d8efe9c807f1d2 /docker
parente01c3b2298d3dbb9adbdc3e4f3d51c53afe39ce1 (diff)
downloadqbs-9cd40aae3048010e7138bfe2e28eb14a45344879.tar.gz
docker: Install additional dependencies in the images
To be able to run Qbs with sanitizer Change-Id: Ia098a419a001ebbea039281ff20ccbc11198226a Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'docker')
-rw-r--r--docker/bionic/test-android.Dockerfile1
-rw-r--r--docker/focal/test-baremetal.Dockerfile2
2 files changed, 3 insertions, 0 deletions
diff --git a/docker/bionic/test-android.Dockerfile b/docker/bionic/test-android.Dockerfile
index 3ec8b4808..64d22b8d1 100644
--- a/docker/bionic/test-android.Dockerfile
+++ b/docker/bionic/test-android.Dockerfile
@@ -35,6 +35,7 @@ RUN apt-get update -qq && \
apt-get install -qq -y --no-install-recommends \
ca-certificates \
curl \
+ libasan4 \
libglib2.0-0 \
libgl1-mesa-glx \
openjdk-8-jdk-headless \
diff --git a/docker/focal/test-baremetal.Dockerfile b/docker/focal/test-baremetal.Dockerfile
index 9d581dd0e..d54a87dc2 100644
--- a/docker/focal/test-baremetal.Dockerfile
+++ b/docker/focal/test-baremetal.Dockerfile
@@ -33,8 +33,10 @@ ENTRYPOINT ["/sbin/entrypoint.sh"]
# Install baremetal toolchains and Qbs runtime dependencies.
RUN apt-get update -qq && \
apt-get install -qq -y \
+ libasan4 \
libglib2.0-0 \
libgssapi-krb5-2 \
+ libgl1-mesa-glx \
gcc-arm-none-eabi \
gcc-avr \
avr-libc \