From 7dc93001e3e4d1a089a7dcac3120b4e68669582d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Fri, 12 Dec 2025 15:32:49 +0100
Subject: [PATCH] Improve log file format with timestamps and sections
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add log() helper for timestamped entries
- Add log_section() for clear section headers
- Include upgrade metadata at start (version, registry, etc.)
- Log each step with clear descriptions
- Add completion timestamp at end
- Track container operations individually

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 scripts/upgrade.sh | 129 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 111 insertions(+), 18 deletions(-)

diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index 73514214f..f922983c6 100644
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -11,34 +11,63 @@ ENV_FILE="/data/coolify/source/.env"
 DATE=$(date +%Y-%m-%d-%H-%M-%S)
 LOGFILE="/data/coolify/source/upgrade-${DATE}.log"
 
+# Helper function to log with timestamp
+log() {
+    echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1" >>"$LOGFILE"
+}
+
+# Helper function to log section headers
+log_section() {
+    echo "" >>"$LOGFILE"
+    echo "============================================================" >>"$LOGFILE"
+    echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1" >>"$LOGFILE"
+    echo "============================================================" >>"$LOGFILE"
+}
+
 echo ""
 echo "=========================================="
 echo "   Coolify Upgrade - ${DATE}"
 echo "=========================================="
 echo ""
 
+# Initialize log file with header
+echo "============================================================" >>"$LOGFILE"
+echo "Coolify Upgrade Log" >>"$LOGFILE"
+echo "Started: $(date '+%Y-%m-%d %H:%M:%S')" >>"$LOGFILE"
+echo "Target Version: ${LATEST_IMAGE}" >>"$LOGFILE"
+echo "Helper Version: ${LATEST_HELPER_VERSION}" >>"$LOGFILE"
+echo "Registry URL: ${REGISTRY_URL}" >>"$LOGFILE"
+echo "============================================================" >>"$LOGFILE"
+
+log_section "Step 1/6: Downloading configuration files"
 echo "1/6 Downloading latest configuration files..."
+log "Downloading docker-compose.yml from ${CDN}/docker-compose.yml"
 curl -fsSL -L $CDN/docker-compose.yml -o /data/coolify/source/docker-compose.yml
+log "Downloading docker-compose.prod.yml from ${CDN}/docker-compose.prod.yml"
 curl -fsSL -L $CDN/docker-compose.prod.yml -o /data/coolify/source/docker-compose.prod.yml
+log "Downloading .env.production from ${CDN}/.env.production"
 curl -fsSL -L $CDN/.env.production -o /data/coolify/source/.env.production
+log "Configuration files downloaded successfully"
 echo "     Done."
 
 # Backup existing .env file before making any changes
 if [ "$SKIP_BACKUP" != "true" ]; then
     if [ -f "$ENV_FILE" ]; then
         echo "     Creating backup of .env file..."
-        echo "Creating backup of existing .env file to .env-$DATE" >>"$LOGFILE"
+        log "Creating backup of .env file to .env-$DATE"
         cp "$ENV_FILE" "$ENV_FILE-$DATE"
+        log "Backup created: ${ENV_FILE}-${DATE}"
     else
-        echo "No existing .env file found to backup" >>"$LOGFILE"
+        log "WARNING: No existing .env file found to backup"
     fi
 fi
 
+log_section "Step 2/6: Updating environment configuration"
 echo ""
 echo "2/6 Updating environment configuration..."
-echo "Merging .env.production values into .env" >>"$LOGFILE"
+log "Merging .env.production values into .env"
 awk -F '=' '!seen[$1]++' "$ENV_FILE" /data/coolify/source/.env.production > "$ENV_FILE.tmp" && mv "$ENV_FILE.tmp" "$ENV_FILE"
