More build fixes

integrations/docker/images/base/chip-build-minimal/Dockerfile

@@ -9,19 +9,14 @@ RUN set -x \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
- build-essential ca-certificates git pkg-config python3-venv ninja-build \
+ build-essential \
+ ca-certificates \
+ generate-ninja \
+ git pkg-config \
+ ninja-build \
+ python3-venv \
  && git config --global advice.detachedHead false
 
-# RUN set -x && cd /var/tmp \
-# && git clone --branch "$NINJA_VERSION" https://github.com/ninja-build/ninja.git \
-# && ( cd ninja && ./configure.py --bootstrap && install -m 0755 ninja /usr/local/bin/ ) \
-# && rm -rf ninja
-
-RUN set -x && cd /var/tmp \
- && git clone https://gn.googlesource.com/gn \
- && ( cd gn && git checkout "$GN_HASH" && CXX=g++ build/gen.py && ninja -C out && install -m 0755 out/gn /usr/local/bin/ ) \
- && rm -rf gn
-
 # CHIP build dependencies
 RUN set -x \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

integrations/docker/images/base/chip-build/Dockerfile

@@ -200,3 +200,8 @@ RUN case ${TARGETPLATFORM} in \
 # Protoc goes from 108M to 4.6M
 RUN strip /usr/local/bin/protoc*
 
+# Cleanup unused bits
+RUN set -x \
+ && DEBIAN_FRONTEND=noninteractive apt-get remove python3-scipy -fy --fix-missing \
+ && DEBIAN_FRONTEND=noninteractive apt-get autoremove -fy --fix-missing \
+ && : # last line