From a533d132fb745cdadab86e8923f63e4badd14ea3 Mon Sep 17 00:00:00 2001
From: Stan Runge <stan@stanrunge.dev>
Date: Sat, 11 Jan 2025 17:39:59 +0100
Subject: [PATCH] fix: use github secrets for db credentials

---
 .github/workflows/ci-cd.yml | 20 ++++++++++++--------
 packages/web/Dockerfile     |  6 +++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 83e4981..32c1b3e 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@0e613a0980cbf65ed5b322eb7a1e075d28913a83
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -33,23 +33,27 @@ jobs:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
           IMAGE_TAG: ${{ github.sha }}
         run: |
-          docker build -t  $ECR_REGISTRY/stan/personal-website:$IMAGE_TAG packages/web
+          docker build \
+            --build-arg DB_HOST=${{ secrets.DB_HOST }} \
+            --build-arg DB_USER=${{ secrets.DB_USER }} \
+            --build-arg DB_PASSWORD=${{ secrets.DB_PASSWORD }} \
+            -t $ECR_REGISTRY/stan/personal-website:$IMAGE_TAG \
+            packages/web
           docker push $ECR_REGISTRY/stan/personal-website:$IMAGE_TAG
           echo "image=$ECR_REGISTRY/stan/personal-website:$IMAGE_TAG" >> $GITHUB_OUTPUT
 
-      - name: Fill in the new image ID in the Amazon ECS task definition
+      - name: Render ECS Task Definition
         id: task-def
-        uses: aws-actions/amazon-ecs-render-task-definition@c804dfbdd57f713b6c079302a4c01db7017a36fc
+        uses: aws-actions/amazon-ecs-render-task-definition@v1
         with:
           task-definition: .github/workflows/taskdef.json
           container-name: web
           image: ${{ steps.build-image.outputs.image }}
 
-      - name: Deploy Amazon ECS task definition
-        uses: aws-actions/amazon-ecs-deploy-task-definition@df9643053eda01f169e64a0e60233aacca83799a
+      - name: Deploy to Amazon ECS
+        uses: aws-actions/amazon-ecs-deploy-task-definition@v1
         with:
           task-definition: ${{ steps.task-def.outputs.task-definition }}
           service: main-service
           cluster: PersonalWebsiteCluster
-          wait-for-service-stability: true
-          
+          wait-for-service-stability: true         
diff --git a/packages/web/Dockerfile b/packages/web/Dockerfile
index bcf3efb..163e0a1 100644
--- a/packages/web/Dockerfile
+++ b/packages/web/Dockerfile
@@ -6,9 +6,9 @@ COPY package.json bun.lockb ./
 RUN bun install
 COPY . .
 
-ENV DB_HOST=host
-ENV DB_USER=user
-ENV DB_PASSWORD=password
+ARG DB_HOST
+ARG DB_USER
+ARG DB_PASSWORD
 
 
 RUN bun run build