From 86bb062efe1cb77e169d191a8b08bb65c7c1b7f5 Mon Sep 17 00:00:00 2001 From: Zaurbek Tsorojev Date: Thu, 23 Jun 2022 07:37:28 -0700 Subject: [PATCH 1/2] chore: update ecs containerURI --- ecs.json | 127 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 64 insertions(+), 63 deletions(-) diff --git a/ecs.json b/ecs.json index 8cd6e6b8..80686abf 100644 --- a/ecs.json +++ b/ecs.json @@ -1,68 +1,69 @@ { - "services": [{ - "cluster": "datacamp-services", - "serviceName": "rdoc-app", - "serviceProtocol": "none", - "desiredCount": 1, - "deployment": { - "parameters": { - "slackChannel": "comm-deploys", - "customMessage": "Deploying ${CIRCLE_BUILD_URL}" - } + "services": [ + { + "cluster": "datacamp-services", + "serviceName": "rdoc-app", + "serviceProtocol": "none", + "desiredCount": 1, + "deployment": { + "parameters": { + "slackChannel": "comm-deploys", + "customMessage": "Deploying ${CIRCLE_BUILD_URL}" + } + }, + "loadBalancer": "datacamp-rdocumentation", + "containers": [ + { + "containerName": "rdoc-app", + "containerURI": "708371444347.dkr.ecr.us-east-1.amazonaws.com/${SERVICE}:${CIRCLE_SHA1}", + "containerPort": 1337, + "memoryReservation": 256, + "essential": true, + "healthCheck": { + "command": [ + "CMD-SHELL", + "curl -f http://localhost:1337/status || exit 1" + ], + "interval": 60, + "startPeriod": 120 + }, + "dockerLabels": { + "com.datadoghq.ad.instances": "[{ \"name\": \"service_check\", \"url\": \"http://%%host%%:%%port%%/status\", \"tags\": [\"service:rdoc-app\"], \"allow_redirects\": false }]", + "com.datadoghq.ad.check_names": "[\"http_check\"]", + "com.datadoghq.ad.init_configs": "[{}]" + } + } + ] }, - "loadBalancer": "datacamp-rdocumentation", - "containers": [ - { - "containerName": "rdoc-app", - "containerImage": "rdoc-app", - "containerTag": "${CIRCLE_SHA1}", - "containerPort": 1337, - "memoryReservation": 256, - "essential": true, - "healthCheck": { - "command": [ - "CMD-SHELL", - "curl -f http://localhost:1337/status || exit 1" - ], - "interval": 60, - "startPeriod": 120 + { + "cluster": "datacamp-services", + "serviceName": "rdoc-app-worker", + "serviceProtocol": "none", + "desiredCount": 1, + "loadBalancer": "datacamp-services-internal", + "containers": [ + { + "containerName": "rdoc-app-worker", + "containerImage": "rdoc-app", + "containerTag": "${CIRCLE_SHA1}", + "containerPort": 1337, + "memoryReservation": 4000, + "cpu": 256, + "essential": true }, - "dockerLabels": { - "com.datadoghq.ad.instances": "[{ \"name\": \"service_check\", \"url\": \"http://%%host%%:%%port%%/status\", \"tags\": [\"service:rdoc-app\"], \"allow_redirects\": false }]", - "com.datadoghq.ad.check_names": "[\"http_check\"]", - "com.datadoghq.ad.init_configs": "[{}]" + { + "containerName": "rdoc-app-sqsd", + "containerImage": "sqsd", + "containerTag": "latest", + "memoryReservation": 128, + "essential": true, + "containerCommand": [ + "bash", + "-c", + "eval $(aws-env) && node run-cli.js" + ] } - } - ] - }, - { - "cluster": "datacamp-services", - "serviceName": "rdoc-app-worker", - "serviceProtocol": "none", - "desiredCount": 1, - "loadBalancer": "datacamp-services-internal", - "containers": [ - { - "containerName": "rdoc-app-worker", - "containerImage": "rdoc-app", - "containerTag": "${CIRCLE_SHA1}", - "containerPort": 1337, - "memoryReservation": 4000, - "cpu": 256, - "essential": true - }, - { - "containerName": "rdoc-app-sqsd", - "containerImage": "sqsd", - "containerTag": "latest", - "memoryReservation": 128, - "essential": true, - "containerCommand": [ - "bash", - "-c", - "eval $(aws-env) && node run-cli.js" - ] - } - ] - }] + ] + } + ] } From 03de8d99c4e09a85feaac24f8ddb54fde5c903c9 Mon Sep 17 00:00:00 2001 From: Zaurbek Tsorojev Date: Thu, 23 Jun 2022 07:40:02 -0700 Subject: [PATCH 2/2] chore: hardcode service name to rdoc-app --- ecs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs.json b/ecs.json index 80686abf..499f8b26 100644 --- a/ecs.json +++ b/ecs.json @@ -15,7 +15,7 @@ "containers": [ { "containerName": "rdoc-app", - "containerURI": "708371444347.dkr.ecr.us-east-1.amazonaws.com/${SERVICE}:${CIRCLE_SHA1}", + "containerURI": "708371444347.dkr.ecr.us-east-1.amazonaws.com/rdoc-app:${CIRCLE_SHA1}", "containerPort": 1337, "memoryReservation": 256, "essential": true,