Updated run.sh again

Dockerfile

@@ -13,16 +13,15 @@ RUN dnf install -y \
     && dnf clean all \
     && rm -rf /var/cache/dnf
 
-# Create application user (using Red Hat standard practices)
-RUN useradd -u 1001 -g 0 -M -d /app user && \
-    mkdir -p /app && \
+# Set up application directory
+RUN mkdir -p /app && \
     chown -R 1001:0 /app && \
     chmod -R g=u /app
 
 # Set working directory
 WORKDIR /app
 
-# Switch to non-root user
+# Switch to non-root user (default in UBI image)
 USER 1001
 
 # Copy requirements first to leverage Docker cache

run.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e  # Exit on error
+
 # Default values
 PORT=7860
 ENV_FILE=".env"
@@ -18,6 +20,12 @@ usage() {
     exit 1
 }
 
+# Function to handle errors
+handle_error() {
+    echo "Error: $1"
+    exit 1
+}
+
 # Parse command line arguments
 while getopts "p:e:n:bh" opt; do
     case $opt in
@@ -50,8 +58,7 @@ fi
 
 # Check if docker is installed
 if ! command -v docker &> /dev/null; then
-    echo "Error: docker is not installed"
-    exit 1
+    handle_error "Docker is not installed"
 fi
 
 # Check if .env file exists
@@ -66,7 +73,7 @@ fi
 
 # Build the Docker image
 echo "Building Docker image..."
-docker build $PLATFORM_ARG -t $CONTAINER_NAME .
+docker build $PLATFORM_ARG -t $CONTAINER_NAME . || handle_error "Failed to build Docker image"
 
 # Exit if build only
 if [ "$BUILD_ONLY" = true ]; then
@@ -77,23 +84,31 @@ fi
 # Check if container is already running
 if docker ps -q -f name=$CONTAINER_NAME | grep -q .; then
     echo "Stopping existing container..."
-    docker stop $CONTAINER_NAME
+    docker stop $CONTAINER_NAME || handle_error "Failed to stop existing container"
 fi
 
 # Remove existing container
 if docker ps -aq -f name=$CONTAINER_NAME | grep -q .; then
     echo "Removing existing container..."
-    docker rm $CONTAINER_NAME
+    docker rm $CONTAINER_NAME || handle_error "Failed to remove existing container"
 fi
 
 # Run the container
 echo "Starting container on port $PORT..."
-docker run -d \
+if ! docker run -d \
     --name $CONTAINER_NAME \
     --env-file $ENV_FILE \
     -p $PORT:7860 \
     -v $HOME/.cache/huggingface:/app/.cache/huggingface \
-    $CONTAINER_NAME
+    $CONTAINER_NAME; then
+    handle_error "Failed to start container"
+fi
+
+# Verify container is running
+if ! docker ps | grep -q $CONTAINER_NAME; then
+    handle_error "Container failed to start. Check logs with: docker logs $CONTAINER_NAME"
+fi
 
-echo "Container started! API should be available at http://localhost:$PORT"
-echo "To view logs, run: docker logs -f $CONTAINER_NAME"
+echo "Container started successfully!"
+echo "API should be available at http://localhost:$PORT"
+echo "To view logs, run: docker logs -f $CONTAINER_NAME"