update aws deployment, have client get env from server

update.sh

@@ -1,10 +1,23 @@
 #!/bin/bash
 # Script to update Docker container
 
+# Check if environment parameter is provided
+if [ -z "$1" ]; then
+  echo "Error: Environment parameter is required (prod or staging)"
+  echo "Usage: $0 <environment>"
+  exit 1
+fi
+
+# Set environment from parameter
+ENV=$1
+CONTAINER_NAME="openfront-${ENV}"
+LOG_GROUP="/aws/ec2/docker-containers/${ENV}"
+
 # Get AWS account ID
 AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
 ECR_REPO="${AWS_ACCOUNT_ID}.dkr.ecr.eu-west-1.amazonaws.com/openfront:latest"
 
+echo "Deploying to ${ENV} environment..."
 echo "Logging in to ECR..."
 aws ecr get-login-password --region eu-west-1 | docker login --username AWS --password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.eu-west-1.amazonaws.com
 
@@ -13,29 +26,66 @@ docker pull $ECR_REPO
 
 echo "Checking for existing container..."
 # Check for running container
-RUNNING_CONTAINER=$(docker ps | grep openfront | awk '{print $1}')
+RUNNING_CONTAINER=$(docker ps | grep ${CONTAINER_NAME} | awk '{print $1}')
 if [ -n "$RUNNING_CONTAINER" ]; then
   echo "Stopping running container $RUNNING_CONTAINER..."
   docker stop $RUNNING_CONTAINER
+  echo "Waiting for container to fully stop and release resources..."
+  sleep 5  # Add a 5-second delay
   docker rm $RUNNING_CONTAINER
   echo "Container $RUNNING_CONTAINER stopped and removed."
 fi
 
 # Also check for stopped containers with the same name
-STOPPED_CONTAINER=$(docker ps -a | grep openfront | awk '{print $1}')
+STOPPED_CONTAINER=$(docker ps -a | grep ${CONTAINER_NAME} | awk '{print $1}')
 if [ -n "$STOPPED_CONTAINER" ]; then
   echo "Removing stopped container $STOPPED_CONTAINER..."
   docker rm $STOPPED_CONTAINER
   echo "Container $STOPPED_CONTAINER removed."
 fi
 
-echo "Starting new container..."
+# Check if port 80 is still in use
+echo "Checking if port 80 is still in use..."
+if command -v lsof >/dev/null 2>&1; then
+  PORT_CHECK=$(lsof -i :80 | grep LISTEN)
+elif command -v netstat >/dev/null 2>&1; then
+  PORT_CHECK=$(netstat -tuln | grep ":80 ")
+else
+  PORT_CHECK=""
+  echo "Warning: Cannot check if port is in use (neither lsof nor netstat found)"
+fi
+
+if [ -n "$PORT_CHECK" ]; then
+  echo "Warning: Port 80 is still in use by another process:"
+  echo "$PORT_CHECK"
+  echo "Attempting to proceed anyway..."
+fi
+
+echo "Starting new container for ${ENV} environment..."
 docker run -d -p 80:80 \
   --log-driver=awslogs \
   --log-opt awslogs-region=eu-west-1 \
-  --log-opt awslogs-group=/aws/ec2/docker-containers \
+  --log-opt awslogs-group=${LOG_GROUP} \
   --log-opt awslogs-create-group=true \
-  --name openfront \
+  --name ${CONTAINER_NAME} \
   $ECR_REPO
 
-echo "Update complete! New container is running."
+if [ $? -eq 0 ]; then
+  echo "Update complete! New ${ENV} container is running."
+else
+  echo "Failed to start container. Trying alternative port 8080..."
+  docker run -d -p 8080:80 \
+    --log-driver=awslogs \
+    --log-opt awslogs-region=eu-west-1 \
+    --log-opt awslogs-group=${LOG_GROUP} \
+    --log-opt awslogs-create-group=true \
+    --name ${CONTAINER_NAME} \
+    $ECR_REPO
+  
+  if [ $? -eq 0 ]; then
+    echo "Container started on port 8080 instead of 80!"
+  else
+    echo "Failed to start container on alternative port as well."
+    exit 1
+  fi
+fi