Merge branch 'main' of https://github.com/NFDI4Chem/nmrium-react-wrapper into prod-helm-deploy

Author: NishaSharma14

.github/workflows/prod-build.yml

@@ -27,6 +27,10 @@ jobs:
     name: Deploy to prod
     if: github.ref == 'refs/heads/prod-helm-deploy'
     runs-on: ubuntu-latest
+    environment:
+      name: Production
+      url: https://nmrium.nmrxiv.org
+      
     steps:
     - name: Checkout
       uses: actions/[email protected]

update-nmrium.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-# Set up logging
+set -e
+set -o pipefail
+set -u
+
 LOG_FILE="$HOME/nmrium-update.log"
 
 # Create log file if it doesn't exist
@@ -9,52 +12,55 @@ if [ ! -f "$LOG_FILE" ]; then
     chmod 644 "$LOG_FILE"
 fi
 
-# Function to log messages
+# Logging function
 log_message() {
-    echo "$(date): $1" >> "$LOG_FILE"
+    echo "$(date '+%Y-%m-%d %H:%M:%S') $1" >> "$LOG_FILE"
 }
 
-# Function to check and update a specific image and service
-check_and_update() {
-    local image=$1
-    local service=$2
-    
-    log_message "Checking for updates for $image"
-    
-    # Pull the latest image
-    if ! docker pull $image; then
-        log_message "ERROR: Failed to pull image $image"
-        return 1
-    fi
-    
-    # Get the current image ID
-    current_id=$(docker images $image --format "{{.ID}}")
-    
-    # Get the new image ID after pull
-    new_id=$(docker images $image --format "{{.ID}}")
-    
-    # If the IDs are different, restart the service
-    if [ "$current_id" != "$new_id" ]; then
-        log_message "New image detected for $image, restarting $service"
-        if ! docker-compose restart $service; then
-            log_message "ERROR: Failed to restart service $service"
-            return 1
-        fi
+log_message "🔄 Starting Docker Compose update process..."
+
+# Move to project directory
+PROJECT_DIR="/mnt/data/nmrium-react-wrapper"
+log_message "📂 Changing directory to $PROJECT_DIR"
+cd "$PROJECT_DIR"
+
+# Pull latest deployment files
+log_message "🔄 Performing git pull to sync deployment files..."
+git pull origin prod-helm-deploy
+log_message "✅ Git pull completed."
+
+# Define services and their images
+declare -A SERVICE_IMAGES
+SERVICE_IMAGES["nmrium-dev"]="nfdi4chem/nmrium-react-wrapper:dev-latest"
+SERVICE_IMAGES["nmrium-prod"]="nfdi4chem/nmrium-react-wrapper:latest"
+
+# Track services with updated images
+UPDATED_SERVICES=()
+
+for service in "${!SERVICE_IMAGES[@]}"; do
+    image="${SERVICE_IMAGES[$service]}"
+    log_message "📥 Checking for updates on $image"
+
+    if [ "$(docker pull "$image" | grep -c "Status: Image is up to date")" -eq 0 ]; then
+        log_message "✅ New image detected for $service"
+        UPDATED_SERVICES+=("$service")
     else
-        log_message "No updates available for $image"
+        log_message "🔎 Image for $service is up to date"
     fi
-}
+done
 
-# Change to the directory containing docker-compose.yml
-cd "$(dirname "$0")" || {
-    log_message "ERROR: Failed to change to script directory"
-    exit 1
-}
-
-log_message "Starting update check"
+# Recreate only changed services
+if [ "${#UPDATED_SERVICES[@]}" -gt 0 ]; then
+    for service in "${UPDATED_SERVICES[@]}"; do
+        log_message "🚀 Recreating container for $service with updated image..."
+        docker compose up -d --force-recreate --no-deps "$service"
+    done
+else
+    log_message "✅ No new images detected. Skipping container recreation."
+fi
 
-# Check both development and production images
-check_and_update "nfdi4chem/nmrium-react-wrapper:dev-latest" "nmrium-dev"
-check_and_update "nfdi4chem/nmrium-react-wrapper:latest" "nmrium-prod"
+# Cleanup
+log_message "🧹 Cleaning up dangling images..."
+docker image prune -f
 
-log_message "Update check completed" 
+log_message "✅ Update process completed."