Merge branch 'feature/idf_docker_updates_v4.1' into 'release/v4.1'
Enable ccache and use newer CMake in Docker image (backport v4.1) See merge request espressif/esp-idf!7481
This commit is contained in:
commit
eb11a748e7
1 changed files with 8 additions and 3 deletions
|
@ -8,7 +8,6 @@ RUN apt-get update && apt-get install -y \
|
|||
ca-certificates \
|
||||
ccache \
|
||||
check \
|
||||
cmake \
|
||||
curl \
|
||||
flex \
|
||||
git \
|
||||
|
@ -53,8 +52,14 @@ 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
|
||||
|
||||
# Ccache is installed, enable it by default
|
||||
ENV IDF_CCACHE_ENABLE=1
|
||||
|
||||
COPY entrypoint.sh /opt/esp/entrypoint.sh
|
||||
|
||||
|
|
Loading…
Reference in a new issue