alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'backport/v4.2/dockerfile_multiarch' into 'release/v4.2'

Browse Source 
Dockerfile working on x64/ARM (v4.2)

See merge request espressif/esp-idf!15520
This commit is contained in:
Roland Dobai 2021-10-18 14:17:16 +00:00
commit 4498749f38
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/docker/Dockerfile
View File

@ -3,7 +3,9 @@ FROM ubuntu:18.04
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
# We need libpython2.7 due to GDB tools # We need libpython2.7 due to GDB tools
RUN apt-get update && apt-get install -y \ RUN : \
&& apt-get update \
&& apt-get install -y \
apt-utils \ apt-utils \
bison \ bison \
ca-certificates \ ca-certificates \
@ -14,22 +16,25 @@ RUN apt-get update && apt-get install -y \
git \ git \
gperf \ gperf \
lcov \ lcov \
libffi-dev \
libncurses-dev \ libncurses-dev \
libpython2.7 \
libusb-1.0-0-dev \ libusb-1.0-0-dev \
make \ make \
ninja-build \ ninja-build \
libpython2.7 \
python3 \ python3 \
python3-pip \ python3-pip \
unzip \ unzip \
wget \ wget \
xz-utils \ xz-utils \
zip \ zip \
&& apt-get autoremove -y \ && apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& update-alternatives --install /usr/bin/python python /usr/bin/python3 10 && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \
&& python -m pip install --upgrade \
RUN python -m pip install --upgrade pip virtualenv pip \
virtualenv \
&& :
# To build the image for a branch or a tag of IDF, pass --build-arg IDF_CLONE_BRANCH_OR_TAG=name. # To build the image for a branch or a tag of IDF, pass --build-arg IDF_CLONE_BRANCH_OR_TAG=name.
# To build the image with a specific commit ID of IDF, pass --build-arg IDF_CHECKOUT_REF=commit-id. # To build the image with a specific commit ID of IDF, pass --build-arg IDF_CHECKOUT_REF=commit-id.
@ -54,15 +59,18 @@ RUN echo IDF_CHECKOUT_REF=$IDF_CHECKOUT_REF IDF_CLONE_BRANCH_OR_TAG=$IDF_CLONE_B
git submodule update --init --recursive; \ git submodule update --init --recursive; \
fi fi
# Install all the required tools, plus CMake # Install all the required tools
RUN $IDF_PATH/tools/idf_tools.py --non-interactive install required \ ARG CRYPTOGRAPHY_DONT_BUILD_RUST=1
RUN : \
&& update-ca-certificates --fresh \
&& $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 cmake \
&& $IDF_PATH/tools/idf_tools.py --non-interactive install-python-env \ && $IDF_PATH/tools/idf_tools.py --non-interactive install-python-env \
&& rm -rf $IDF_TOOLS_PATH/dist && rm -rf $IDF_TOOLS_PATH/dist \
&& :
# Ccache is installed, enable it by default # Ccache is installed, enable it by default
ENV IDF_CCACHE_ENABLE=1 ENV IDF_CCACHE_ENABLE=1
COPY entrypoint.sh /opt/esp/entrypoint.sh COPY entrypoint.sh /opt/esp/entrypoint.sh
ENTRYPOINT [ "/opt/esp/entrypoint.sh" ] ENTRYPOINT [ "/opt/esp/entrypoint.sh" ]

5
tools/tools.json
View File

@ -289,6 +289,11 @@
"size": 39517697, "size": 39517697,
"url": "https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4-Linux-x86_64.tar.gz" "url": "https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4-Linux-x86_64.tar.gz"
}, },
"linux-armel": {
"sha256": "f8bd050c2745f0dcc4b7cef9738bbfef775950a10f5bd377abb0062835e669dc",
"size": 13759084,
"url": "https://dl.espressif.com/dl/cmake/cmake-3.20.3-Linux-armv7l.tar.gz"
},
"macos": { "macos": {
"sha256": "f60e0ef96da48725cd8da7d6abe83cd9501167aa51625c90dd4d31081a631279", "sha256": "f60e0ef96da48725cd8da7d6abe83cd9501167aa51625c90dd4d31081a631279",
"size": 35802699, "size": 35802699,