fixes #3: delivering requirements.txt to container over the user data…

… in container instance
gfkse · Jan 19, 2021 · 701ff28 · 701ff28
1 parent b197335
commit 701ff28
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 8 deletions.
diff --git a/docs/module_architecture.png b/docs/module_architecture.png
diff --git a/ecs.tf b/ecs.tf
@@ -82,6 +82,11 @@ resource "aws_ecs_task_definition" "webserver" {
   requires_compatibilities = [var.ecs_launch_type]
   task_role_arn            = aws_iam_role.ecs_task_role.arn
 
+  volume {
+    name      = "requirements_on_ec2"
+    host_path = "/home/ec2-user/airflow/docker/requirements.txt"
+  }
+
   volume {
     name = "requirements"
     efs_volume_configuration {
@@ -134,6 +139,11 @@ resource "aws_ecs_task_definition" "scheduler" {
   requires_compatibilities = [var.ecs_launch_type]
   task_role_arn            = aws_iam_role.ecs_task_role.arn
 
+  volume {
+    name      = "requirements_on_ec2"
+    host_path = "/home/ec2-user/airflow/docker/requirements.txt"
+  }
+
   volume {
     name = "requirements"
     efs_volume_configuration {
@@ -186,6 +196,11 @@ resource "aws_ecs_task_definition" "worker" {
   requires_compatibilities = [var.ecs_launch_type]
   task_role_arn            = aws_iam_role.ecs_task_role.arn
 
+  volume {
+    name      = "requirements_on_ec2"
+    host_path = "/home/ec2-user/airflow/docker/requirements.txt"
+  }
+
   volume {
     name = "requirements"
     efs_volume_configuration {

diff --git a/templates/scheduler.json b/templates/scheduler.json
@@ -72,15 +72,15 @@
         "containerPath": "/usr/local/airflow/dags",
         "sourceVolume": "dags"
       },
+      {
+        "readOnly": true,
+        "containerPath": "/requirements.txt",
+        "sourceVolume": "requirements_on_ec2"
+      },
       {
         "readOnly": false,
         "containerPath": "/usr/local/airflow/logs",
         "sourceVolume": "scheduler_logs"
-      },
-      {
-        "readOnly": true,
-        "containerPath": "/requirements.txt",
-        "sourceVolume": "requirements"
       }
     ],
     "workingDirectory": null,

diff --git a/templates/webserver.json b/templates/webserver.json
@@ -85,7 +85,7 @@
       {
         "readOnly": true,
         "containerPath": "/requirements.txt",
-        "sourceVolume": "requirements"
+        "sourceVolume": "requirements_on_ec2"
       },
       {
         "readOnly": false,

diff --git a/templates/worker.json b/templates/worker.json
@@ -95,7 +95,7 @@
       {
         "readOnly": true,
         "containerPath": "/requirements.txt",
-        "sourceVolume": "requirements"
+        "sourceVolume": "requirements_on_ec2"
       },
       {
         "readOnly": false,

diff --git a/variables.tf b/variables.tf
@@ -260,7 +260,7 @@ variable "key_name" {
 variable "ecs_ami_id" {
   type        = string
   description = "ECS container instance ami."
-  default     = "ami-0b7f40a0eabbcc8c0"
+  default     = "ami-0e781777db20a4f7f"
 }
 
 variable "ecs_instance_type" {