Merge branch 'dev' into newlayout

johnlcos · May 1, 2024 · 87b9e46 · 87b9e46
2 parents e81f159 + 4673fc5
commit 87b9e46
Show file tree

Hide file tree

Showing 8 changed files with 609 additions and 12 deletions.
diff --git a/.github/workflows/docker-client.yml b/.github/workflows/docker-client.yml
@@ -75,9 +75,9 @@ 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 -t $ECR_REGISTRY/$ECR_REPOSITORY:client ./client
-          docker push $ECR_REGISTRY/$ECR_REPOSITORY/:$IMAGE_TAG
-          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY/:$IMAGE_TAG" >> $GITHUB_OUTPUT
+          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG ./client
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
 
       - name: Fill in the new image ID in the Amazon ECS task definition
         id: task-def

diff --git a/.github/workflows/docker-server.yml b/.github/workflows/docker-server.yml
@@ -75,9 +75,9 @@ 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 -t $ECR_REGISTRY/$ECR_REPOSITORY:server ./server
-          docker push $ECR_REGISTRY/$ECR_REPOSITORY/:$IMAGE_TAG
-          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY/:$IMAGE_TAG" >> $GITHUB_OUTPUT
+          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG ./server
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
 
       - name: Fill in the new image ID in the Amazon ECS task definition
         id: task-def

diff --git a/.github/workflows/task-definition-server.json b/.github/workflows/task-definition-server.json
@@ -3,7 +3,7 @@
   "containerDefinitions": [
     {
       "name": "currentC-server",
-      "image": "525357733102.dkr.ecr.us-east-2.amazonaws.com/currentc-server:latest",
+      "image": "525357733102.dkr.ecr.us-east-2.amazonaws.com/currentc-server",
       "cpu": 0,
       "portMappings": [
         {

diff --git a/.github/workflows/task-definition.json b/.github/workflows/task-definition.json
@@ -3,7 +3,7 @@
   "containerDefinitions": [
     {
       "name": "currentC-client",
-      "image": "525357733102.dkr.ecr.us-east-2.amazonaws.com/currentc-client:latest",
+      "image": "525357733102.dkr.ecr.us-east-2.amazonaws.com/currentc-client",
       "cpu": 0,
       "portMappings": [
         {