From 13a412c50ca3a95a02f5afbc13335b74098d4cb4 Mon Sep 17 00:00:00 2001 From: Matt Farrokhzad Date: Fri, 17 May 2024 10:03:05 -0700 Subject: [PATCH] fixing cd --- .github/workflows/deploy-api.yml | 2 +- .../api/.aws/task-definition-development.json | 170 +++++++++++++----- .../.aws/task-definition-development.json~ | 51 ++++++ 3 files changed, 174 insertions(+), 49 deletions(-) create mode 100644 apps/api/.aws/task-definition-development.json~ diff --git a/.github/workflows/deploy-api.yml b/.github/workflows/deploy-api.yml index 6867d9ca..d3027c34 100644 --- a/.github/workflows/deploy-api.yml +++ b/.github/workflows/deploy-api.yml @@ -49,7 +49,7 @@ jobs: uses: aws-actions/amazon-ecs-render-task-definition@v1 with: task-definition: ./apps/api/.aws/task-definition-${{ env.ENVIRONMENT }}.json - container-name: web + container-name: development-identity image: ${{ steps.build-image.outputs.image }} environment-variables: | AWS_REGION=${{ env.AWS_REGION }} diff --git a/apps/api/.aws/task-definition-development.json b/apps/api/.aws/task-definition-development.json index b7f4145e..04570e9d 100644 --- a/apps/api/.aws/task-definition-development.json +++ b/apps/api/.aws/task-definition-development.json @@ -1,51 +1,125 @@ { - "containerDefinitions": [ - { - "name": "web", - "image": "", - "cpu": 0, - "links": [], - "portMappings": [ - { - "containerPort": 8080, - "hostPort": 8080, - "protocol": "tcp" - } - ], - "essential": true, - "entryPoint": [], - "command": [], - "environment": [], - "environmentFiles": [], - "mountPoints": [], - "volumesFrom": [], - "secrets": [], - "dnsServers": [], - "dnsSearchDomains": [], - "extraHosts": [], - "dockerSecurityOptions": [], - "dockerLabels": {}, - "ulimits": [], - "logConfiguration": { - "logDriver": "awslogs", - "options": { - "awslogs-group": "noumena-dev-tdk-api-app-noumenadevtdkapiappalbfargateTaskDefwebLogGroup3CC09CBD-4zhnGNgxGkHR", - "awslogs-region": "us-west-2", - "awslogs-stream-prefix": "noumena-dev-tdk-api-app-alb-fargate" + "taskDefinition": { + "taskDefinitionArn": "arn:aws:ecs:us-west-2:665230337498:task-definition/development-identity-service:13", + "containerDefinitions": [ + { + "name": "development-identity", + "image": "", + "cpu": 512, + "memory": 2048, + "memoryReservation": 100, + "portMappings": [ + { + "containerPort": 8080, + "hostPort": 8080, + "protocol": "tcp" + } + ], + "essential": true, + "environment": [ + { + "name": "AWS_REGION", + "value": "us-west-2" + }, + { + "name": "API_ENV_SECRET_NAME", + "value": "tdkApiEnv" + }, + { + "name": "DATABASE_SECRET_NAME", + "value": "development-identity-db" + } + ], + "mountPoints": [], + "volumesFrom": [], + "linuxParameters": { + "capabilities": { + "add": [], + "drop": [ + "NET_RAW" + ] + }, + "initProcessEnabled": true }, - "secretOptions": [] - }, - "systemControls": [] - } - ], - "family": "noumenadevtdkapiappnoumenadevtdkapiappalbfargateTaskDef464DDCB3", - "taskRoleArn": "arn:aws:iam::665230337498:role/noumena-dev-tdk-api-app-noumenadevtdkapiappecstaskA-V7mWratZrTpj", - "executionRoleArn": "arn:aws:iam::665230337498:role/noumena-dev-tdk-api-app-noumenadevtdkapiappalbfarga-Z2BwGG5MYmpp", - "networkMode": "awsvpc", - "volumes": [], - "placementConstraints": [], - "requiresCompatibilities": ["FARGATE"], - "cpu": "512", - "memory": "2048", + "startTimeout": 30, + "stopTimeout": 120, + "user": "0", + "privileged": false, + "readonlyRootFilesystem": true, + "interactive": false, + "pseudoTerminal": false, + "logConfiguration": { + "logDriver": "awslogs", + "options": { + "awslogs-group": "/aws/ecs/development-identity-cluster", + "awslogs-region": "us-west-2", + "awslogs-stream-prefix": "ecs" + } + }, + "systemControls": [] + } + ], + "family": "development-identity-service", + "taskRoleArn": "arn:aws:iam::665230337498:role/development-identity-service-20240515023426696600000002", + "executionRoleArn": "arn:aws:iam::665230337498:role/development-identity-service-20240515023426696600000003", + "networkMode": "awsvpc", + "revision": 13, + "volumes": [], + "status": "ACTIVE", + "requiresAttributes": [ + { + "name": "ecs.capability.execution-role-awslogs" + }, + { + "name": "com.amazonaws.ecs.capability.ecr-auth" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.17" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.21" + }, + { + "name": "com.amazonaws.ecs.capability.task-iam-role" + }, + { + "name": "ecs.capability.execution-role-ecr-pull" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18" + }, + { + "name": "ecs.capability.task-eni" + }, + { + "name": "com.amazonaws.ecs.capability.logging-driver.awslogs" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.25" + }, + { + "name": "ecs.capability.container-ordering" + } + ], + "placementConstraints": [], + "compatibilities": [ + "EC2", + "FARGATE" + ], + "runtimePlatform": { + "cpuArchitecture": "X86_64", + "operatingSystemFamily": "LINUX" + }, + "requiresCompatibilities": [ + "FARGATE" + ], + "cpu": "1024", + "memory": "4096", + "registeredAt": 1715821922.239, + "registeredBy": "arn:aws:iam::665230337498:user/matt" + }, "tags": [] -} +} \ No newline at end of file diff --git a/apps/api/.aws/task-definition-development.json~ b/apps/api/.aws/task-definition-development.json~ new file mode 100644 index 00000000..0d9ab44e --- /dev/null +++ b/apps/api/.aws/task-definition-development.json~ @@ -0,0 +1,51 @@ +{ + "containerDefinitions": [ + { + "name": "development-identity", + "image": "", + "cpu": 0, + "links": [], + "portMappings": [ + { + "containerPort": 8080, + "hostPort": 8080, + "protocol": "tcp" + } + ], + "essential": true, + "entryPoint": [], + "command": [], + "environment": [], + "environmentFiles": [], + "mountPoints": [], + "volumesFrom": [], + "secrets": [], + "dnsServers": [], + "dnsSearchDomains": [], + "extraHosts": [], + "dockerSecurityOptions": [], + "dockerLabels": {}, + "ulimits": [], + "logConfiguration": { + "logDriver": "awslogs", + "options": { + "awslogs-group": "noumena-dev-tdk-api-app-noumenadevtdkapiappalbfargateTaskDefwebLogGroup3CC09CBD-4zhnGNgxGkHR", + "awslogs-region": "us-west-2", + "awslogs-stream-prefix": "noumena-dev-tdk-api-app-alb-fargate" + }, + "secretOptions": [] + }, + "systemControls": [] + } + ], + "family": "noumenadevtdkapiappnoumenadevtdkapiappalbfargateTaskDef464DDCB3", + "taskRoleArn": "arn:aws:iam::665230337498:role/noumena-dev-tdk-api-app-noumenadevtdkapiappecstaskA-V7mWratZrTpj", + "executionRoleArn": "arn:aws:iam::665230337498:role/noumena-dev-tdk-api-app-noumenadevtdkapiappalbfarga-Z2BwGG5MYmpp", + "networkMode": "awsvpc", + "volumes": [], + "placementConstraints": [], + "requiresCompatibilities": ["FARGATE"], + "cpu": "512", + "memory": "2048", + "tags": [] +}