WIP on IPv6 support in the container

ooni · Apr 17, 2024 · 82606fa · 82606fa
1 parent b4d355a
commit 82606fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/tf/modules/ooniapi_service/main.tf b/tf/modules/ooniapi_service/main.tf
@@ -46,7 +46,9 @@ data "aws_ecs_task_definition" "ooniapi_service_current" {
 }
 
 resource "aws_ecs_task_definition" "ooniapi_service" {
-  family = "${local.name}-td"
+  family       = "${local.name}-td"
+  network_mode = "awsvpc"
+
   container_definitions = jsonencode([
     {
       cpu       = var.task_cpu,
@@ -58,12 +60,9 @@ resource "aws_ecs_task_definition" "ooniapi_service" {
       memory = var.task_memory,
       name   = local.name,
 
-      network_mode = "awsvpc",
-
       portMappings = [
         {
           containerPort = local.container_port,
-          hostPort      = 0
         }
       ],
       environment = [

diff --git a/tf/modules/oonith_service/main.tf b/tf/modules/oonith_service/main.tf
@@ -47,6 +47,9 @@ data "aws_ecs_task_definition" "oonith_service_current" {
 
 resource "aws_ecs_task_definition" "oonith_service" {
   family = "${local.name}-td"
+
+  network_mode = "awsvpc"
+
   container_definitions = jsonencode([
     {
       cpu       = var.task_cpu,
@@ -58,12 +61,10 @@ resource "aws_ecs_task_definition" "oonith_service" {
       memory = var.task_memory,
       name   = local.name,
 
-      network_mode = "awsvpc",
 
       portMappings = [
         {
           containerPort = local.container_port,
-          hostPort      = 0
         }
       ],
       environment = [
@@ -118,10 +119,11 @@ resource "aws_ecs_service" "oonith_service" {
 
 # The direct
 resource "aws_alb_target_group" "oonith_service_direct" {
-  name     = "${local.name}-direct"
-  port     = 80
-  protocol = "HTTP"
-  vpc_id   = var.vpc_id
+  name        = "${local.name}-direct"
+  port        = 80
+  protocol    = "HTTP"
+  vpc_id      = var.vpc_id
+  target_type = "ip"
 
   tags = var.tags
 }