nginx on port 80 and add links for beanstalk

Author: mwunderl

.gitignore

@@ -6,3 +6,5 @@ build/*
 !bin/*.sh
 lib
 task-definition/scorekeep-task-definition.json
+.elasticbeanstalk/*
+

cloudformation/Makefile

@@ -8,5 +8,11 @@ check-region:
 stack: check-region
 	aws --region $(AWS_REGION) cloudformation create-stack --stack-name scorekeep --capabilities "CAPABILITY_NAMED_IAM" --template-body file://cf-resources.yaml
 
+update: check-region
+	aws --region $(AWS_REGION) cloudformation update-stack --stack-name scorekeep --capabilities "CAPABILITY_NAMED_IAM" --template-body file://cf-resources.yaml
+
+check: check-region
+	aws --region $(AWS_REGION) cloudformation describe-stack-events --stack-name scorekeep --max-items 4
+
 clean: check-region
 	aws --region $(AWS_REGION) cloudformation delete-stack --stack-name scorekeep

scorekeep-frontend/nginx.conf

@@ -20,14 +20,14 @@ http {
   }
 
   server {
-      listen        8080 default_server;
+      listen        80 default_server;
       root /public;
 
       location / {
       }
 
       location /api {
-          proxy_pass          http://127.0.0.1:5000;
+          proxy_pass          http://scorekeep-api:5000;
           proxy_http_version  1.1;
 
           proxy_set_header    Connection          $connection_upgrade;

scorekeep-frontend/public/index.html

@@ -45,7 +45,7 @@
               <h3 class="masthead-brand"><a href="#/" id="scorekeep-anchor">Scorekeep</a></h3>
               <nav class="nav nav-masthead">
                 <a class="nav-link" href='#/' onclick="showhide('instructions');return false;">Instructions</a>
-                <a class="nav-link" target="blank" href="https://aws.amazon.com/ecs/">Powered by AWS Fargate</a>
+                <a class="nav-link" target="blank" href="https://aws.amazon.com/ecs/">Powered by Amazon ECS</a>
               </nav>
             </div>
           </div>

task-definition/.gitignore

@@ -0,0 +1,5 @@
+
+# Elastic Beanstalk Files
+.elasticbeanstalk/*
+!.elasticbeanstalk/*.cfg.yml
+!.elasticbeanstalk/*.global.yml

task-definition/generate-task-definition

@@ -6,7 +6,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 TASK_DEFINITION_INPUT_FILE="scorekeep-task-definition.template"
 TASK_DEFINITION_INPUT_PATH="${DIR}/template/${TASK_DEFINITION_INPUT_FILE}"
 
-TASK_DEFINITION_OUTPUT_FILE="scorekeep-task-definition.json"
+TASK_DEFINITION_OUTPUT_FILE="Dockerrun.aws.json"
 TASK_DEFINITION_OUTPUT_PATH="${DIR}/${TASK_DEFINITION_OUTPUT_FILE}"
 
 PARAMETERS_FILE="../aws.env"

task-definition/template/scorekeep-task-definition.template

@@ -1,17 +1,21 @@
 {
+    "AWSEBDockerrunVersion": 2,
     "family": "scorekeep",
-    "networkMode":"awsvpc",
-     "containerDefinitions": [
+    "containerDefinitions": [
          {
-          "name": "scorekeep-frontend",                                                          
+          "name": "scorekeep-frontend",
           "image": "$$ACCOUNT_ID$$.dkr.ecr.$$REGION$$.amazonaws.com/scorekeep-frontend",
-          "cpu": 256,
+          "cpu": 64,
           "memoryReservation": 512,
           "portMappings" : [
               {
-                  "containerPort": 8080
+                  "hostPort": 80,
+                  "containerPort": 80
               }
           ],
+          "links": [
+            "scorekeep-api"
+          ],
           "logConfiguration": {
               "logDriver": "awslogs",
               "options": {
@@ -22,16 +26,17 @@
           }
          },
          {
-          "name": "scopekeep-api",                                                          
+          "name": "scorekeep-api",
           "image": "$$ACCOUNT_ID$$.dkr.ecr.$$REGION$$.amazonaws.com/scorekeep-api",
-          "cpu": 768,
+          "cpu": 192,
           "memoryReservation": 512,
           "environment": [
               { "name" : "AWS_REGION", "value" : "$$REGION$$" },
               { "name" : "NOTIFICATION_TOPIC", "value" : "arn:aws:sns:$$REGION$$:$$ACCOUNT_ID$$:scorekeep-notifications" }
           ],
           "portMappings" : [
               {
+                  "hostPort": 5000,
                   "containerPort": 5000
               }
           ],
@@ -47,9 +52,6 @@
     ],
     "executionRoleArn": "arn:aws:iam::$$ACCOUNT_ID$$:role/scorekeepExecutionRole",
     "taskRoleArn": "arn:aws:iam::$$ACCOUNT_ID$$:role/scorekeepRole",
-    "requiresCompatibilities": [
-        "FARGATE"
-    ],
     "cpu": ".25 vcpu",
     "memory": "1 gb"
 }