From faf86f72fb0df0898997c914f974c60eb4f4c297 Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <ivan@espressif.com>
Date: Fri, 24 Jan 2020 19:11:56 +0100
Subject: [PATCH] tools/docker: install CMake version provided in tools.json

Closes https://github.com/espressif/esp-idf/issues/4644
Closes IDFGH-2559
---
 tools/docker/Dockerfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 35f277e9d..12245cb61 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -8,7 +8,6 @@ RUN apt-get update && apt-get install -y \
     ca-certificates \
     ccache \
     check \
-    cmake \
     curl \
     flex \
     git \
@@ -53,8 +52,11 @@ RUN echo IDF_CHECKOUT_REF=$IDF_CHECKOUT_REF IDF_CLONE_BRANCH_OR_TAG=$IDF_CLONE_B
       git submodule update --init --recursive; \
     fi
 
-RUN $IDF_PATH/install.sh && \
-  rm -rf $IDF_TOOLS_PATH/dist
+# Install all the required tools, plus CMake
+RUN $IDF_PATH/tools/idf_tools.py --non-interactive install required \
+  && $IDF_PATH/tools/idf_tools.py --non-interactive install cmake \
+  && $IDF_PATH/tools/idf_tools.py --non-interactive install-python-env \
+  && rm -rf $IDF_TOOLS_PATH/dist
 
 RUN mkdir -p $HOME/.ccache && \
   touch $HOME/.ccache/ccache.conf