Bläddra i källkod

tools/docker: install CMake version provided in tools.json

Closes https://github.com/espressif/esp-idf/issues/4644
Closes IDFGH-2559
Ivan Grokhotkov 6 år sedan
förälder
incheckning
1b0473494f
1 ändrade filer med 5 tillägg och 3 borttagningar
  1. 5 3
      tools/docker/Dockerfile

+ 5 - 3
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
 
 COPY entrypoint.sh /opt/esp/entrypoint.sh