fix deploy.sh

deploy.sh

@@ -1,45 +1,70 @@
 #!/bin/bash
-set -e
+set -e # Exit immediately if a command fails
 
-cd "$(dirname "$0")"
+# --- Configuration ---
+# ✅ DEFINE THE APP DIRECTORY (from your appspec.yml)
+APP_DIR="/home/ubuntu/itinerary-generator"
+cd ${APP_DIR}
 
+# ✅ DEFINE YOUR CONTAINER/ECR REPO NAME
+# This must match the $CONTAINER_NAME var in your CodeBuild project
+export CONTAINER_NAME="itinerary-generator" # Or whatever your ECR repo is named
+
+# 1. Get environment name from CodeDeploy
+APP_ENV=${DEPLOYMENT_GROUP_NAME}
+if [[ -z "$APP_ENV" ]]; then
+    echo "ERROR: DEPLOYMENT_GROUP_NAME is not set."
+    exit 1
+fi
+
+# 2. Read the image tag from the file
 if [[ -f "image-tag.txt" ]]; then
-    IMAGE_TAG=$(cat image-tag.txt)
+    # ✅ Export this so docker-compose.yaml can read it
+    export IMAGE_TAG=$(cat image-tag.txt)
 else
     echo "ERROR: image-tag.txt not found"
     exit 1
 fi
 
-
 echo "=== Deployment Variables ==="
-echo "GOOGLE_AI_STUDIO_API_KEY=${GOOGLE_AI_STUDIO_API_KEY}"
-echo "IMAGE_TAG=${IMAGE_TAG}"
-echo "GOOGLE_AI_STUDIO_MODEL=${GOOGLE_AI_STUDIO_MODEL}"
-echo "DB_HOST=${DB_HOST}"
-echo "DB_NAME=${DB_NAME}"
-echo "DB_USERNAME=${DB_USERNAME}"
-echo "DB_PORT=${DB_PORT}"
-echo "DB_PASSWORD=${DB_PASSWORD}"
-
-echo "PORT=${PORT}"
-echo "PLAYWRIGHT_BROWSERS_PATH=${PLAYWRIGHT_BROWSERS_PATH}"
+echo "Project Name (APP_ENV)=${APP_ENV}"
+echo "Container Name=${CONTAINER_NAME}"
+echo "Image Tag=${IMAGE_TAG}"
 
-export APP_ENV IMAGE_TAG API_PORT ES_PORT
-
-echo "=== Login AWS ==="
-aws --debug ecr get-login-password --region ap-southeast-3 | docker login --username AWS --password-stdin 825765383758.dkr.ecr.ap-southeast-3.amazonaws.com
-
-echo "=== Deploying containers for ${APP_ENV} ==="
+# 3. Login to AWS ECR
+echo "=== Login AWS ECR ==="
+aws ecr get-login-password --region ap-southeast-3 | docker login --username AWS --password-stdin 825765383758.dkr.ecr.ap-southeast-3.amazonaws.com
 
+# 4. Stop and Pull
 echo "=== Stopping containers ==="
 docker-compose -p "${APP_ENV}" down || true
 
 echo "=== Pulling images ==="
 docker-compose -p "${APP_ENV}" -f docker-compose.yml pull
 
+# 5. ✅ CREATE THE .env FILE
+echo "=== Creating .env file ==="
+# This is the file your server.py and docker-compose.yaml need.
+# We will create it using the APP_ENV to build the correct SSM path.
+
+# Define the SSM Parameter Store path based on the environment
+# Example: /itinerary-generator/development or /itinerary-generator/production
+PARAM_PATH="/${CONTAINER_NAME}/${APP_ENV}"
+
+# Write the path into the .env file.
+# The 'echo' command creates the file.
+echo "AWS_PARAMETER_STORE_PATH=${PARAM_PATH}" > .env
+# Add any other non-secret vars your app needs from the .env
+echo "APP_ENV=${APP_ENV}" >> .env
+
+echo "Created .env file with SSM Path: ${PARAM_PATH}"
+
+# 6. Start Containers
 echo "=== Starting containers ==="
+# Now this command will work because .env exists
 docker-compose -p "${APP_ENV}" -f docker-compose.yml up -d
 
+# 7. Prune
 echo "=== Prune unused images ==="
 docker image prune -af
 

docker-compose.yaml

@@ -2,11 +2,14 @@ version: '3.8'
 
 services:
   app:
-    build: .
+    # ⛔️ REMOVE this. You are not building on the EC2 instance.
+    # build: .
+    
+    # ✅ ADD this. Use the image from ECR and the tag from image-tag.txt
+    image: 825765383758.dkr.ecr.ap-southeast-3.amazonaws.com/$CONTAINER_NAME:${IMAGE_TAG}
+    
     ports:
       - "7860:7860"
     env_file:
       - .env
-    volumes:
-      - ./.env:/.env
-    restart: always
+    restart: always

server.py

@@ -24,8 +24,6 @@ API = "https://api-dev.spun.global"
 def create_app() -> Flask:
     load_dotenv() 
 
-    WORKER_API_KEY = os.getenv("WORKER_API_KEY")
-
     app = Flask(__name__)
     logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
 
@@ -36,6 +34,9 @@ def create_app() -> Flask:
             logging.info("Secrets loaded from AWS SSM Parameter Store.")
     except Exception as e:
         logging.exception(f"Could not load secrets from SSM: {e}")
+
+    WORKER_API_KEY = os.getenv("WORKER_API_KEY")
+    
             
     @app.route('/scrape', methods=['POST'])
     async def scrape():