Upload Dockerfile

Dockerfile

@@ -73,163 +73,183 @@ RUN chown -R node:node ${APP_HOME}
 
 EXPOSE 8000
 
-# Create love.sh script with keep-alive logic
-RUN printf '%s\n' '\
-#!/bin/sh\n\n\
-# Original ENTRYPOINT logic\n\
-echo \'--- Attempting to update SillyTavern Core from GitHub (staging branch) ---\'; \\n\
-if [ -d \".git\" ] && [ \"$(git rev-parse --abbrev-ref HEAD)\" = \"staging\" ]; then \\n\
-echo \'Existing staging branch found. Resetting and pulling latest changes...\'; \\n\
-git reset --hard HEAD && \\n\
-git pull origin staging || echo \'WARN: git pull failed, continuing with code from build time.\'; \\n\
-echo \'--- SillyTavern Core update check finished. ---\'; \\n\
-else \\n\
-echo \'WARN: .git directory not found or not on staging branch. Skipping runtime update. Code from build time will be used.\'; \\n\
-fi; \\n\
-\n\
-echo \'--- Checking for CONFIG_YAML environment variable ---\'; \\n\
-if [ -n \"$CONFIG_YAML\" ]; then \\n\
-echo \'Environment variable CONFIG_YAML found. Writing to ./config.yaml (root directory)...\'; \\n\
-printf \'%s\\n\' \"$CONFIG_YAML\" > ./config.yaml && \\n\
-chown node:node ./config.yaml && \\n\
-echo \'Config written to ./config.yaml and permissions set successfully.\'; \\n\
-echo \'--- Verifying written ./config.yaml ---\'; \\n\
-cat ./config.yaml; \\n\
-echo \'--- End of ./config.yaml ---\'; \\n\
-else \\n\
-echo \'Warning: Environment variable CONFIG_YAML is not set or empty. Attempting to copy default config...\'; \\n\
-if [ -f \"./public/config.yaml.example\" ]; then \\n\
-cp \"./public/config.yaml.example\" \"./config.yaml\" && \\n\
-chown node:node ./config.yaml && \\n\
-echo \'Copied default config to ./config.yaml\'; \\n\
-else \\n\
-echo \'Warning: Default config ./public/config.yaml.example not found.\'; \\n\
-fi; \\n\
-fi; \\n\
-\n\
-echo \'--- Configuring Git default user identity at runtime ---\'; \\n\
-git config --global user.name \"SillyTavern Sync\" && \\n\
-git config --global user.email \"[email protected]\"; \\n\
-echo \'--- Git identity configured for runtime user. ---\'; \\n\
-\n\
-echo \'--- Checking for PLUGINS environment variable ---\'; \\n\
-if [ -n \"$PLUGINS\" ]; then \\n\
-echo \"*** Installing Plugins specified in PLUGINS environment variable: $PLUGINS ***\" && \\n\
-mkdir -p ./plugins && chown node:node ./plugins && \\n\
-IFS=',' && \\n\
-for plugin_url in $PLUGINS; do \\n\
-plugin_url=$(echo \"$plugin_url\" | sed \'s/^[[:space:]]*//;s/[[:space:]]*$//\') && \\n\
-if [ -z \"$plugin_url\" ]; then continue; fi && \\n\
-plugin_name_git=$(basename \"$plugin_url\") && \\n\
-plugin_name=${plugin_name_git%.git} && \\n\
-plugin_dir=\"./plugins/$plugin_name\" && \\n\
-echo \"--- Installing plugin: $plugin_name from $plugin_url into $plugin_dir ---\" && \\n\
-rm -rf \"$plugin_dir\" && \\n\
-git clone --depth 1 \"$plugin_url\" \"$plugin_dir\" && \\n\
-if [ -f \"$plugin_dir/package.json\" ]; then \\n\
-echo \"--- Installing dependencies for $plugin_name ---\" && \\n\
-(cd \"$plugin_dir\" && npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev --force && npm cache clean --force) || echo \"WARN: Failed to install dependencies for $plugin_name\"; \\n\
-else \\n\
-echo \"--- No package.json found for $plugin_name, skipping dependency install. ---\"; \\n\
-fi || echo \"WARN: Failed to clone $plugin_name from $plugin_url, skipping...\"; \\n\
-done && \\n\
-unset IFS && \\n\
-echo \"--- Setting permissions for plugins directory ---\" && \\n\
-chown -R node:node ./plugins && \\n\
-echo \"*** Plugin installation finished. ***\"; \\n\
-else \\n\
-echo \'PLUGINS environment variable is not set or empty, skipping runtime plugin installation.\'; \\n\
-fi; \\n\
-\n\
-echo \'--- Checking for cloud-saves plugin auto-configuration ---\'; \\n\
-if [ -d \"./plugins/cloud-saves\" ] && [ -n \"$REPO_URL\" ] && [ -n \"$GITHUB_TOKEN\" ]; then \\n\
-*** Auto-configuring cloud-saves plugin with provided secrets ***\" && \\n\
-config_file=\"./plugins/cloud-saves/config.json\" && \\n\
-echo \"--- Creating config.json for cloud-saves plugin at $config_file ---\" && \\n\
-printf \'{\\n  \"repo_url\": \\"%s\\\",\\n  \"branch\\\": \\"main\\\",\\n  \"username\\\": \\"\\\",\\n  \"github_token\\\": \\"%s\\\",\\n  \"display_name\\\": \\"user\\\",\\n  \"is_authorized\\\": true,\\n  \"last_save\\\": null,\\n  \"current_save\\\": null,\\n  \"has_temp_stash\\\": false,\\n  \"autoSaveEnabled\\\": false,\\n  \"autoSaveInterval\\\": %s,\\n  \"autoSaveTargetTag\\\": \\"%s\\\"\\n}\\n\' \"$REPO_URL\" \"$GITHUB_TOKEN\" \"${AUTOSAVE_INTERVAL:-30}\" \"${AUTOSAVE_TARGET_TAG:-}\" > \"$config_file\" && \\n\
-chown node:node \"$config_file\" && \\n\
-echo \"*** cloud-saves plugin auto-configuration completed ***\"; \\n\
-else \\n\
-if [ ! -d \"./plugins/cloud-saves\" ]; then \\n\
-echo \'cloud-saves plugin not found, skipping auto-configuration.\'; \\n\
-elif [ -z \"$REPO_URL\" ] || [ -z \"$GITHUB_TOKEN\" ]; then \\n\
-echo \'REPO_URL or GITHUB_TOKEN environment variables not provided, skipping cloud-saves auto-configuration.\'; \\n\
-fi; \\n\
-fi; \\n\
-\n\
-echo \'--- Checking for EXTENSIONS environment variable ---\'; \\n\
-if [ -n \"$EXTENSIONS\" ]; then \\n\
-echo \"*** Installing Extensions specified in EXTENSIONS environment variable: $EXTENSIONS ***\" && \\n\
-if [ \"$INSTALL_FOR_ALL_USERS\" = \"true\" ]; then \\n\
-ext_install_dir=\"./public/scripts/extensions/third-party\" && \\n\
-echo \"--- Installing extensions for all users (system-wide) to $ext_install_dir ---\"; \\n\
-else \\n\
-ext_install_dir=\"./data/default-user/extensions\" && \\n\
-echo \"--- Installing extensions for default user only to $ext_install_dir ---\"; \\n\
-fi && \\n\
-mkdir -p \"$ext_install_dir\" && chown node:node \"$ext_install_dir\" && \\n\
-IFS=',' && \\n\
-for ext_url in $EXTENSIONS; do \\n\
-ext_url=$(echo \"$ext_url\" | sed \'s/^[[:space:]]*//;s/[[:space:]]*$//\') && \\n\
-if [ -z \"$ext_url\" ]; then continue; fi && \\n\
-ext_name_git=$(basename \"$ext_url\") && \\n\
-ext_name=${ext_name_git%.git} && \\n\
-ext_dir=\"$ext_install_dir/$ext_name\" && \\n\
-echo \"--- Installing extension: $ext_name from $ext_url into $ext_dir ---\" && \\n\
-rm -rf \"$ext_dir\" && \\n\
-git clone --depth 1 \"$ext_url\" \"$ext_dir\" && \\n\
-if [ -f \"$ext_dir/package.json\" ]; then \\n\
-echo \"--- Installing dependencies for extension $ext_name ---\" && \\n\
-(cd \"$ext_dir\" && npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev --force && npm cache clean --force) || echo \"WARN: Failed to install dependencies for extension $ext_name\"; \\n\
-else \\n\
-echo \"--- No package.json found for extension $ext_name, skipping dependency install. ---\"; \\n\
-fi || echo \"WARN: Failed to clone extension $ext_name from $ext_url, skipping...\"; \\n\
-done && \\n\
-unset IFS && \\n\
-echo \"--- Setting permissions for extensions directory ---\" && \\n\
-chown -R node:node \"$ext_install_dir\" && \\n\
-echo \"*** Extension installation finished. ***\"; \\n\
-else \\n\
-echo \'EXTENSIONS environment variable is not set or empty, skipping runtime extension installation.\'; \\n\
-fi; \\n\
-\n\
-echo \'--- Cleanup before start ---\'; \\n\
-echo \'Attempting final removal of .gitignore...\' && \\n\
-rm -f .gitignore && \\n\
-if [ ! -e .gitignore ]; then \\n\
-echo \'.gitignore successfully removed.\'; \\n\
-else \\n\
-echo \'WARN: .gitignore could not be removed or reappeared.\'; \\n\
-fi; \\n\
-echo \'Attempting final removal of .git directory...\' && \\n\
-rm -rf .git && \\n\
-if [ ! -d .git ]; then \\n\
-echo \'.git directory successfully removed.\'; \\n\
-else \\n\
-echo \'WARN: .git directory could not be removed.\'; \\n\
-fi; \\n\
-\n\
-# Start SillyTavern in the background\n\
-echo \'Starting SillyTavern server in the background...\'; \\n\
-node server.js & \\n\
-\n\
-# Wait for SillyTavern to be responsive (Health Check)\n\
-echo \'Waiting for SillyTavern to become responsive on port 8000...\'; \\n\
-until curl --output /dev/null --silent --head --fail http://localhost:8000/; do \\n\
-echo \'SillyTavern is still starting or not responding, waiting 5 seconds...\'; \\n\
-sleep 5 \\n\
-done \\n\
-echo \'SillyTavern started successfully!\'; \\n\
-\n\
-# Start the keep-alive loop\n\
-echo \'Starting periodic keep-alive (every 30 minutes)...\'; \\n\
-while true; do \\n\
-echo \'Sending keep-alive request...\'; \\n\
-curl http://localhost:8000/; \\n\
-echo \'Keep-alive request sent.\'; \\n\
-sleep 1800; \\n\
-done\n' > love.sh && \
-    chmod +x love.sh
-
-# Entrypoint: Execute the love.sh script using tini
-ENTRYPOINT ["tini", "--", "./love.sh"]
+# Entrypoint: Read config from environment variable CONFIG_YAML if set, copy default if not, configure git, then run node server.js directly
+ENTRYPOINT ["tini", "--", "sh", "-c", " \
+    # --- BEGIN: Update SillyTavern Core at Runtime --- \
+    echo '--- Attempting to update SillyTavern Core from GitHub (staging branch) ---'; \
+    if [ -d \".git\" ] && [ \"$(git rev-parse --abbrev-ref HEAD)\" = \"staging\" ]; then \
+      echo 'Existing staging branch found. Resetting and pulling latest changes...'; \
+      git reset --hard HEAD && \
+      git pull origin staging || echo 'WARN: git pull failed, continuing with code from build time.'; \
+      echo '--- SillyTavern Core update check finished. ---'; \
+    else \
+      echo 'WARN: .git directory not found or not on staging branch. Skipping runtime update. Code from build time will be used.'; \
+    fi; \
+    # --- END: Update SillyTavern Core at Runtime --- \
+
+    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
+    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
+      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 '--- Verifying written ./config.yaml ---'; \
+      cat ./config.yaml; \
+      echo '--- End of ./config.yaml ---'; \
+      # --- 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
+      if [ -f \"./public/config.yaml.example\" ]; then \
+          # 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 --- \
+    echo '--- Configuring Git default user identity at runtime ---'; \
+    git config --global user.name \"SillyTavern Sync\" && \
+    git config --global user.email \"[email protected]\"; \
+    echo '--- Git identity configured for runtime user. ---'; \
+    # --- END: Configure Git default identity at Runtime --- \
+
+    # --- BEGIN: Dynamically Install Plugins at Runtime --- \
+    echo '--- Checking for PLUGINS environment variable ---'; \
+    if [ -n \"$PLUGINS\" ]; then \
+      echo \"*** Installing Plugins specified in PLUGINS environment variable: $PLUGINS ***\" && \
+      # Ensure plugins directory exists
+      mkdir -p ./plugins && chown node:node ./plugins && \
+      # Set comma as delimiter
+      IFS=',' && \
+      # Loop through each plugin URL
+      for plugin_url in $PLUGINS; do \
+        # Trim leading/trailing whitespace
+        plugin_url=$(echo \"$plugin_url\" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//') && \
+        if [ -z \"$plugin_url\" ]; then continue; fi && \
+        # Extract plugin name
+        plugin_name_git=$(basename \"$plugin_url\") && \
+        plugin_name=${plugin_name_git%.git} && \
+        plugin_dir=\"./plugins/$plugin_name\" && \
+        echo \"--- Installing plugin: $plugin_name from $plugin_url into $plugin_dir ---\" && \
+        # Remove existing dir if it exists
+        rm -rf \"$plugin_dir\" && \
+        # Clone the plugin (run as root, fix perms later)
+        git clone --depth 1 \"$plugin_url\" \"$plugin_dir\" && \
+        if [ -f \"$plugin_dir/package.json\" ]; then \
+          echo \"--- Installing dependencies for $plugin_name ---\" && \
+          (cd \"$plugin_dir\" && npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev --force && npm cache clean --force) || echo \"WARN: Failed to install dependencies for $plugin_name\"; \
+        else \
+           echo \"--- No package.json found for $plugin_name, skipping dependency install. ---\"; \
+        fi || echo \"WARN: Failed to clone $plugin_name from $plugin_url, skipping...\"; \
+      done && \
+      # Reset IFS
+      unset IFS && \
+      # Fix permissions for plugins directory after installation
+      echo \"--- Setting permissions for plugins directory ---\" && \
+      chown -R node:node ./plugins && \
+      echo \"*** Plugin installation finished. ***\"; \
+    else \
+      echo 'PLUGINS environment variable is not set or empty, skipping runtime plugin installation.'; \
+    fi; \
+    # --- END: Dynamically Install Plugins at Runtime --- \
+
+    # --- BEGIN: Auto-configure cloud-saves plugin if secrets provided --- \
+    echo '--- Checking for cloud-saves plugin auto-configuration ---'; \
+    if [ -d \"./plugins/cloud-saves\" ] && [ -n \"$REPO_URL\" ] && [ -n \"$GITHUB_TOKEN\" ]; then \
+      echo \"*** Auto-configuring cloud-saves plugin with provided secrets ***\" && \
+      config_file=\"./plugins/cloud-saves/config.json\" && \
+      echo \"--- Creating config.json for cloud-saves plugin at $config_file ---\" && \
+      printf '{\\n  \"repo_url\": \"%s\",\\n  \"branch\": \"main\",\\n  \"username\": \"\",\\n  \"github_token\": \"%s\",\\n  \"display_name\": \"user\",\\n  \"is_authorized\": true,\\n  \"last_save\": null,\\n  \"current_save\": null,\\n  \"has_temp_stash\": false,\\n  \"autoSaveEnabled\": false,\\n  \"autoSaveInterval\": %s,\\n  \"autoSaveTargetTag\": \"%s\"\\n}\\n' \"$REPO_URL\" \"$GITHUB_TOKEN\" \"${AUTOSAVE_INTERVAL:-30}\" \"${AUTOSAVE_TARGET_TAG:-}\" > \"$config_file\" && \
+      chown node:node \"$config_file\" && \
+      echo \"*** cloud-saves plugin auto-configuration completed ***\"; \
+    else \
+      if [ ! -d \"./plugins/cloud-saves\" ]; then \
+        echo 'cloud-saves plugin not found, skipping auto-configuration.'; \
+      elif [ -z \"$REPO_URL\" ] || [ -z \"$GITHUB_TOKEN\" ]; then \
+        echo 'REPO_URL or GITHUB_TOKEN environment variables not provided, skipping cloud-saves auto-configuration.'; \
+      fi; \
+    fi; \
+    # --- END: Auto-configure cloud-saves plugin --- \
+
+    # --- BEGIN: Dynamically Install Extensions at Runtime --- \
+    echo '--- Checking for EXTENSIONS environment variable ---'; \
+    if [ -n \"$EXTENSIONS\" ]; then \
+      echo \"*** Installing Extensions specified in EXTENSIONS environment variable: $EXTENSIONS ***\" && \
+      # Determine extension installation directory based on INSTALL_FOR_ALL_USERS
+      if [ \"$INSTALL_FOR_ALL_USERS\" = \"true\" ]; then \
+        ext_install_dir=\"./public/scripts/extensions/third-party\" && \
+        echo \"--- Installing extensions for all users (system-wide) to $ext_install_dir ---\"; \
+      else \
+        ext_install_dir=\"./data/default-user/extensions\" && \
+        echo \"--- Installing extensions for default user only to $ext_install_dir ---\"; \
+      fi && \
+      # Ensure extension directory exists
+      mkdir -p \"$ext_install_dir\" && chown node:node \"$ext_install_dir\" && \
+      # Set comma as delimiter
+      IFS=',' && \
+      # Loop through each extension URL
+      for ext_url in $EXTENSIONS; do \
+        # Trim leading/trailing whitespace
+        ext_url=$(echo \"$ext_url\" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//') && \
+        if [ -z \"$ext_url\" ]; then continue; fi && \
+        # Extract extension name
+        ext_name_git=$(basename \"$ext_url\") && \
+        ext_name=${ext_name_git%.git} && \
+        ext_dir=\"$ext_install_dir/$ext_name\" && \
+        echo \"--- Installing extension: $ext_name from $ext_url into $ext_dir ---\" && \
+        # Remove existing dir if it exists
+        rm -rf \"$ext_dir\" && \
+        # Clone the extension (run as root, fix perms later)
+        git clone --depth 1 \"$ext_url\" \"$ext_dir\" && \
+        if [ -f \"$ext_dir/package.json\" ]; then \
+          echo \"--- Installing dependencies for extension $ext_name ---\" && \
+          (cd \"$ext_dir\" && npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev --force && npm cache clean --force) || echo \"WARN: Failed to install dependencies for extension $ext_name\"; \
+        else \
+           echo \"--- No package.json found for extension $ext_name, skipping dependency install. ---\"; \
+        fi || echo \"WARN: Failed to clone extension $ext_name from $ext_url, skipping...\"; \
+      done && \
+      # Reset IFS
+      unset IFS && \
+      # Fix permissions for extensions directory after installation
+      echo \"--- Setting permissions for extensions directory ---\" && \
+      chown -R node:node \"$ext_install_dir\" && \
+      echo \"*** Extension installation finished. ***\"; \
+    else \
+      echo 'EXTENSIONS environment variable is not set or empty, skipping runtime extension installation.'; \
+    fi; \
+    # --- END: Dynamically Install Extensions at Runtime --- \
+
+    echo 'Starting SillyTavern server directly...'; \
+
+    # --- BEGIN: Cleanup before start --- \
+    # Remove .gitignore
+    echo 'Attempting final removal of .gitignore...' && \
+    rm -f .gitignore && \
+    if [ ! -e .gitignore ]; then \
+      echo '.gitignore successfully removed.'; \
+    else \
+      # This case is unlikely with rm -f unless permissions prevent removal
+      echo 'WARN: .gitignore could not be removed or reappeared.'; \
+    fi; \
+    # Remove .git directory
+    echo 'Attempting final removal of .git directory...' && \
+    rm -rf .git && \
+    if [ ! -d .git ]; then \
+      echo '.git directory successfully removed.'; \
+    else \
+      # This case usually indicates a permission issue
+      echo 'WARN: .git directory could not be removed.'; \
+    fi; \
+    # --- END: Cleanup before start --- \
+
+    # Execute node server directly, bypassing docker-entrypoint.sh
+    exec node server.js; \
+  "]