install nvm/node/npm within philo install dir

Author: clovis

Dockerfile

@@ -10,17 +10,7 @@ RUN apt-get update && apt-get upgrade -y && \
     apt-get install -y --no-install-recommends libxml2-dev libxslt-dev zlib1g-dev apache2 libgdbm-dev liblz4-tool brotli ripgrep gcc make wget sudo && \
     apt-get clean && rm -rf /var/lib/apt
 
-# Install nvm and Node.js
-ENV NVM_DIR=/root/.nvm
-ENV NODE_VERSION=22.14.0
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash \
-    && . $NVM_DIR/nvm.sh \
-    && nvm install $NODE_VERSION \
-    && nvm alias default $NODE_VERSION \
-    && nvm use default
-ENV PATH=$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
-
-# Install PhiloLogic
+# Install PhiloLogic (nvm and Node.js are installed by install.sh)
 COPY . /PhiloLogic5
 WORKDIR /PhiloLogic5
 RUN ./install.sh && a2enmod rewrite && a2enmod cgi && a2enmod brotli && a2enmod headers && mkdir -p /var/www/html/philologic

install.sh

@@ -3,6 +3,7 @@
 # Default Python version
 PYTHON_VERSION="3.12"
 INSTALL_TRANSFORMERS=false
+NODE_MAJOR_VERSION="22"
 
 # Parse command line arguments
 while getopts "p:t" opt; do
@@ -37,6 +38,32 @@ if [ -d /var/lib/philologic5 ]; then
     sudo rm -rf /var/lib/philologic5
 fi
 
+# Install nvm and Node.js to a shared location
+echo -e "\n## INSTALLING NVM AND NODE.JS ##"
+export NVM_DIR=/var/lib/philologic5/nvm
+sudo mkdir -p "$NVM_DIR"
+sudo chown -R $USER:$USER "$NVM_DIR"
+
+# Install nvm
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
+
+# Source nvm and install Node.js (latest in the major version series)
+source "$NVM_DIR/nvm.sh"
+nvm install $NODE_MAJOR_VERSION
+nvm alias default $NODE_MAJOR_VERSION
+nvm use default
+
+# Verify node installation
+echo "Node.js version: $(node --version)"
+echo "npm version: $(npm --version)"
+
+# Create symlink to npm in a fixed location
+sudo mkdir -p /var/lib/philologic5/bin
+sudo ln -sf "$(which npm)" /var/lib/philologic5/bin/npm
+
+# Make nvm directory accessible to all users
+sudo chmod -R 755 "$NVM_DIR"
+
 # Create base directory with write permissions for current user
 sudo mkdir -p /var/lib/philologic5
 sudo chown -R $USER:$USER /var/lib/philologic5
@@ -86,8 +113,8 @@ deactivate
 cd ..
 
 # Install philoload5 script
-# Use absolute path to venv's Python to avoid PATH issues
-echo -e '#!/bin/bash\n/var/lib/philologic5/philologic_env/bin/python3 -m philologic.loadtime "$@"' > philoload5 && sudo mv philoload5 /usr/local/bin/
+echo -e '#!/bin/bash\n/var/lib/philologic5/philologic_env/bin/python3 -m philologic.loadtime "$@"' > philoload5
+sudo mv philoload5 /usr/local/bin/
 sudo chmod 775 /usr/local/bin/philoload5
 sudo mkdir -p /etc/philologic/
 sudo mkdir -p /var/lib/philologic5/web_app/

python/philologic/loadtime/Loader.py

@@ -1181,8 +1181,9 @@ def finish(self):
         os.chdir(self.web_app_dir)
         with open(os.path.join(self.web_app_dir, "appConfig.json"), "w") as app_config:
             dump({"dbUrl": ""}, app_config)
+        npm = "/var/lib/philologic5/bin/npm"
         os.system(
-            f"cd {self.web_app_dir}; npm install > {self.web_app_dir}/web_app_build.log 2>&1 && npm run build >> {self.web_app_dir}/web_app_build.log 2>&1"
+            f"cd {self.web_app_dir}; {npm} install > {self.web_app_dir}/web_app_build.log 2>&1 && {npm} run build >> {self.web_app_dir}/web_app_build.log 2>&1"
         )
         print("done.")