-echo ".env file merged successfully" >>"$LOGFILE"
+log "Environment file merged successfully"
 
 update_env_var() {
     local key="$1"
@@ -47,82 +76,140 @@ update_env_var() {
     # If variable "key=" exists but has no value, update the value of the existing line
     if grep -q "^${key}=$" "$ENV_FILE"; then
         sed -i "s|^${key}=$|${key}=${value}|" "$ENV_FILE"
-        echo " - Updated value of ${key} as the current value was empty" >>"$LOGFILE"
+        log "Updated ${key} (was empty)"
     # If variable "key=" doesn't exist, append it to the file with value
     elif ! grep -q "^${key}=" "$ENV_FILE"; then
         printf '%s=%s\n' "$key" "$value" >>"$ENV_FILE"
-        echo " - Added ${key} with default value as the variable was missing" >>"$LOGFILE"
+        log "Added ${key} (was missing)"
     fi
 }
 
-echo "Checking and updating environment variables if necessary..." >>"$LOGFILE"
+log "Checking environment variables..."
 update_env_var "PUSHER_APP_ID" "$(openssl rand -hex 32)"
 update_env_var "PUSHER_APP_KEY" "$(openssl rand -hex 32)"
 update_env_var "PUSHER_APP_SECRET" "$(openssl rand -hex 32)"
+log "Environment variables check complete"
 echo "     Done."
 
 # Make sure coolify network exists
 # It is created when starting Coolify with docker compose
+log "Checking Docker network 'coolify'..."
 if ! docker network inspect coolify >/dev/null 2>&1; then
+    log "Network 'coolify' does not exist, creating..."
     if ! docker network create --attachable --ipv6 coolify 2>/dev/null; then
-        echo "Failed to create coolify network with ipv6. Trying without ipv6..." >>"$LOGFILE"
+        log "Failed to create network with IPv6, trying without IPv6..."
         docker network create --attachable coolify 2>/dev/null
+        log "Network 'coolify' created without IPv6"
+    else
+        log "Network 'coolify' created with IPv6 support"
     fi
+else
+    log "Network 'coolify' already exists"
 fi
 
 # Check if Docker config file exists
 DOCKER_CONFIG_MOUNT=""
 if [ -f /root/.docker/config.json ]; then
     DOCKER_CONFIG_MOUNT="-v /root/.docker/config.json:/root/.docker/config.json"
+    log "Docker config mount enabled: /root/.docker/config.json"
 fi
 
+log_section "Step 3/6: Pulling Docker images"
 echo ""
 echo "3/6 Pulling Docker images..."
 echo "     This may take a few minutes depending on your connection."
-echo "Pulling required Docker images..." >>"$LOGFILE"
 
 echo "     - Pulling Coolify image..."
-docker pull "${REGISTRY_URL:-ghcr.io}/coollabsio/coolify:${LATEST_IMAGE}" >>"$LOGFILE" 2>&1 || { echo "     ERROR: Failed to pull Coolify image. Aborting upgrade."; echo "Failed to pull Coolify image. Aborting upgrade." >>"$LOGFILE"; exit 1; }
+log "Pulling image: ${REGISTRY_URL:-ghcr.io}/coollabsio/coolify:${LATEST_IMAGE}"
+if docker pull "${REGISTRY_URL:-ghcr.io}/coollabsio/coolify:${LATEST_IMAGE}" >>"$LOGFILE" 2>&1; then
+    log "Successfully pulled Coolify image"
+else
+    log "ERROR: Failed to pull Coolify image"
+    echo "     ERROR: Failed to pull Coolify image. Aborting upgrade."
+    exit 1
+fi
 
 echo "     - Pulling Coolify helper image..."
-docker pull "${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-helper:${LATEST_HELPER_VERSION}" >>"$LOGFILE" 2>&1 || { echo "     ERROR: Failed to pull helper image. Aborting upgrade."; echo "Failed to pull Coolify helper image. Aborting upgrade." >>"$LOGFILE"; exit 1; }
+log "Pulling image: ${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-helper:${LATEST_HELPER_VERSION}"
+if docker pull "${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-helper:${LATEST_HELPER_VERSION}" >>"$LOGFILE" 2>&1; then
+    log "Successfully pulled Coolify helper image"
+else
+    log "ERROR: Failed to pull Coolify helper image"
+    echo "     ERROR: Failed to pull helper image. Aborting upgrade."
+    exit 1
+fi
 
 echo "     - Pulling PostgreSQL image..."
-docker pull postgres:15-alpine >>"$LOGFILE" 2>&1 || { echo "     ERROR: Failed to pull PostgreSQL image. Aborting upgrade."; echo "Failed to pull PostgreSQL image. Aborting upgrade." >>"$LOGFILE"; exit 1; }
+log "Pulling image: postgres:15-alpine"
+if docker pull postgres:15-alpine >>"$LOGFILE" 2>&1; then
+    log "Successfully pulled PostgreSQL image"
+else
+    log "ERROR: Failed to pull PostgreSQL image"
+    echo "     ERROR: Failed to pull PostgreSQL image. Aborting upgrade."
+    exit 1
+fi
 
 echo "     - Pulling Redis image..."
-docker pull redis:7-alpine >>"$LOGFILE" 2>&1 || { echo "     ERROR: Failed to pull Redis image. Aborting upgrade."; echo "Failed to pull Redis image. Aborting upgrade." >>"$LOGFILE"; exit 1; }
+log "Pulling image: redis:7-alpine"
+if docker pull redis:7-alpine >>"$LOGFILE" 2>&1; then
+    log "Successfully pulled Redis image"
+else
+    log "ERROR: Failed to pull Redis image"
+    echo "     ERROR: Failed to pull Redis image. Aborting upgrade."
+    exit 1
+fi
 
 echo "     - Pulling Coolify realtime image..."
-docker pull "${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-realtime:1.0.10" >>"$LOGFILE" 2>&1 || { echo "     ERROR: Failed to pull realtime image. Aborting upgrade."; echo "Failed to pull Coolify realtime image. Aborting upgrade." >>"$LOGFILE"; exit 1; }
+log "Pulling image: ${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-realtime:1.0.10"
+if docker pull "${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-realtime:1.0.10" >>"$LOGFILE" 2>&1; then
+    log "Successfully pulled Coolify realtime image"
+else
+    log "ERROR: Failed to pull Coolify realtime image"
+    echo "     ERROR: Failed to pull realtime image. Aborting upgrade."
+    exit 1
+fi
 
-echo "All images pulled successfully." >>"$LOGFILE"
+log "All images pulled successfully"
 echo "     All images pulled successfully."
 
+log_section "Step 4/6: Stopping existing containers"
 echo ""
 echo "4/6 Stopping existing containers..."
-echo "Stopping existing Coolify containers..." >>"$LOGFILE"
 for container in coolify coolify-db coolify-redis coolify-realtime; do
     if docker ps -a --format '{{.Names}}' | grep -q "^${container}$"; then
         echo "     - Stopping ${container}..."
+        log "Stopping container: ${container}"
         docker stop "$container" >>"$LOGFILE" 2>&1 || true
+        log "Removing container: ${container}"
         docker rm "$container" >>"$LOGFILE" 2>&1 || true
-        echo " - Removed container: $container" >>"$LOGFILE"
+        log "Container ${container} stopped and removed"
+    else
+        log "Container ${container} not found (skipping)"
     fi
 done
+log "Container cleanup complete"
 echo "     Done."
 
+log_section "Step 5/6: Starting new containers"
 echo ""
 echo "5/6 Starting new containers..."
 if [ -f /data/coolify/source/docker-compose.custom.yml ]; then
     echo "     Custom docker-compose.yml detected."
-    echo "docker-compose.custom.yml detected." >>"$LOGFILE"
+    log "Using custom docker-compose.yml"
+    log "Running docker compose up with custom configuration..."
     docker run -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock ${DOCKER_CONFIG_MOUNT} --rm ${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-helper:${LATEST_HELPER_VERSION} bash -c "LATEST_IMAGE=${LATEST_IMAGE} docker compose --project-name coolify --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml -f /data/coolify/source/docker-compose.custom.yml up -d --remove-orphans --wait --wait-timeout 60" >>"$LOGFILE" 2>&1
 else
+    log "Using standard docker-compose configuration"
+    log "Running docker compose up..."
     docker run -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock ${DOCKER_CONFIG_MOUNT} --rm ${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-helper:${LATEST_HELPER_VERSION} bash -c "LATEST_IMAGE=${LATEST_IMAGE} docker compose --project-name coolify --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml up -d --remove-orphans --wait --wait-timeout 60" >>"$LOGFILE" 2>&1
 fi
+log "Docker compose up completed"
 echo "     Done."
 
+log_section "Step 6/6: Upgrade complete"
+log "Coolify upgrade completed successfully"
+log "Version: ${LATEST_IMAGE}"
+
 echo ""
 echo "6/6 Upgrade complete!"
 echo ""
@@ -132,3 +219,9 @@ echo "=========================================="
 echo ""
 echo "   Log file: ${LOGFILE}"
 echo ""
+
+# Final log entry
+echo "" >>"$LOGFILE"
+echo "============================================================" >>"$LOGFILE"
+echo "Upgrade completed: $(date '+%Y-%m-%d %H:%M:%S')" >>"$LOGFILE"
+echo "============================================================" >>"$LOGFILE"