From 9cd40aae3048010e7138bfe2e28eb14a45344879 Mon Sep 17 00:00:00 2001
From: Ivan Komissarov <ABBAPOH@gmail.com>
Date: Sat, 29 Aug 2020 10:47:00 +0200
Subject: 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>
---
 docker-compose.yml                     | 6 +++---
 docker/bionic/test-android.Dockerfile  | 1 +
 docker/focal/test-baremetal.Dockerfile | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 21bb6d0bf..057ffed7f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,7 +28,7 @@ services:
   bionic-android-513:
     << : *linux
     hostname: bionic-android
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-android-5.13.2-3
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-android-5.13.2-4
     build:
       dockerfile: docker/bionic/test-android.Dockerfile
       context: .
@@ -38,7 +38,7 @@ services:
   bionic-android-514:
     << : *linux
     hostname: bionic-android
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-android-5.14.0-3
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-android-5.14.0-4
     build:
       dockerfile: docker/bionic/test-android.Dockerfile
       context: .
@@ -48,7 +48,7 @@ services:
   focal-baremetal:
     << : *linux
     hostname: focal-baremetal
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-baremetal-0
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-baremetal-1
     build:
       dockerfile: docker/focal/test-baremetal.Dockerfile
       context: .
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 \
-- 
cgit v1.2.3