From 7235568fa3d57ebe5041630f3f450cf6651424ce Mon Sep 17 00:00:00 2001
From: Justin Wood <woody@apple.com>
Date: Thu, 30 Sep 2021 08:49:32 -0700
Subject: [PATCH] Revert "Improve ESP32 Docker image used by Build example -
 ESP32 workflow (#9999)" (#10115)

This reverts commit 3e87dd0d96601bffe37df6d6967ac4b6c727cf94.
---
 .../docker/images/chip-build-esp32/Dockerfile | 28 ++++++-------------
 integrations/docker/images/chip-build/version |  2 +-
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/integrations/docker/images/chip-build-esp32/Dockerfile b/integrations/docker/images/chip-build-esp32/Dockerfile
index ec464f7e3d5d91..911ecb47c4a46e 100644
--- a/integrations/docker/images/chip-build-esp32/Dockerfile
+++ b/integrations/docker/images/chip-build-esp32/Dockerfile
@@ -1,27 +1,17 @@
 ARG VERSION=latest
-FROM connectedhomeip/chip-build:${VERSION} as build
+FROM connectedhomeip/chip-build:${VERSION}
 
+# Setup the ESP-IDF
 RUN set -x \
     && apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
-    git=1:2.25.1-1ubuntu3.2 \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/ \
-    && : # last line
-
-RUN set -x \
-    && git clone --depth 1 --recursive -b v4.3 https://github.com/espressif/esp-idf.git /tmp/esp-idf \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y python libgcrypt20-dev \
+    && mkdir -p /opt/espressif \
+    && cd /opt/espressif \
+    && git clone --progress -b v4.3 https://github.com/espressif/esp-idf.git \
+    && cd esp-idf \
+    && git submodule update --init --progress \
+    && IDF_TOOLS_PATH=/opt/espressif/tools ./install.sh \
     && : # last line
 
-FROM connectedhomeip/chip-build:${VERSION}
-
 ENV IDF_PATH=/opt/espressif/esp-idf/
 ENV IDF_TOOLS_PATH=/opt/espressif/tools
-
-COPY --from=build /tmp/esp-idf /opt/espressif/esp-idf
-
-# Setup the ESP-IDF
-WORKDIR /opt/espressif/esp-idf
-RUN set -x \
-    && ./install.sh \
-    && : # last line
diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
index 659914ae9416f8..d3532a107eeb1f 100644
--- a/integrations/docker/images/chip-build/version
+++ b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.5.8
+0.5.7