chore(deploy): Add Dockerfile region update step to deployment scripts

- Update step numbering from 10 to 11 in both deploy-all.ps1 and deploy-all.sh
- Add new Step 4 to dynamically update Dockerfile with current AWS region
- Set AWS_REGION and AWS_DEFAULT_REGION environment variables in agent/Dockerfile
- Renumber subsequent deployment steps (5-11) to accommodate new region update step
- Include error handling for missing Dockerfile with graceful fallback
- Add descriptive output messages for the new region update process
- Ensures Docker image is built with correct region configuration matching AWS CLI setup

Author: benlec

deploy-all.ps1

@@ -3,7 +3,7 @@
 Write-Host "=== AgentCore Demo Deployment ===" -ForegroundColor Cyan
 
 # Step 1: Verify AWS credentials
-Write-Host "`n[1/10] Verifying AWS credentials..." -ForegroundColor Yellow
+Write-Host "`n[1/11] Verifying AWS credentials..." -ForegroundColor Yellow
 Write-Host "      (Checking AWS CLI configuration and validating access)" -ForegroundColor Gray
 
 # Check if AWS credentials are configured
@@ -26,7 +26,7 @@ Write-Host "      Authenticated as: $arn" -ForegroundColor Green
 Write-Host "      AWS Account: $accountId" -ForegroundColor Green
 
 # Step 2: Check AWS CLI version
