Skip to content

Commit 37edc8f

Browse files
committed
Merge branch 'feature/idf_docker_updates' into 'master'
Docker image improvements Closes IDFGH-2559 See merge request espressif/esp-idf!7454
2 parents f74b83b + 287d003 commit 37edc8f

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

tools/docker/Dockerfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ RUN apt-get update && apt-get install -y \
88
ca-certificates \
99
ccache \
1010
check \
11-
cmake \
1211
curl \
1312
flex \
1413
git \
@@ -53,8 +52,14 @@ RUN echo IDF_CHECKOUT_REF=$IDF_CHECKOUT_REF IDF_CLONE_BRANCH_OR_TAG=$IDF_CLONE_B
5352
git submodule update --init --recursive; \
5453
fi
5554

56-
RUN $IDF_PATH/install.sh && \
57-
rm -rf $IDF_TOOLS_PATH/dist
55+
# Install all the required tools, plus CMake
56+
RUN $IDF_PATH/tools/idf_tools.py --non-interactive install required \
57+
&& $IDF_PATH/tools/idf_tools.py --non-interactive install cmake \
58+
&& $IDF_PATH/tools/idf_tools.py --non-interactive install-python-env \
59+
&& rm -rf $IDF_TOOLS_PATH/dist
60+
61+
# Ccache is installed, enable it by default
62+
ENV IDF_CCACHE_ENABLE=1
5863

5964
COPY entrypoint.sh /opt/esp/entrypoint.sh
6065

0 commit comments

Comments
 (0)