Skip to content

Commit 88dd477

Browse files
committed
Use IDF-5.4.1
1 parent f416351 commit 88dd477

2 files changed

Lines changed: 20 additions & 18 deletions

File tree

Dockerfile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL description="This is a Docker Image for XRobot build."
77

88
RUN apt update
99

10-
RUN apt upgrade -y --no-install-recommends &&
10+
RUN apt upgrade -y --no-install-recommends && \
1111
apt install -y --no-install-recommends xz-utils git curl sudo wget zip make && apt install -y net-tools usbutils nano gdb cmake ninja-build file clang-18 clangd clang-tidy gcc g++ python3-tk python3.12-venv && apt clean
1212

1313
RUN ln -s /usr/bin/clang++-18 /usr/bin/clang++ && ln -s /usr/bin/clang-18 /usr/bin/clang
@@ -22,12 +22,13 @@ RUN wget https://github.com/cyberbotics/webots/releases/download/R2023a/webots_2
2222

2323
RUN ln -s /usr/bin/python3 /usr/bin/python && curl -sS https://bootstrap.pypa.io/get-pip.py | python3
2424

25-
RUN rm -rf ~/esp &&
26-
mkdir ~/esp &&
27-
cd ~/esp &&
28-
git clone --depth 1 --branch v5.4.1 https://github.com/espressif/esp-idf.git &&
29-
cd ./esp-idf &&
30-
git submodule update --init --recursive --recommend-shallow --depth 1 &&
31-
bash ./install.sh &&
32-
rm -rf .git &&
25+
RUN rm -rf ~/esp && \
26+
mkdir ~/esp && \
27+
cd ~/esp && \
28+
git clone --depth 1 --branch v5.4.1 https://github.com/espressif/esp-idf.git && \
29+
cd ./esp-idf && \
30+
git submodule update --init --recursive --recommend-shallow --depth 1 && \
31+
bash ./install.sh && \
32+
rm -rf .git && \
3333
chmod +x ./*sh
34+

esp32/Dockerfile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL description="This is a Docker Image for XRobot build."
77

88
RUN apt update
99

10-
RUN apt upgrade -y --no-install-recommends &&
10+
RUN apt upgrade -y --no-install-recommends && \
1111
apt install -y --no-install-recommends xz-utils git curl sudo wget zip make && apt install -y net-tools usbutils nano gdb cmake ninja-build file clang-18 clangd clang-tidy gcc g++ python3-tk python3.12-venv && apt clean
1212

1313
RUN ln -s /usr/bin/clang++-18 /usr/bin/clang++ && ln -s /usr/bin/clang-18 /usr/bin/clang
@@ -16,12 +16,13 @@ RUN sudo mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALL
1616

1717
RUN ln -s /usr/bin/python3 /usr/bin/python && curl -sS https://bootstrap.pypa.io/get-pip.py | python3
1818

19-
RUN rm -rf ~/esp &&
20-
mkdir ~/esp &&
21-
cd ~/esp &&
22-
git clone --depth 1 --branch v5.4.1 https://github.com/espressif/esp-idf.git &&
23-
cd ./esp-idf &&
24-
git submodule update --init --recursive --recommend-shallow --depth 1 &&
25-
bash ./install.sh &&
26-
rm -rf .git &&
19+
RUN rm -rf ~/esp && \
20+
mkdir ~/esp && \
21+
cd ~/esp && \
22+
git clone --depth 1 --branch v5.4.1 https://github.com/espressif/esp-idf.git && \
23+
cd ./esp-idf && \
24+
git submodule update --init --recursive --recommend-shallow --depth 1 && \
25+
bash ./install.sh && \
26+
rm -rf .git && \
2727
chmod +x ./*sh
28+

0 commit comments

Comments
 (0)