Working on getting the ECR/Apprunner setup working.

Author: SimonGoring

.github/workflows/deploy.yml

@@ -17,7 +17,7 @@ jobs:
 
     - name: Set environment based on branch
       run: |
-        if [[ ${{ github.ref }} == 'refs/heads/main' ]]; then
+        if [[ ${{ github.ref }} == 'refs/heads/production' ]]; then
           echo "ENVIRONMENT=prod" >> $GITHUB_ENV
           echo "STACK_NAME=neoapi-prod" >> $GITHUB_ENV
         else
@@ -35,15 +35,41 @@ jobs:
     - name: Login to Amazon ECR
       id: login-ecr
       uses: aws-actions/amazon-ecr-login@v2
-    
+
+    - name: Create ECR repository if it doesn't exist
+      run: |
+        aws ecr describe-repositories --repository-names neoapi-${{ env.ENVIRONMENT }} --region ${{ env.AWS_REGION }} 2>/dev/null || \
+        aws ecr create-repository \
+          --repository-name neoapi-${{ env.ENVIRONMENT }} \
+          --region ${{ env.AWS_REGION }} \
+          --image-scanning-configuration scanOnPush=true
+
+    - name: Build, tag, and push image to Amazon ECR
+      run: |
+        ECR_REPOSITORY=${{ steps.login-ecr.outputs.registry }}/neoapi-${{ env.ENVIRONMENT }}
+        IMAGE_TAG=${{ github.sha }}
+        
+        echo "Building Docker image..."
+        docker build -t $ECR_REPOSITORY:$IMAGE_TAG .
+        docker tag $ECR_REPOSITORY:$IMAGE_TAG $ECR_REPOSITORY:latest
+        
+        echo "Pushing to ECR..."
+        docker push $ECR_REPOSITORY:$IMAGE_TAG
+        docker push $ECR_REPOSITORY:latest
+        
+        echo "IMAGE_URI=$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_ENV
+        echo "ECR_REPOSITORY=$ECR_REPOSITORY" >> $GITHUB_ENV
+
     - name: Deploy CloudFormation stack
       run: |
+        echo "Deploying infrastructure with image: ${{ env.IMAGE_URI }}"
+        
         aws cloudformation deploy \
           --template-file infrastructure/cloudformation-template.yaml \
           --stack-name ${{ env.STACK_NAME }} \
           --parameter-overrides \
             Environment=${{ env.ENVIRONMENT }} \
-            ImageUri="placeholder" \
+            ImageUri=${{ env.IMAGE_URI }} \
             RDSHostname=${{ secrets.RDS_HOSTNAME }} \
             RDSDatabase=${{ secrets.RDS_DATABASE }} \
             RDSUsername=${{ secrets.RDS_USERNAME }} \
@@ -52,6 +78,13 @@ jobs:
             PrivateSubnets=${{ secrets.PRIVATE_SUBNETS }} \
           --capabilities CAPABILITY_NAMED_IAM \
           --region ${{ env.AWS_REGION }}
+
+    - name: Wait for deployment to complete
+      run: |
+        echo "Waiting for CloudFormation stack to complete..."
+        aws cloudformation wait stack-deploy-complete \
+          --stack-name ${{ env.STACK_NAME }} \
+          --region ${{ env.AWS_REGION }}
     
     - name: Get ECR repository URI
       run: |
@@ -61,31 +94,37 @@ jobs:
           --output text \
           --region ${{ env.AWS_REGION }})
         echo "ECR_REPOSITORY=$ECR_URI" >> $GITHUB_ENV
-    
-    - name: Build, tag, and push image to Amazon ECR
+
+    - name: Get service URL
       run: |
-        IMAGE_TAG=${{ github.sha }}
-        docker build -t $ECR_REPOSITORY:$IMAGE_TAG .
-        docker tag $ECR_REPOSITORY:$IMAGE_TAG $ECR_REPOSITORY:latest
-        docker push $ECR_REPOSITORY:$IMAGE_TAG
-        docker push $ECR_REPOSITORY:latest
-        echo "IMAGE_URI=$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_ENV
+        SERVICE_URL=$(aws cloudformation describe-stacks \
+          --stack-name ${{ env.STACK_NAME }} \
+          --query 'Stacks[0].Outputs[?OutputKey==`ServiceUrl`].OutputValue' \
+          --output text \
+          --region ${{ env.AWS_REGION }})
+        
+        echo "🚀 Deployment complete!"
+        echo "Service URL: $SERVICE_URL"
+        echo "Environment: ${{ env.ENVIRONMENT }}"
+        echo "Image: ${{ env.IMAGE_URI }}"
     
-    - name: Update App Runner service with new image
+    - name: Health check
       run: |
-        aws cloudformation update-stack \
+        SERVICE_URL=$(aws cloudformation describe-stacks \
           --stack-name ${{ env.STACK_NAME }} \
-          --use-previous-template \
-          --parameters \
-            ParameterKey=Environment,UsePreviousValue=true \
-            ParameterKey=ImageUri,ParameterValue=${{ env.IMAGE_URI }} \
-            ParameterKey=RDSHostname,UsePreviousValue=true \
-            ParameterKey=RDSDatabase,UsePreviousValue=true \
-            ParameterKey=VPCId,UsePreviousValue=true \
-            ParameterKey=PrivateSubnets,UsePreviousValue=true \
-          --capabilities CAPABILITY_NAMED_IAM \
-          --region ${{ env.AWS_REGION }}
+          --query 'Stacks[0].Outputs[?OutputKey==`ServiceUrl`].OutputValue' \
+          --output text \
+          --region ${{ env.AWS_REGION }})
         
-        aws cloudformation wait stack-update-complete \
-          --stack-name ${{ env.STACK_NAME }} \
-          --region ${{ env.AWS_REGION }}
+        echo "Performing health check..."
+        sleep 30  # Give the service time to start
+        
+        for i in {1..5}; do
+          if curl -f -s "${SERVICE_URL}/v2.0/routes/healthwatch" > /dev/null; then
+            echo "✅ Health check passed!"
+            exit 0
+          else
+            echo "⏳ Health check attempt $i/5 failed, retrying in 30 seconds..."
+            sleep 30
+          fi
+        done