Upload 2 files

Dockerfile

@@ -8,7 +8,8 @@ ARG PLUGINS="" # Comma-separated list of plugin git URLs
 # Add unzip for extracting the application code
 # Keep git for potential use by scripts or future plugin updates
 # Add wget to download the zip file
-RUN apk add --no-cache gcompat tini git unzip wget
+# Add awk for entrypoint script string manipulation
+RUN apk add --no-cache gcompat tini git unzip wget awk
 
 # Create app directory
 WORKDIR ${APP_HOME}
@@ -31,36 +32,6 @@ RUN \
   echo "*** Root .gitignore removed (if it existed). ***"
 # --- END: Remove root .gitignore ---
 
-# --- BEGIN: Dynamically Clone Plugins from PLUGINS argument ---
-RUN \
-  if [ -n "$PLUGINS" ]; then \
-    echo "*** Cloning Plugins specified in PLUGINS argument: $PLUGINS ***" && \
-    apk add --no-cache --virtual .build-deps-parsing basename && \
-    # Set comma as delimiter
-    IFS=',' && \
-    # Loop through each plugin URL
-    for plugin_url in $PLUGINS; do \
-      # Trim leading/trailing whitespace (using sh compatible method)
-      plugin_url=$(echo "$plugin_url" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//') && \
-      if [ -z "$plugin_url" ]; then continue; fi && \
-      # Extract plugin name (basename of the URL, removing .git suffix)
-      plugin_name=$(basename "$plugin_url" .git) && \
-      plugin_dir="plugins/$plugin_name" && \
-      echo "--- Cloning $plugin_name from $plugin_url into $plugin_dir ---" && \
-      # Remove existing dir if it exists
-      rm -rf "$plugin_dir" && \
-      mkdir -p plugins && \
-      # Clone the plugin
-      git clone --depth 1 "$plugin_url" "$plugin_dir" || echo "WARN: Failed to clone $plugin_name from $plugin_url, skipping..."; \
-    done && \
-    # Reset IFS
-    unset IFS && \
-    apk del .build-deps-parsing; \
-  else \
-    echo "PLUGINS argument is empty or not set, skipping plugin cloning."; \
-  fi
-# --- END: Dynamically Clone Plugins ---
-
 # Install base SillyTavern dependencies (package*.json should be in the cloned root)
 RUN \
   echo "*** Install Base npm packages ***" && \
@@ -71,104 +42,106 @@ RUN \
     echo "No package.json found in root, skipping base npm install."; \
   fi
 
-# --- BEGIN: Dynamically Install Dependencies for Cloned Plugins ---
-RUN \
-  if [ -n "$PLUGINS" ]; then \
-    echo "*** Installing Dependencies for specified plugins ***" && \
-    apk add --no-cache --virtual .build-deps-parsing basename && \
-    IFS=',' && \
-    for plugin_url in $PLUGINS; do \
-      plugin_url=$(echo "$plugin_url" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//') && \
-      if [ -z "$plugin_url" ]; then continue; fi && \
-      plugin_name=$(basename "$plugin_url" .git) && \
-      plugin_dir="plugins/$plugin_name" && \
-      if [ -d "$plugin_dir" ] && [ -f "$plugin_dir/package.json" ]; then \
-        echo "--- Installing dependencies for $plugin_name in $plugin_dir ---" && \
-        cd "$plugin_dir" && \
-        npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev --force && npm cache clean --force && \
-        cd "${APP_HOME}"; \
-      elif [ -d "$plugin_dir" ]; then \
-        echo "--- No package.json found in $plugin_name, skipping dependency install. ---"; \
-      else \
-        echo "--- Plugin directory $plugin_dir not found (likely clone failed), skipping dependency install. ---"; \
-      fi; \
-    done && \
-    unset IFS && \
-    apk del .build-deps-parsing; \
-  else \
-    echo "PLUGINS argument is empty or not set, skipping plugin dependency installation."; \
-  fi
-# --- END: Dynamically Install Dependencies ---
-
-# Go back to the main app directory (redundant but safe)
-WORKDIR ${APP_HOME}
-
-# Create config directory. config.yaml will be handled at runtime by ENTRYPOINT
-RUN mkdir -p config
-
-# Pre-compile public libraries (build-lib.js should be in the unzipped structure)
-RUN \
-  echo "*** Run Webpack ***" && \
-  # Check if build-lib.js exists before running
-  if [ -f "./docker/build-lib.js" ]; then \
-    node "./docker/build-lib.js"; \
-  elif [ -f "./build-lib.js" ]; then \
-    node "./build-lib.js"; \
-  else \
-    echo "build-lib.js not found, skipping Webpack build."; \
-  fi
-
-# Cleanup unnecessary files (like the docker dir if it exists in the zip) and make entrypoint executable
-# This block is removed as we no longer use docker-entrypoint.sh
-# RUN \
-#  echo "*** Cleanup and Permissions ***" && \
-#  ...
-
-# Fix potential git safe.directory issues if git commands are run later by scripts
-RUN git config --global --add safe.directory "${APP_HOME}"
-
 # Ensure the node user owns the application directory and its contents
 RUN chown -R node:node ${APP_HOME}
 
+# Switch to non-root user
+USER node
+
 EXPOSE 8000
 
-# Entrypoint: Read config from environment variable CONFIG_YAML if set, copy default if not, configure git, then run node server.js directly
+# Entrypoint: Install plugins, Read config, Configure git, Run server
 ENTRYPOINT ["tini", "--", "sh", "-c", " \
+    # --- BEGIN: Install Plugins at Runtime --- \
+    if [ -n \"$PLUGINS\" ]; then \
+      echo '--- Found PLUGINS environment variable, attempting to install plugins ---'; \
+      # Ensure plugin dir exists \
+      mkdir -p plugins; \
+      # Use temp var and add trailing comma for loop robustness \
+      temp_plugins_var=\"$PLUGINS,\"; \
+      while [ -n \"$temp_plugins_var\" ]; do \
+        plugin_url=\"${temp_plugins_var%%,*}\"; # Get first element \
+        temp_plugins_var=\"${temp_plugins_var#*,}\"; # Remove first element \
+        \
+        # Trim leading/trailing whitespace using awk \
+        plugin_url=$(echo \"$plugin_url\" | awk '{$1=$1;print}'); \
+        \
+        if [ -z \"$plugin_url\" ]; then continue; fi; \
+        \
+        # Extract plugin name: remove .git suffix, then get basename \
+        plugin_name_tmp=\"${plugin_url%.git}\"; \
+        plugin_name=\"${plugin_name_tmp##*/}\"; \
+        \
+        if [ -z \"$plugin_name\" ]; then \
+          echo \"WARN: Could not extract plugin name from URL: $plugin_url, skipping.\"; \
+          continue; \
+        fi; \
+        \
+        plugin_dir=\"./plugins/$plugin_name\"; \
+        echo \"--- Processing plugin: $plugin_name from $plugin_url ---\"; \
+        \
+        # Clone (remove existing first) \
+        rm -rf \"$plugin_dir\"; \
+        echo \"Cloning into $plugin_dir...\"; \
+        if git clone --depth 1 \"$plugin_url\" \"$plugin_dir\"; then \
+          echo \"Cloned successfully.\"; \
+          # Install dependencies if package.json exists \
+          if [ -f \"$plugin_dir/package.json\" ]; then \
+            echo \"Found package.json, installing dependencies for $plugin_name...\"; \
+            # Run npm install within the plugin directory \
+            (cd \"$plugin_dir\" && npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev --force && npm cache clean --force); \
+            if [ \$? -ne 0 ]; then \
+                echo \"WARN: Failed to install dependencies for $plugin_name\"; \
+            else \
+                echo \"Dependencies installed for $plugin_name.\"; \
+            fi; \
+          else \
+            echo \"No package.json found for $plugin_name, skipping dependency install.\"; \
+          fi; \
+        else \
+          echo \"WARN: Failed to clone $plugin_name from $plugin_url, skipping further processing.\"; \
+        fi; \
+      done; \
+      echo '--- Finished processing plugins ---'; \
+    else \
+      echo '--- PLUGINS environment variable not set or empty, skipping plugin installation ---'; \
+    fi; \
+    \
+    # --- Original Entrypoint logic --- \
     echo '--- Checking for CONFIG_YAML environment variable ---'; \
-    # Ensure the CWD has correct permissions for writing config.yaml
-    # mkdir -p ./config && chown node:node ./config; # Removed mkdir
+    # Ensure the CWD has correct permissions for writing config.yaml \
+    # mkdir -p ./config && chown node:node ./config; # Removed mkdir \
     if [ -n \"$CONFIG_YAML\" ]; then \
       echo 'Environment variable CONFIG_YAML found. Writing to ./config.yaml (root directory)...'; \
-      # Write directly to ./config.yaml in the CWD
+      # Write directly to ./config.yaml in the CWD \
+      # Need to ensure node user has write permission here. CWD should be owned by node due to chown and USER node. \
       printf '%s\n' \"$CONFIG_YAML\" > ./config.yaml && \
-      chown node:node ./config.yaml && \
-      echo 'Config written to ./config.yaml and permissions set successfully.'; \
-      # --- BEGIN DEBUG: Print the written config file ---
+      echo 'Config written to ./config.yaml successfully.'; \
+      # --- BEGIN DEBUG: Print the written config file --- \
       echo '--- Verifying written ./config.yaml ---'; \
       cat ./config.yaml; \
       echo '--- End of ./config.yaml ---'; \
-      # --- END DEBUG ---
+      # --- END DEBUG --- \
     else \
       echo 'Warning: Environment variable CONFIG_YAML is not set or empty. Attempting to copy default config...'; \
-      # Copy default if ENV VAR is missing and the example exists
+      # Copy default if ENV VAR is missing and the example exists \
       if [ -f \"./public/config.yaml.example\" ]; then \
-          # Copy default to ./config.yaml in the CWD
+          # Copy default to ./config.yaml in the CWD \
           cp \"./public/config.yaml.example\" \"./config.yaml\" && \
-          chown node:node ./config.yaml && \
           echo 'Copied default config to ./config.yaml'; \
       else \
           echo 'Warning: Default config ./public/config.yaml.example not found.'; \
       fi; \
     fi; \
-
-    # --- BEGIN: Configure Git default identity at Runtime ---
+    \
+    # --- BEGIN: Configure Git default identity at Runtime --- \
     echo '--- Configuring Git default user identity at runtime ---'; \
     git config --global user.name \"SillyTavern Sync\" && \
     git config --global user.email \"sillytavern-sync@example.com\"; \
     echo '--- Git identity configured for runtime user. ---'; \
-    # --- END: Configure Git default identity at Runtime ---
-
+    # --- END: Configure Git default identity at Runtime --- \
+    \
     echo 'Starting SillyTavern server directly...'; \
-    # Execute node server directly, bypassing docker-entrypoint.sh
+    # Execute node server directly. Since we used USER node, this should run as the node user. \
     exec node server.js; \
   "]