[clang] e15fef4 - [analyzer] SATest: Ensure Docker image can be built

[Marco Antognini via cfe-commits]

Author: Marco Antognini
Date: 2022-06-20T09:43:21+02:00
New Revision: e15fef41709a226a45d321ebb9cd58260cb97b02

URL: https://github.com/llvm/llvm-project/commit/e15fef41709a226a45d321ebb9cd58260cb97b02
DIFF: https://github.com/llvm/llvm-project/commit/e15fef41709a226a45d321ebb9cd58260cb97b02.diff

LOG: [analyzer] SATest: Ensure Docker image can be built

Solve build issues occurring when running `docker build`.

Fix the version of cmake-data to solve the following issue:

  The following packages have unmet dependencies:
   cmake : Depends: cmake-data (= 3.20.5-0kitware1) but 3.23.1-0kitware1ubuntu18.04.1 is to be installed

Install libjpeg to solve this issue when installing Python
requirements:

  The headers or library files could not be found for jpeg,
  a required dependency when compiling Pillow from source.

Reviewed By: steakhal

Differential Revision: https://reviews.llvm.org/D126196

Added: 
    

Modified: 
    clang/utils/analyzer/Dockerfile

Removed: 
    


################################################################################
diff  --git a/clang/utils/analyzer/Dockerfile b/clang/utils/analyzer/Dockerfile
index bb1dd60eeb9b8..b92bac6796501 100644
--- a/clang/utils/analyzer/Dockerfile
+++ b/clang/utils/analyzer/Dockerfile
@@ -18,6 +18,7 @@ RUN apt-get update && apt-get install -y \
     python3=3.6.7-1~18.04 \
     python3-pip=9.0.1-2.3* \
     cmake=3.20.5* \
+    cmake-data=3.20.5* \
     ninja-build=1.8.2-1
 
 # box2d dependencies
@@ -52,6 +53,9 @@ RUN apt-get install -y \
     flex=2.6.4-6 \
     bison=2:3.0.4.*
 
+RUN apt-get install -y \
+    libjpeg-dev
+
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
 
 VOLUME /analyzer