From 210528741d636a52fc20a8c6bcee7bbf499c4c8c Mon Sep 17 00:00:00 2001
From: Victor Morales <v.morales@samsung.com>
Date: Wed, 29 Sep 2021 07:45:52 -0700
Subject: [PATCH] Implement Docker best practices on esp32 qemu image (#10004)

Some of these best practices are:
* Pin versions
* Avoid additional packages installation
* Clean all missing after apt command
* Clone one depth history level

Signed-off-by: Victor Morales <v.morales@samsung.com>
---
 .../images/chip-build-esp32-qemu/Dockerfile    | 18 +++++++++++++-----
 integrations/docker/images/chip-build/version  |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/integrations/docker/images/chip-build-esp32-qemu/Dockerfile b/integrations/docker/images/chip-build-esp32-qemu/Dockerfile
index 6c7b0e523e1ad3..27f5a4d5aef63b 100644
--- a/integrations/docker/images/chip-build-esp32-qemu/Dockerfile
+++ b/integrations/docker/images/chip-build-esp32-qemu/Dockerfile
@@ -1,14 +1,22 @@
 ARG VERSION=latest
 FROM connectedhomeip/chip-build-esp32:${VERSION}
 
+RUN set -x \
+    && apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
+    ninja-build=1.10.0-1build1 \
+    git=1:2.25.1-1ubuntu3.2 \
+    libgcrypt20-dev=1.8.5-5ubuntu1.1 \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/ \
+    && : # last line
+
+WORKDIR /opt/espressif/qemu
 # Setup QEMU emulator for ESP32 platform
 RUN set -x \
-    && mkdir -p /opt/espressif \
-    && git clone --progress --depth 1 --branch esp-develop-20210220 https://github.com/espressif/qemu.git /opt/espressif/qemu-src \
-    && mkdir -p /opt/espressif/qemu \
-    && (cd /opt/espressif/qemu \
+    && git clone --depth 1 -b esp-develop-20210220 https://github.com/espressif/qemu.git ../qemu-src \
     && ../qemu-src/configure --target-list=xtensa-softmmu --enable-debug --enable-sanitizers --disable-strip --disable-user --disable-capstone --disable-vnc --disable-sdl --disable-gtk \
-    && make -j8) \
+    && make -j8 \
     && : # last line
 
 ENV QEMU_ESP32_DIR=/opt/espressif/qemu
diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
index b49b25336d4748..d3532a107eeb1f 100644
--- a/integrations/docker/images/chip-build/version
+++ b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.5.6
+0.5.7