Additional update to deploy.sh for dev / prod deployment

Author: mtwomey

README.md

@@ -89,13 +89,15 @@ Pending low-priority stuff (these are important, but can be added along the way)
 
 ### CI / CD
 Deploy scripts are setup to use AWS ECS + CircleCI. Make sure the following environment variables are setup in CircleCI:
-* AWS_REGION
-* DEV_AWS_ACCOUNT_ID
+* AWS_ECS_SERVICE
+* AWS_REPOSITORY
 * DEV_AWS_ACCESS_KEY_ID
+* DEV_AWS_ACCOUNT_ID
+* DEV_AWS_ECS_CLUSTER
+* DEV_AWS_REGION
 * DEV_AWS_SECRET_ACCESS_KEY
-* PROD_AWS_ACCOUNT_ID
 * PROD_AWS_ACCESS_KEY_ID
+* PROD_AWS_ACCOUNT_ID
+* PROD_AWS_ECS_CLUSTER
+* PROD_AWS_REGION
 * PROD_AWS_SECRET_ACCESS_KEY
-* AWS_ECS_SERVICE
-* AWS_ECS_CLUSTER
-* AWS_REPOSITORY

deploy.sh

@@ -40,42 +40,42 @@ deploy_cluster() {
 make_task_def(){
 	task_template='[
 		{
-			"name": "community-app",
-			"image": "%s.dkr.ecr.%s.amazonaws.com/%s:%s",
-			"essential": true,
-			"memory": 500,
-			"cpu": 100,
-      "environment": [
-        {
-          "name": "NODE_ENV",
-          "value": "%s"
-        }
-      ],
-      "portMappings": [
-        {
-          "hostPort": 0,
-          "containerPort": 3000,
-          "protocol": "tcp"
-        }
-      ],
-      "logConfiguration": {
-       "logDriver": "awslogs",
-       "options": {
-         "awslogs-group": "/aws/ecs/cluster-1",
-         "awslogs-region": "us-west-2",
-         "awslogs-stream-prefix": "community-app"
-       }
-     }
+				"name": "community-app",
+				"image": "%s.dkr.ecr.%s.amazonaws.com/%s:%s",
+				"essential": true,
+				"memory": 500,
+				"cpu": 100,
+				"environment": [
+						{
+								"name": "NODE_ENV",
+								"value": "%s"
+						}
+				],
+				"portMappings": [
+						{
+								"hostPort": 0,
+								"containerPort": 3000,
+								"protocol": "tcp"
+						}
+				],
+				"logConfiguration": {
+						"logDriver": "awslogs",
+						"options": {
+								"awslogs-group": "/aws/ecs/%s",
+								"awslogs-region": "%s",
+								"awslogs-stream-prefix": "community-app"
+						}
+				}
 		}
 	]'
+	
 	if [ "$ENV" = "PROD" ]; then
-		NODE_ENV=production
+			NODE_ENV=production
 	elif [ "$ENV" = "DEV" ]; then
-		NODE_ENV=development
+			NODE_ENV=development
 	fi
 
-	task_def=$(printf "$task_template" $ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $NODE_ENV)
-
+	task_def=$(printf "$task_template" $ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $NODE_ENV $AWS_ECS_CLUSTER $AWS_REGION)
 }
 
 push_ecr_image() {