final merge conflcit resolved

.aws/training-task-definition.json

@@ -1,120 +1,80 @@
 {
-  "ipcMode": null,
-  "executionRoleArn": "arn:aws:iam::521654603461:role/ecsTaskExecutionRole",
+  "taskDefinitionArn": "arn:aws:ecs:us-east-1:521654603461:task-definition/DeployBackendTask:8",
   "containerDefinitions": [
     {
-      "dnsSearchDomains": null,
-      "environmentFiles": null,
-      "logConfiguration": {
-        "logDriver": "awslogs",
-        "secretOptions": null,
-        "options": {
-          "awslogs-group": "/ecs/dlp-training-task",
-          "awslogs-region": "us-west-2",
-          "awslogs-stream-prefix": "ecs"
-        }
-      },
-      "entryPoint": [],
-      "portMappings": [],
-      "command": [],
-      "linuxParameters": null,
+      "name": "backend",
+      "image": "521654603461.dkr.ecr.us-east-1.amazonaws.com/dlp-backend-image",
       "cpu": 0,
+      "portMappings": [
+        {
+          "name": "gunicorn-port",
+          "containerPort": 8000,
+          "hostPort": 0,
+          "protocol": "tcp",
+          "appProtocol": "http"
+        }
+      ],
+      "essential": true,
       "environment": [],
-      "resourceRequirements": null,
-      "ulimits": null,
-      "dnsServers": null,
+      "environmentFiles": [],
       "mountPoints": [],
-      "workingDirectory": null,
-      "secrets": null,
-      "dockerSecurityOptions": null,
-      "memory": null,
-      "memoryReservation": null,
       "volumesFrom": [],
-      "stopTimeout": null,
-      "image": "521654603461.dkr.ecr.us-west-2.amazonaws.com/dlp-training:latest",
-      "startTimeout": null,
-      "firelensConfiguration": null,
-      "dependsOn": null,
-      "disableNetworking": null,
-      "interactive": null,
-      "healthCheck": null,
-      "essential": true,
-      "links": null,
-      "hostname": null,
-      "extraHosts": null,
-      "pseudoTerminal": null,
-      "user": null,
-      "readonlyRootFilesystem": null,
-      "dockerLabels": null,
-      "systemControls": null,
-      "privileged": null,
-      "name": "dlp-training-container"
+      "ulimits": [],
+      "logConfiguration": {
+        "logDriver": "awslogs",
+        "options": {
+          "awslogs-create-group": "true",
+          "awslogs-group": "/ecs/DeployBackendTask",
+          "awslogs-region": "us-east-1",
+          "awslogs-stream-prefix": "ecs"
+        },
+        "secretOptions": []
+      }
     }
   ],
-  "placementConstraints": [],
-  "memory": "5120",
-  "taskRoleArn": "arn:aws:iam::521654603461:role/ecsTaskExecutionRole",
-  "compatibilities": ["EC2", "FARGATE"],
-  "taskDefinitionArn": "arn:aws:ecs:us-west-2:521654603461:task-definition/dlp-training-task:1",
-  "family": "dlp-training-task",
+  "family": "DeployBackendTask",
+  "taskRoleArn": "arn:aws:iam::521654603461:role/DLPEcsTaskRole",
+  "executionRoleArn": "arn:aws:iam::521654603461:role/ecsTaskExecutionRole",
+  "networkMode": "bridge",
+  "revision": 8,
+  "volumes": [],
+  "status": "ACTIVE",
   "requiresAttributes": [
     {
-      "targetId": null,
-      "targetType": null,
-      "value": null,
       "name": "com.amazonaws.ecs.capability.logging-driver.awslogs"
     },
     {
-      "targetId": null,
-      "targetType": null,
-      "value": null,
       "name": "ecs.capability.execution-role-awslogs"
     },
     {
-      "targetId": null,
-      "targetType": null,
-      "value": null,
       "name": "com.amazonaws.ecs.capability.ecr-auth"
     },
     {
-      "targetId": null,
-      "targetType": null,
-      "value": null,
       "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19"
     },
     {
-      "targetId": null,
-      "targetType": null,
-      "value": null,
       "name": "com.amazonaws.ecs.capability.task-iam-role"
     },
     {
-      "targetId": null,
-      "targetType": null,
-      "value": null,
       "name": "ecs.capability.execution-role-ecr-pull"
     },
     {
-      "targetId": null,
-      "targetType": null,
-      "value": null,
       "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18"
     },
     {
-      "targetId": null,
-      "targetType": null,
-      "value": null,
-      "name": "ecs.capability.task-eni"
+      "name": "com.amazonaws.ecs.capability.docker-remote-api.1.29"
     }
   ],
-  "pidMode": null,
-  "requiresCompatibilities": ["FARGATE"],
-  "networkMode": "awsvpc",
-  "runtimePlatform": null,
-  "cpu": "2048",
-  "revision": 1,
-  "status": "ACTIVE",
-  "inferenceAccelerators": null,
-  "proxyConfiguration": null,
-  "volumes": []
+  "placementConstraints": [],
+  "compatibilities": ["EC2"],
+  "requiresCompatibilities": ["EC2"],
+  "cpu": "1024",
+  "memory": "4096",
+  "runtimePlatform": {
+    "cpuArchitecture": "X86_64",
+    "operatingSystemFamily": "LINUX"
+  },
+  "registeredAt": "2024-01-27T21:47:05.605Z",
+  "registeredBy": "arn:aws:sts::521654603461:assumed-role/AWSReservedSSO_DLP_Deploy_a2424e895155366c/AndrewPeng",
+  "tags": []
 }