From 9bc192a8de4a5ab3f031716bc5f7c4fc8083b157 Mon Sep 17 00:00:00 2001
From: Misha Chornyi <mchornyi@nvidia.com>
Date: Thu, 9 Nov 2023 16:37:55 -0800
Subject: [PATCH 1/2] Fix typo and change the command line order

---
 build.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.py b/build.py
index 76670d853d..deed165a29 100755
--- a/build.py
+++ b/build.py
@@ -996,8 +996,8 @@ def create_dockerfile_buildbase(ddir, dockerfile_name, argmap):
 # python3-pip and libarchive-dev is needed by python backend
 # libxml2-dev is needed for Azure Storage
 # scons is needed for armnn_tflite backend build dep
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
             ca-certificates \
             autoconf \
             automake \
@@ -1023,9 +1023,9 @@ def create_dockerfile_buildbase(ddir, dockerfile_name, argmap):
             zlib1g-dev \
             libarchive-dev \
             libxml2-dev \
-            libnuma-dev && \
+            libnuma-dev \
             wget \
-    rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/*
 
 RUN pip3 install --upgrade pip && \
     pip3 install --upgrade wheel setuptools docker
@@ -1243,8 +1243,8 @@ def dockerfile_prepare_container_linux(argmap, backends, enable_gpu, target_mach
 
 # Common dependencies. FIXME (can any of these be conditional? For
 # example libcurl only needed for GCS?)
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
             software-properties-common \
             libb64-0d \
             libcurl4-openssl-dev \
@@ -1257,8 +1257,8 @@ def dockerfile_prepare_container_linux(argmap, backends, enable_gpu, target_mach
             curl \
             libjemalloc-dev \
             wget \
-            {backend_dependencies} && \
-    rm -rf /var/lib/apt/lists/*
+            {backend_dependencies} \
+    && rm -rf /var/lib/apt/lists/*
 
 # Install boost version >= 1.78 for boost::span
 # Current libboost-dev apt packages are < 1.78, so install from tar.gz

From fd5fd4d093f4bdb0629f2c29183c8b8389038daa Mon Sep 17 00:00:00 2001
From: Misha Chornyi <mchornyi@nvidia.com>
Date: Thu, 9 Nov 2023 18:45:21 -0800
Subject: [PATCH 2/2] Improve visual experience. Add 'clang' package

---
 build.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/build.py b/build.py
index deed165a29..c63fcb57dd 100755
--- a/build.py
+++ b/build.py
@@ -1245,17 +1245,18 @@ def dockerfile_prepare_container_linux(argmap, backends, enable_gpu, target_mach
 # example libcurl only needed for GCS?)
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-            software-properties-common \
-            libb64-0d \
-            libcurl4-openssl-dev \
-            libre2-9 \
+            clang \
+            curl \
+            dirmngr \
             git \
             gperf \
-            dirmngr \
+            libb64-0d \
+            libcurl4-openssl-dev \
             libgoogle-perftools-dev \
-            libnuma-dev \
-            curl \
             libjemalloc-dev \
+            libnuma-dev \
+            libre2-9 \
+            software-properties-common \
             wget \
             {backend_dependencies} \
     && rm -rf /var/lib/apt/lists/*
@@ -1263,10 +1264,12 @@ def dockerfile_prepare_container_linux(argmap, backends, enable_gpu, target_mach
 # Install boost version >= 1.78 for boost::span
 # Current libboost-dev apt packages are < 1.78, so install from tar.gz
 RUN wget -O /tmp/boost.tar.gz \
-        https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.gz && \
-    (cd /tmp && tar xzf boost.tar.gz) && \
-    cd /tmp/boost_1_80_0 && ./bootstrap.sh --prefix=/usr && ./b2 install && \
-    rm -rf /tmp/boost*
+        https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.gz \
+      && (cd /tmp && tar xzf boost.tar.gz) \
+      && cd /tmp/boost_1_80_0 \
+      && ./bootstrap.sh --prefix=/usr \
+      && ./b2 install \
+      && rm -rf /tmp/boost*
 
 # Set TCMALLOC_RELEASE_RATE for users setting LD_PRELOAD with tcmalloc
 ENV TCMALLOC_RELEASE_RATE 200