From 69115813a3bfeba1a278cdc21c89abb2c5f1de14 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Sun, 26 Nov 2023 22:27:36 -0500 Subject: [PATCH 1/5] Fix aws-cd Script --- .github/workflows/aws-cd.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/aws-cd.yml b/.github/workflows/aws-cd.yml index c6104d2a1..a666f0fd6 100644 --- a/.github/workflows/aws-cd.yml +++ b/.github/workflows/aws-cd.yml @@ -35,7 +35,7 @@ jobs: # Build a docker container and # push it to ECR so that it can # be deployed to ECS. - docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg=\"COMMIT=$IMAGE_TAG\" --build-arg=\"BUILD_TIMESTAMP=$(date +%s)\" --build-arg=\"COMMIT_MESSAGE=$(git --no-pager show -s --format=%s)\" -f infrastructure/prod/Dockerfile.server . + docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg="COMMIT=$IMAGE_TAG" --build-arg="BUILD_TIMESTAMP=$(date +%s)" --build-arg="COMMIT_MESSAGE=$(git --no-pager show -s --format=%s)" -f infrastructure/prod/Dockerfile.server . docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT @@ -49,7 +49,7 @@ jobs: # Build a docker container and # push it to ECR so that it can # be deployed to ECS. - docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg=\"COMMIT=$IMAGE_TAG\" --build-arg=\"BUILD_TIMESTAMP=$(date +%s)\" --build-arg=\"COMMIT_MESSAGE=$(git --no-pager show -s --format=%s)\" -f infrastructure/prod/Dockerfile.app . + docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg="COMMIT=$IMAGE_TAG" --build-arg="BUILD_TIMESTAMP=$(date +%s)" --build-arg="COMMIT_MESSAGE=$(git --no-pager show -s --format=%s)" -f infrastructure/prod/Dockerfile.app . docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT @@ -57,7 +57,7 @@ jobs: run: | # - create new revision for task definition with latest image. # - redeploy ECS services with the latest revision. - ./infrastructure/prod/redeploy.sh staging latest-main both + ./infrastructure/prod/redeploy.sh staging - name: Logout of Amazon ECR if: always() From 5fad54a92c3bdb02965673d85835219e511b2bb6 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Sun, 26 Nov 2023 22:29:56 -0500 Subject: [PATCH 2/5] test: Try triggering CD run script --- .github/workflows/aws-cd.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/aws-cd.yml b/.github/workflows/aws-cd.yml index a666f0fd6..c78139c34 100644 --- a/.github/workflows/aws-cd.yml +++ b/.github/workflows/aws-cd.yml @@ -2,6 +2,7 @@ on: push: branches: - main + - fix-aws-cd name: Deploy containers to Amazon ECS From 7b8138bce0133dc25065341a510e780d95132699 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Sun, 26 Nov 2023 22:31:34 -0500 Subject: [PATCH 3/5] fix: typoed branch name --- .github/workflows/aws-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws-cd.yml b/.github/workflows/aws-cd.yml index c78139c34..7b590028e 100644 --- a/.github/workflows/aws-cd.yml +++ b/.github/workflows/aws-cd.yml @@ -2,7 +2,7 @@ on: push: branches: - main - - fix-aws-cd + - luke/fix-aws-cd name: Deploy containers to Amazon ECS From b79fb2401270bbefe701f3ba6962685feff920c3 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Sun, 26 Nov 2023 22:37:47 -0500 Subject: [PATCH 4/5] fix: add missing script args --- .github/workflows/aws-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws-cd.yml b/.github/workflows/aws-cd.yml index 7b590028e..5b48e2088 100644 --- a/.github/workflows/aws-cd.yml +++ b/.github/workflows/aws-cd.yml @@ -58,7 +58,7 @@ jobs: run: | # - create new revision for task definition with latest image. # - redeploy ECS services with the latest revision. - ./infrastructure/prod/redeploy.sh staging + ./infrastructure/prod/redeploy.sh staging local-head both - name: Logout of Amazon ECR if: always() From 15c332cc05fa0bf19aa6e56ee36a2f85182a8395 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Sun, 26 Nov 2023 22:50:13 -0500 Subject: [PATCH 5/5] clean: remove testing branch --- .github/workflows/aws-cd.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/aws-cd.yml b/.github/workflows/aws-cd.yml index 5b48e2088..d176b8d9f 100644 --- a/.github/workflows/aws-cd.yml +++ b/.github/workflows/aws-cd.yml @@ -2,7 +2,6 @@ on: push: branches: - main - - luke/fix-aws-cd name: Deploy containers to Amazon ECS