-Write-Host "`n[2/10] Checking AWS CLI version..." -ForegroundColor Yellow
+Write-Host "`n[2/11] Checking AWS CLI version..." -ForegroundColor Yellow
 $awsVersion = aws --version 2>&1
 $versionMatch = $awsVersion -match 'aws-cli/(\d+)\.(\d+)\.(\d+)'
 if ($versionMatch) {
@@ -56,7 +56,7 @@ if ($versionMatch) {
 }
 
 # Step 3: Check AgentCore availability in current region
-Write-Host "`n[3/10] Checking AgentCore availability in current region..." -ForegroundColor Yellow
+Write-Host "`n[3/11] Checking AgentCore availability in current region..." -ForegroundColor Yellow
 # Detect current region from AWS CLI configuration
 $currentRegion = aws configure get region
 if ([string]::IsNullOrEmpty($currentRegion)) {
@@ -86,8 +86,27 @@ if ($LASTEXITCODE -ne 0) {
 }
 Write-Host "      ✓ AgentCore is available in $currentRegion" -ForegroundColor Green
 
-# Step 4: Install CDK dependencies
-Write-Host "`n[4/10] Installing CDK dependencies..." -ForegroundColor Yellow
+# Step 4: Update Dockerfile with current region
+Write-Host "`n[4/11] Updating Dockerfile with current region..." -ForegroundColor Yellow
+Write-Host "      (Setting AWS_REGION and AWS_DEFAULT_REGION to $currentRegion in agent/Dockerfile)" -ForegroundColor Gray
+
+$dockerfilePath = "agent/Dockerfile"
+if (Test-Path $dockerfilePath) {
+    $dockerfileContent = Get-Content $dockerfilePath -Raw
+    
+    # Replace both AWS_REGION and AWS_DEFAULT_REGION with current region
+    $dockerfileContent = $dockerfileContent -replace 'AWS_REGION=[\w-]+', "AWS_REGION=$currentRegion"
+    $dockerfileContent = $dockerfileContent -replace 'AWS_DEFAULT_REGION=[\w-]+', "AWS_DEFAULT_REGION=$currentRegion"
+    
+    # Write back to file
+    Set-Content -Path $dockerfilePath -Value $dockerfileContent -NoNewline
+    Write-Host "      ✓ Updated Dockerfile with region: $currentRegion" -ForegroundColor Green
+} else {
+    Write-Host "      ⚠ Dockerfile not found at $dockerfilePath, skipping region update..." -ForegroundColor Yellow
+}
+
+# Step 5: Install CDK dependencies
+Write-Host "`n[5/11] Installing CDK dependencies..." -ForegroundColor Yellow
 Write-Host "      (Installing AWS CDK libraries and TypeScript packages for infrastructure code)" -ForegroundColor Gray
 if (-not (Test-Path "cdk/node_modules")) {
     Push-Location cdk
@@ -97,8 +116,8 @@ if (-not (Test-Path "cdk/node_modules")) {
     Write-Host "      CDK dependencies already installed, skipping..." -ForegroundColor Gray
 }
 
-# Step 5: Install frontend dependencies
-Write-Host "`n[5/10] Installing frontend dependencies..." -ForegroundColor Yellow
+# Step 6: Install frontend dependencies
+Write-Host "`n[6/11] Installing frontend dependencies..." -ForegroundColor Yellow
 Write-Host "      (Installing React, Vite, Cognito SDK, and UI component libraries)" -ForegroundColor Gray
 Push-Location frontend
 # Commented out to save time during development - uncomment for clean builds
@@ -111,7 +130,7 @@ Pop-Location
 
 # Step 6: Create placeholder dist BEFORE any CDK commands
 # (CDK synthesizes all stacks even when deploying one, so frontend/dist must exist)
-Write-Host "`n[6/10] Creating placeholder frontend build..." -ForegroundColor Yellow
+Write-Host "`n[7/11] Creating placeholder frontend build..." -ForegroundColor Yellow
 Write-Host "      (Generating temporary HTML file - required for CDK synthesis)" -ForegroundColor Gray
 if (-not (Test-Path "frontend/dist")) {
     New-Item -ItemType Directory -Path "frontend/dist" -Force | Out-Null
@@ -121,7 +140,7 @@ if (-not (Test-Path "frontend/dist")) {
 }
 
 # Step 7: Bootstrap CDK (if needed)
-Write-Host "`n[7/10] Bootstrapping CDK environment..." -ForegroundColor Yellow
+Write-Host "`n[8/11] Bootstrapping CDK environment..." -ForegroundColor Yellow
 Write-Host "      (Setting up CDK deployment resources in your AWS account/region)" -ForegroundColor Gray
 Push-Location cdk
 $timestamp = Get-Date -Format "yyyyMMddHHmmss"
@@ -134,7 +153,7 @@ if ($LASTEXITCODE -ne 0) {
 }
 
 # Step 8: Deploy infrastructure stack
-Write-Host "`n[8/10] Deploying infrastructure stack..." -ForegroundColor Yellow
+Write-Host "`n[9/11] Deploying infrastructure stack..." -ForegroundColor Yellow
 Write-Host "      (Creating ECR repository, CodeBuild project, S3 bucket, and IAM roles)" -ForegroundColor Gray
 Push-Location cdk
 $timestamp = Get-Date -Format "yyyyMMddHHmmss"
@@ -147,7 +166,7 @@ if ($LASTEXITCODE -ne 0) {
 }
 
 # Step 9: Deploy auth stack
-Write-Host "`n[9/10] Deploying authentication stack..." -ForegroundColor Yellow
+Write-Host "`n[10/11] Deploying authentication stack..." -ForegroundColor Yellow
 Write-Host "      (Creating Cognito User Pool with email verification and password policies)" -ForegroundColor Gray
 Push-Location cdk
 $timestamp = Get-Date -Format "yyyyMMddHHmmss"
@@ -160,7 +179,7 @@ if ($LASTEXITCODE -ne 0) {
 }
 
 # Step 10: Deploy backend stack (triggers build and waits via Lambda)
-Write-Host "`n[10/10] Deploying AgentCore backend stack..." -ForegroundColor Yellow
+Write-Host "`n[11/11] Deploying AgentCore backend stack..." -ForegroundColor Yellow
 Write-Host "      (Uploading agent code, building ARM64 Docker image, creating AgentCore runtime with built-in Cognito auth)" -ForegroundColor Gray
 Write-Host "      Note: CodeBuild will compile the container image - this takes 5-10 minutes" -ForegroundColor DarkGray
 Write-Host "      The deployment will pause while waiting for the build to complete..." -ForegroundColor DarkGray

deploy-all.sh

@@ -7,7 +7,7 @@ set -e  # Exit on error
 echo -e "\033[0;36m=== AgentCore Demo Deployment ===\033[0m"
 
 # Step 1: Verify AWS credentials
-echo -e "\n\033[0;33m[1/10] Verifying AWS credentials...\033[0m"
+echo -e "\n\033[0;33m[1/11] Verifying AWS credentials...\033[0m"
 echo -e "\033[0;90m      (Checking AWS CLI configuration and validating access)\033[0m"
 
 # Check if AWS credentials are configured
@@ -28,7 +28,7 @@ echo -e "\033[0;32m      Authenticated as: $ARN\033[0m"
 echo -e "\033[0;32m      AWS Account: $ACCOUNT_ID\033[0m"
 
 # Step 2: Check AWS CLI version
-echo -e "\n\033[0;33m[2/10] Checking AWS CLI version...\033[0m"
+echo -e "\n\033[0;33m[2/11] Checking AWS CLI version...\033[0m"
 AWS_VERSION=$(aws --version 2>&1)
 if [[ $AWS_VERSION =~ aws-cli/([0-9]+)\.([0-9]+)\.([0-9]+) ]]; then
     MAJOR=${BASH_REMATCH[1]}
@@ -56,7 +56,7 @@ else
 fi
 
 # Step 3: Check AgentCore availability in current region
-echo -e "\n\033[0;33m[3/10] Checking AgentCore availability in current region...\033[0m"
+echo -e "\n\033[0;33m[3/11] Checking AgentCore availability in current region...\033[0m"
 # Detect current region from AWS CLI configuration
 CURRENT_REGION=$(aws configure get region)
 if [ -z "$CURRENT_REGION" ]; then
@@ -81,8 +81,26 @@ if ! aws bedrock-agentcore-control list-agent-runtimes --region "$CURRENT_REGION
 fi
 echo -e "\033[0;32m      ✓ AgentCore is available in $CURRENT_REGION\033[0m"
 
-# Step 4: Install CDK dependencies
-echo -e "\n\033[0;33m[4/10] Installing CDK dependencies...\033[0m"
+# Step 4: Update Dockerfile with current region
+echo -e "\n\033[0;33m[4/11] Updating Dockerfile with current region...\033[0m"
+echo -e "\033[0;90m      (Setting AWS_REGION and AWS_DEFAULT_REGION to $CURRENT_REGION in agent/Dockerfile)\033[0m"
+
+DOCKERFILE_PATH="agent/Dockerfile"
+if [ -f "$DOCKERFILE_PATH" ]; then
+    # Replace both AWS_REGION and AWS_DEFAULT_REGION with current region
+    sed -i.bak -E "s/AWS_REGION=[a-zA-Z0-9-]+/AWS_REGION=$CURRENT_REGION/g" "$DOCKERFILE_PATH"
+    sed -i.bak -E "s/AWS_DEFAULT_REGION=[a-zA-Z0-9-]+/AWS_DEFAULT_REGION=$CURRENT_REGION/g" "$DOCKERFILE_PATH"
+    
+    # Remove backup file
+    rm -f "$DOCKERFILE_PATH.bak"
+    
+    echo -e "\033[0;32m      ✓ Updated Dockerfile with region: $CURRENT_REGION\033[0m"
+else
+    echo -e "\033[0;33m      ⚠ Dockerfile not found at $DOCKERFILE_PATH, skipping region update...\033[0m"
+fi
+
+# Step 5: Install CDK dependencies
+echo -e "\n\033[0;33m[5/11] Installing CDK dependencies...\033[0m"
 echo -e "\033[0;90m      (Installing AWS CDK libraries and TypeScript packages for infrastructure code)\033[0m"
 if [ ! -d "cdk/node_modules" ]; then
     pushd cdk > /dev/null
@@ -92,8 +110,8 @@ else
     echo -e "\033[0;90m      CDK dependencies already installed, skipping...\033[0m"
 fi
 
-# Step 5: Install frontend dependencies
-echo -e "\n\033[0;33m[5/10] Installing frontend dependencies...\033[0m"
+# Step 6: Install frontend dependencies
+echo -e "\n\033[0;33m[6/11] Installing frontend dependencies...\033[0m"
 echo -e "\033[0;90m      (Installing React, Vite, Cognito SDK, and UI component libraries)\033[0m"
 pushd frontend > /dev/null
 # Commented out to save time during development - uncomment for clean builds
@@ -106,7 +124,7 @@ popd > /dev/null
 
 # Step 6: Create placeholder dist BEFORE any CDK commands
 # (CDK synthesizes all stacks even when deploying one, so frontend/dist must exist)
-echo -e "\n\033[0;33m[6/10] Creating placeholder frontend build...\033[0m"
+echo -e "\n\033[0;33m[7/11] Creating placeholder frontend build...\033[0m"
 echo -e "\033[0;90m      (Generating temporary HTML file - required for CDK synthesis)\033[0m"
 if [ ! -d "frontend/dist" ]; then
     mkdir -p frontend/dist
@@ -116,31 +134,31 @@ else
 fi
 
 # Step 7: Bootstrap CDK (if needed)
-echo -e "\n\033[0;33m[7/10] Bootstrapping CDK environment...\033[0m"
+echo -e "\n\033[0;33m[8/11] Bootstrapping CDK environment...\033[0m"
 echo -e "\033[0;90m      (Setting up CDK deployment resources in your AWS account/region)\033[0m"
 pushd cdk > /dev/null
 TIMESTAMP=$(date +%Y%m%d%H%M%S)
 npx cdk bootstrap --output "cdk.out.$TIMESTAMP" --no-cli-pager
 popd > /dev/null
 
 # Step 8: Deploy infrastructure stack
-echo -e "\n\033[0;33m[8/10] Deploying infrastructure stack...\033[0m"
+echo -e "\n\033[0;33m[9/11] Deploying infrastructure stack...\033[0m"
 echo -e "\033[0;90m      (Creating ECR repository, CodeBuild project, S3 bucket, and IAM roles)\033[0m"
 pushd cdk > /dev/null
 TIMESTAMP=$(date +%Y%m%d%H%M%S)
 npx cdk deploy AgentCoreInfra --output "cdk.out.$TIMESTAMP" --no-cli-pager --require-approval never
 popd > /dev/null
 
 # Step 9: Deploy auth stack
-echo -e "\n\033[0;33m[9/10] Deploying authentication stack...\033[0m"
+echo -e "\n\033[0;33m[10/11] Deploying authentication stack...\033[0m"
 echo -e "\033[0;90m      (Creating Cognito User Pool with email verification and password policies)\033[0m"
 pushd cdk > /dev/null
 TIMESTAMP=$(date +%Y%m%d%H%M%S)
 npx cdk deploy AgentCoreAuth --output "cdk.out.$TIMESTAMP" --no-cli-pager --require-approval never
 popd > /dev/null
 
 # Step 10: Deploy backend stack (triggers build and waits via Lambda)
-echo -e "\n\033[0;33m[10/10] Deploying AgentCore backend stack...\033[0m"
+echo -e "\n\033[0;33m[11/11] Deploying AgentCore backend stack...\033[0m"
 echo -e "\033[0;90m      (Uploading agent code, building ARM64 Docker image, creating AgentCore runtime with built-in Cognito auth)\033[0m"
 echo -e "\033[0;90m      Note: CodeBuild will compile the container image - this takes 5-10 minutes\033[0m"
 echo -e "\033[0;90m      The deployment will pause while waiting for the build to complete...\033[0m"