From 6c9d5f542b399a917c2ab84cf5e6ec65a110e5a1 Mon Sep 17 00:00:00 2001
From: geens <niels.geens@gmail.com>
Date: Wed, 21 May 2025 07:37:14 +0200
Subject: [PATCH] Fix node install and make mock_llm script executable

---
 Dockerfile           |  9 ++++-----
 scripts/bootstrap.sh | 13 ++++++-------
 scripts/mock_llm.sh  |  0
 3 files changed, 10 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 scripts/mock_llm.sh

diff --git a/Dockerfile b/Dockerfile
index 078ac66..b7895ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,17 +25,16 @@ RUN apt-get update && \
     apt-get install -y \
     google-chrome-stable
 
+# Install Node.js
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
+RUN apt-get install -y nodejs
+
 RUN rm -rf /var/lib/apt/lists/*
 
 # Install Rust
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
-# Install Node.js
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
-ENV NVM_DIR=/root/.nvm
-RUN . "$NVM_DIR/nvm.sh" && nvm install node
-
 # Install llama.cpp
 RUN curl -O https://git.nielsgeens.be/api/packages/llm/generic/llama.cpp/b5269/llama.cpp.tar
 RUN tar -xf /llama.cpp.tar -C /usr/local/bin --wildcards --no-anchored "llama-*"
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index b4467ff..e598cc4 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -53,18 +53,17 @@ if [ -z "${SIA_INSTALL_NO_ITB}" ]; then
         google-chrome-stable
 fi
 
-# Install Rust
-curl https://sh.rustup.rs -sSf | bash -s -- -y
-export PATH="/root/.cargo/bin:${PATH}"
-
 # Install Node.js
 if [ -z "${SIA_INSTALL_NO_CORE}" ]; then
     echo "Installing Node.js..."
-    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
-    export NVM_DIR=/root/.nvm
-    . "$NVM_DIR/nvm.sh" && nvm install node
+    curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
+    apt-get install -y nodejs
 fi
 
+# Install Rust
+curl https://sh.rustup.rs -sSf | bash -s -- -y
+export PATH="/root/.cargo/bin:${PATH}"
+
 # Install llama.cpp
 cd /
 curl -O https://git.nielsgeens.be/api/packages/llm/generic/llama.cpp/b5269/llama.cpp.tar
diff --git a/scripts/mock_llm.sh b/scripts/mock_llm.sh
old mode 100644
new mode 100755