Use real st-arm-clang.

Author: Jiu-xiao

stm32/Dockerfile

@@ -7,22 +7,25 @@ LABEL description="This is a Docker Image for XRobot build."
 
 RUN apt update
 
-RUN apt upgrade -y --no-install-recommends && 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-tidy gcc g++ python3-tk && apt clean
-
-RUN wget https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-19.1.5/LLVM-ET-Arm-19.1.5-Linux-x86_64.tar.xz && tar -xvf LLVM-ET-Arm-19.1.5-Linux-x86_64.tar.xz && rm LLVM-ET-Arm-19.1.5-Linux-x86_64.tar.xz && mv LLVM-ET-Arm-19.1.5-Linux-x86_64 /opt && sudo ln -s /opt/LLVM-ET-Arm-19.1.5-Linux-x86_64/bin/* /usr/bin
-
-RUN for pair in \
-      "clang:clang" \
-      "clang++:clang++" \
-      "llvm-objcopy:objcopy" \
-      "llvm-size:size" \
-      "llvm-ar:ar" \
-      "llvm-nm:nm" \
-      "llvm-strip:strip"; do \
-    src=$(echo $pair | cut -d: -f1); \
-    tgt=$(echo $pair | cut -d: -f2); \
-    ln -sf /opt/LLVM-ET-Arm-19.1.5-Linux-x86_64/bin/$src /usr/bin/starm-$tgt; \
-  done
+RUN apt upgrade -y --no-install-recommends && apt install -y --no-install-recommends xz-utils git curl sudo wget zip unzip make && apt install -y net-tools usbutils util-linux expect nano gdb cmake ninja-build file clang-tidy gcc g++ python3-tk && apt clean
+
+RUN curl -L -o stm32cube-ide-core.vsix \
+      -H "Accept: application/octet-stream" \
+      -A "Mozilla/5.0" \
+      "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/stmicroelectronics/vsextensions/stm32cube-ide-core/latest/vspackage" && \
+    mv stm32cube-ide-core.vsix stm32cube-ide-core.vsix.gz && \
+    gunzip stm32cube-ide-core.vsix.gz && \
+    unzip stm32cube-ide-core.vsix && \
+    expect -c 'spawn extension/resources/binaries/linux/x86_64/cube bundle download st-arm-clang; set timeout -1; expect { -re "Proceed with download (yes, no)?" { send "yes\r"; exp_continue }; eof }' && \
+    BUNDLE_FILE=$(ls -t *.bundle | head -n1) && \
+    mkdir -p /opt/st-arm-clang && \
+    unzip "$BUNDLE_FILE" -d /opt/st-arm-clang && \
+    rm -rf extension *.bundle *.vsix stm32cube-ide-core.vsix.gz
+
+RUN for exe in /opt/st-arm-clang/bin/*; do \
+      ln -sf "$exe" /usr/bin/$(basename "$exe"); \
+    done
+
 
 RUN sudo mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.bk