docker build fixes

Dockerfile

@@ -13,11 +13,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libssl-dev \
     clang
 
+RUN ln -s /usr/bin/python3 /usr/bin/python & \
+    ln -s /usr/bin/pip3 /usr/bin/pip
+
 WORKDIR /scratch
 COPY script/wasm-deps.sh .
 RUN chmod a+x ./wasm-deps.sh && sleep 1 && ./wasm-deps.sh
-RUN ln -s /usr/bin/python3 /usr/bin/python & \
-    ln -s /usr/bin/pip3 /usr/bin/pip
 
 WORKDIR /app
 

rust-toolchain

@@ -1 +1 @@
-nightly-2024-07-19
+nightly-2024-08-30

script/wasm-deps.sh

@@ -21,29 +21,5 @@ EOF
 echo "Detected arch: $ARCH"
 
 if [ $ARCH == "aarch64" -o $ARCH == "armv71" ] ; then
-    apt-get install -y --no-install-recommends build-essential subversion ninja-build cmake
+    apt-get install -y --no-install-recommends build-essential cmake llvm lld
-    mkdir -p /scratch/src
-    cd /scratch/src
-    svn co http://llvm.org/svn/llvm-project/llvm/tags/RELEASE_900/final/ llvm
-    cd /scratch/src/llvm/tools
-    svn co http://llvm.org/svn/llvm-project/lld/tags/RELEASE_900/final/ lld
-    mkdir -p /scratch/build/arm
-    cd /scratch/build/arm
-    if [ "$ARCH" == "aarch64" ] ; then
-        cmake -G Ninja /scratch/src/llvm \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_INSTALL_PREFIX=/opt/local/llvm \
-            -DLLVM_TARGETS_TO_BUILD="AArch64" \
-            -DLLVM_TARGET_ARCH="AArch64"
-    else
-        cmake -G Ninja /scratch/src/llvm \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_INSTALL_PREFIX=/opt/local/llvm \
-            -DLLVM_TARGETS_TO_BUILD="ARM" \
-            -DLLVM_TARGET_ARCH="ARM"
-    fi
-    ninja lld
-    ninja install-lld
-    cd ~
-    rm -rf /scratch
 fi