From bf6e745ac02cc51ed8ce19c947e6366709b25c12 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Fri, 24 Jan 2020 19:11:56 +0100 Subject: [PATCH 1/2] 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 05db8cb89b..ea14a4204b 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 COPY entrypoint.sh /opt/esp/entrypoint.sh From 70dee9f4bb97fa24cef261e127db96b579da7b17 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Fri, 24 Jan 2020 19:12:22 +0100 Subject: [PATCH 2/2] tools/docker: enable ccache by default --- tools/docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index ea14a4204b..ffb00124d4 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -58,6 +58,9 @@ RUN $IDF_PATH/tools/idf_tools.py --non-interactive install required \ && $IDF_PATH/tools/idf_tools.py --non-interactive install-python-env \ && rm -rf $IDF_TOOLS_PATH/dist +# Ccache is installed, enable it by default +ENV IDF_CCACHE_ENABLE=1 + COPY entrypoint.sh /opt/esp/entrypoint.sh ENTRYPOINT [ "/opt/esp/entrypoint.sh" ]