mirror of
https://github.com/kossakovsky/n8n-install.git
synced 2026-03-07 14:23:08 +00:00
Add apply_update.sh script to streamline update process
- Introduced a new script, apply_update.sh, to handle the update process, including stopping services, pulling the latest container versions, and modifying the .env file based on user input for n8n workflow import and worker count. - Refactored update.sh to delegate the update tasks to apply_update.sh, improving code organization and maintainability. - Enhanced error handling and logging throughout the update process for better user experience and troubleshooting.
This commit is contained in:
Yury Kossakovsky
104
scripts/apply_update.sh
Executable file
104
scripts/apply_update.sh
Executable file
@@ -0,0 +1,104 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
# Source the utilities file
|
||||
source "$(dirname "$0")/utils.sh"
|
||||
|
||||
# Set the compose command explicitly to use docker compose subcommand
|
||||
COMPOSE_CMD="docker compose"
|
||||
log_info "Using $COMPOSE_CMD as compose command for update application"
|
||||
|
||||
# Navigate to the directory where this script is located
|
||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
|
||||
# Project root directory (one level up from scripts)
|
||||
PROJECT_ROOT="$( cd "$SCRIPT_DIR/.." &> /dev/null && pwd )"
|
||||
# Path to the 05_run_services.sh script (Corrected from original update.sh which had 04)
|
||||
RUN_SERVICES_SCRIPT="$SCRIPT_DIR/05_run_services.sh"
|
||||
# Compose files (Not strictly needed here unless used directly, but good for context)
|
||||
# MAIN_COMPOSE_FILE="$PROJECT_ROOT/docker-compose.yml"
|
||||
# SUPABASE_COMPOSE_FILE="$PROJECT_ROOT/supabase/docker/docker-compose.yml"
|
||||
ENV_FILE="$PROJECT_ROOT/.env"
|
||||
|
||||
# Check if run services script exists
|
||||
if [ ! -f "$RUN_SERVICES_SCRIPT" ]; then
|
||||
log_error "$RUN_SERVICES_SCRIPT not found."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd "$PROJECT_ROOT"
|
||||
|
||||
# Stop all services
|
||||
log_info "Stopping all services..."
|
||||
$COMPOSE_CMD down || {
|
||||
log_warning "Failed to stop containers with 'docker compose down'. Continuing with update anyway...";
|
||||
}
|
||||
|
||||
# Pull latest versions of all containers
|
||||
log_info "Pulling latest versions of all containers..."
|
||||
$COMPOSE_CMD pull || { log_error "Failed to pull Docker images. Check network connection and Docker Hub status."; exit 1; }
|
||||
|
||||
# Ask user about n8n import and modify .env file
|
||||
if [ -f "$ENV_FILE" ]; then
|
||||
read -p "Import n8n workflow? (y/n): " import_choice
|
||||
case "$import_choice" in
|
||||
[yY] | [yY][eE][sS] )
|
||||
# Use a temporary file for sed portability
|
||||
sed 's/^RUN_N8N_IMPORT=.*/RUN_N8N_IMPORT=true/' "$ENV_FILE" > "${ENV_FILE}.tmp" && mv "${ENV_FILE}.tmp" "$ENV_FILE" || {
|
||||
log_error "Failed to set RUN_N8N_IMPORT in $ENV_FILE. Check permissions."
|
||||
rm -f "${ENV_FILE}.tmp" # Clean up temp file on failure
|
||||
}
|
||||
;;
|
||||
* )
|
||||
# Use a temporary file for sed portability
|
||||
sed 's/^RUN_N8N_IMPORT=.*/RUN_N8N_IMPORT=false/' "$ENV_FILE" > "${ENV_FILE}.tmp" && mv "${ENV_FILE}.tmp" "$ENV_FILE" || {
|
||||
log_error "Failed to set RUN_N8N_IMPORT in $ENV_FILE. Check permissions."
|
||||
rm -f "${ENV_FILE}.tmp" # Clean up temp file on failure
|
||||
}
|
||||
;;
|
||||
esac
|
||||
|
||||
# Ask user about n8n worker count
|
||||
if grep -q "^N8N_WORKER_COUNT=" "$ENV_FILE"; then
|
||||
CURRENT_WORKER_COUNT=$(grep "^N8N_WORKER_COUNT=" "$ENV_FILE" | cut -d'=' -f2 | tr -d '"')
|
||||
log_info "Current n8n worker count: $CURRENT_WORKER_COUNT"
|
||||
read -p "Enter new n8n worker count (leave empty to keep current: $CURRENT_WORKER_COUNT): " new_worker_count_raw
|
||||
|
||||
if [[ -n "$new_worker_count_raw" ]]; then
|
||||
# Validate input: must be a positive integer
|
||||
if [[ "$new_worker_count_raw" =~ ^[1-9][0-9]*$ ]]; then
|
||||
NEW_WORKER_COUNT="$new_worker_count_raw"
|
||||
log_info "Updating n8n worker count to $NEW_WORKER_COUNT in $ENV_FILE..."
|
||||
# Use a temporary file for sed portability (-i needs backup suffix on macOS without -e)
|
||||
sed "s/^N8N_WORKER_COUNT=.*/N8N_WORKER_COUNT=\"$NEW_WORKER_COUNT\"/" "$ENV_FILE" > "${ENV_FILE}.tmp" && mv "${ENV_FILE}.tmp" "$ENV_FILE" || {
|
||||
log_error "Failed to update N8N_WORKER_COUNT in $ENV_FILE. Check permissions."
|
||||
rm -f "${ENV_FILE}.tmp" # Clean up temp file on failure
|
||||
}
|
||||
else
|
||||
log_warning "Invalid input '$new_worker_count_raw'. Worker count must be a positive integer. Keeping current value ($CURRENT_WORKER_COUNT)."
|
||||
fi
|
||||
else
|
||||
log_info "Keeping current n8n worker count ($CURRENT_WORKER_COUNT)."
|
||||
fi
|
||||
else
|
||||
# This case might occur if .env exists but N8N_WORKER_COUNT was manually removed.
|
||||
# 03_generate_secrets.sh should ensure it exists on initial setup.
|
||||
log_warning "N8N_WORKER_COUNT line not found in $ENV_FILE. Cannot update worker count during this update."
|
||||
# Optionally, prompt user to add it if needed:
|
||||
# read -p "N8N_WORKER_COUNT line not found. Add it now? (Enter number, or leave empty to skip): " add_worker_count
|
||||
# if [[ "$add_worker_count" =~ ^[1-9][0-9]*$ ]]; then
|
||||
# echo "N8N_WORKER_COUNT=\"$add_worker_count\"" >> "$ENV_FILE"
|
||||
# log_info "Added N8N_WORKER_COUNT=$add_worker_count to $ENV_FILE."
|
||||
# fi
|
||||
fi
|
||||
else
|
||||
log_warning "$ENV_FILE not found. Cannot configure RUN_N8N_IMPORT or N8N_WORKER_COUNT."
|
||||
fi
|
||||
|
||||
# Start services using the 05_run_services.sh script
|
||||
log_info "Running Services..."
|
||||
bash "$RUN_SERVICES_SCRIPT" || { log_error "Failed to start services. Check logs for details."; exit 1; }
|
||||
|
||||
log_success "Update application completed successfully!"
|
||||
|
||||
exit 0
|
||||
@@ -6,26 +6,20 @@ set -e
|
||||
source "$(dirname "$0")/utils.sh"
|
||||
|
||||
# Set the compose command explicitly to use docker compose subcommand
|
||||
COMPOSE_CMD="docker compose"
|
||||
log_info "Using $COMPOSE_CMD as compose command"
|
||||
|
||||
# Navigate to the directory where this script is located
|
||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
|
||||
# Project root directory (one level up from scripts)
|
||||
PROJECT_ROOT="$( cd "$SCRIPT_DIR/.." &> /dev/null && pwd )"
|
||||
# Path to the 04_run_services.sh script
|
||||
RUN_SERVICES_SCRIPT="$SCRIPT_DIR/05_run_services.sh"
|
||||
# Compose files
|
||||
MAIN_COMPOSE_FILE="$PROJECT_ROOT/docker-compose.yml"
|
||||
SUPABASE_COMPOSE_FILE="$PROJECT_ROOT/supabase/docker/docker-compose.yml"
|
||||
# Path to the apply_update.sh script
|
||||
|
||||
|
||||
# Check if run services script exists
|
||||
if [ ! -f "$RUN_SERVICES_SCRIPT" ]; then
|
||||
log_error "$RUN_SERVICES_SCRIPT not found."
|
||||
# Check if apply update script exists
|
||||
if [ ! -f "$APPLY_UPDATE_SCRIPT" ]; then
|
||||
log_error "Crucial update script $APPLY_UPDATE_SCRIPT not found. Cannot proceed."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
log_info "Starting update process..."
|
||||
|
||||
# Pull the latest repository changes
|
||||
@@ -33,78 +27,24 @@ log_info "Pulling latest repository changes..."
|
||||
# Check if git is installed
|
||||
if ! command -v git &> /dev/null; then
|
||||
log_warning "'git' command not found. Skipping repository update."
|
||||
# Decide if we should proceed without git pull or exit. Exiting is safer.
|
||||
log_error "Cannot proceed with update without git. Please install git."
|
||||
exit 1
|
||||
# Or, if allowing update without pull:
|
||||
# log_warning "Proceeding without pulling latest changes..."
|
||||
else
|
||||
# Since script is run from root, just do git pull in current directory
|
||||
git pull || { log_warning "Failed to pull latest repository changes. Continuing with update..."; }
|
||||
# Change to project root for git pull
|
||||
cd "$PROJECT_ROOT" || { log_error "Failed to change directory to $PROJECT_ROOT"; exit 1; }
|
||||
git pull || { log_warning "Failed to pull latest repository changes. Continuing update with potentially old version of apply_update.sh..."; }
|
||||
# Change back to script dir or ensure apply_update.sh uses absolute paths or cd's itself
|
||||
# (apply_update.sh already handles cd to PROJECT_ROOT, so we're good)
|
||||
fi
|
||||
|
||||
cd "$PROJECT_ROOT"
|
||||
# Execute the rest of the update process using the (potentially updated) apply_update.sh
|
||||
log_info "Handing over to apply_update.sh..."
|
||||
bash "$APPLY_UPDATE_SCRIPT"
|
||||
|
||||
# Stop all services
|
||||
log_info "Stopping all services..."
|
||||
$COMPOSE_CMD down || {
|
||||
log_warning "Failed to stop containers with 'docker compose down'. Continuing with update anyway...";
|
||||
}
|
||||
# The final success message will now come from apply_update.sh
|
||||
log_info "Update script finished." # Changed final message
|
||||
|
||||
# Pull latest versions of all containers
|
||||
log_info "Pulling latest versions of all containers..."
|
||||
$COMPOSE_CMD pull || { log_error "Failed to pull Docker images. Check network connection and Docker Hub status."; exit 1; }
|
||||
|
||||
# Ask user about n8n import and modify .env file
|
||||
ENV_FILE="$PROJECT_ROOT/.env"
|
||||
|
||||
if [ -f "$ENV_FILE" ]; then
|
||||
read -p "Import n8n workflow? (y/n): " import_choice
|
||||
case "$import_choice" in
|
||||
[yY] | [yY][eE][sS] )
|
||||
sed -i 's/^RUN_N8N_IMPORT=.*/RUN_N8N_IMPORT=true/' "$ENV_FILE" || log_error "Failed to set RUN_N8N_IMPORT in $ENV_FILE. Check permissions."
|
||||
;;
|
||||
* )
|
||||
sed -i 's/^RUN_N8N_IMPORT=.*/RUN_N8N_IMPORT=false/' "$ENV_FILE" || log_error "Failed to set RUN_N8N_IMPORT in $ENV_FILE. Check permissions."
|
||||
;;
|
||||
esac
|
||||
|
||||
# Ask user about n8n worker count
|
||||
if grep -q "^N8N_WORKER_COUNT=" "$ENV_FILE"; then
|
||||
CURRENT_WORKER_COUNT=$(grep "^N8N_WORKER_COUNT=" "$ENV_FILE" | cut -d'=' -f2 | tr -d '"')
|
||||
log_info "Current n8n worker count: $CURRENT_WORKER_COUNT"
|
||||
read -p "Enter new n8n worker count (leave empty to keep current: $CURRENT_WORKER_COUNT): " new_worker_count_raw
|
||||
|
||||
if [[ -n "$new_worker_count_raw" ]]; then
|
||||
# Validate input: must be a positive integer
|
||||
if [[ "$new_worker_count_raw" =~ ^[1-9][0-9]*$ ]]; then
|
||||
NEW_WORKER_COUNT="$new_worker_count_raw"
|
||||
log_info "Updating n8n worker count to $NEW_WORKER_COUNT in $ENV_FILE..."
|
||||
# Use a temporary file for sed portability (-i needs backup suffix on macOS without -e)
|
||||
sed "s/^N8N_WORKER_COUNT=.*/N8N_WORKER_COUNT=\\"$NEW_WORKER_COUNT\\"/" "$ENV_FILE" > "${ENV_FILE}.tmp" && mv "${ENV_FILE}.tmp" "$ENV_FILE" || {
|
||||
log_error "Failed to update N8N_WORKER_COUNT in $ENV_FILE. Check permissions."
|
||||
rm -f "${ENV_FILE}.tmp" # Clean up temp file on failure
|
||||
}
|
||||
else
|
||||
log_warning "Invalid input '$new_worker_count_raw'. Worker count must be a positive integer. Keeping current value ($CURRENT_WORKER_COUNT)."
|
||||
fi
|
||||
else
|
||||
log_info "Keeping current n8n worker count ($CURRENT_WORKER_COUNT)."
|
||||
fi
|
||||
else
|
||||
# This case might occur if .env exists but N8N_WORKER_COUNT was manually removed.
|
||||
# 03_generate_secrets.sh should ensure it exists on initial setup.
|
||||
log_warning "N8N_WORKER_COUNT line not found in $ENV_FILE. Cannot update worker count during this update."
|
||||
# Optionally, prompt user to add it if needed:
|
||||
# read -p "N8N_WORKER_COUNT line not found. Add it now? (Enter number, or leave empty to skip): " add_worker_count
|
||||
# if [[ "$add_worker_count" =~ ^[1-9][0-9]*$ ]]; then
|
||||
# echo "N8N_WORKER_COUNT=\\"$add_worker_count\\"" >> "$ENV_FILE"
|
||||
# log_info "Added N8N_WORKER_COUNT=$add_worker_count to $ENV_FILE."
|
||||
# fi
|
||||
fi
|
||||
else
|
||||
log_warning "$ENV_FILE not found. Cannot configure RUN_N8N_IMPORT or N8N_WORKER_COUNT."
|
||||
fi
|
||||
|
||||
# Start services using the 04_run_services.sh script
|
||||
log_info "Running Services..."
|
||||
bash "$RUN_SERVICES_SCRIPT" || { log_error "Failed to start services. Check logs for details."; exit 1; }
|
||||
|
||||
log_success "Update completed successfully!"
|
||||
|
||||
exit 0
|
||||
exit 0
|
||||
Reference in New Issue
Block a user