Merge branch 'main' into split-off-coverage-checking

cyber-dojo · Oct 29, 2024 · ff13732 · ff13732
2 parents 5ea5be4 + 1979055
commit ff13732
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/deployment/terraform/274425519734-eu-central-1.tfvars b/deployment/terraform/274425519734-eu-central-1.tfvars
@@ -1,4 +1,6 @@
 env = "prod"
 
+container_restart_policy_enabled = false
+
 # Allow to replicate app docker images from this account
 ecr_replication_origin = "244531986313"
diff --git a/deployment/terraform/deployment.tf b/deployment/terraform/deployment.tf
@@ -1,15 +1,17 @@
 module "ecs-service" {
-  source                    = "s3::https://s3-eu-central-1.amazonaws.com/terraform-modules-9d7e951c290ec5bbe6506e0ddb064808764bc636/terraform-modules.zip//ecs-service/v4"
-  service_name              = var.service_name
-  TAGGED_IMAGE              = var.TAGGED_IMAGE
-  enable_execute_command    = "true"
-  app_port                  = var.app_port
-  desired_count             = var.desired_count
-  cpu_limit                 = var.cpu_limit
-  mem_reservation           = var.mem_reservation
-  mem_limit                 = var.mem_limit
-  app_env_vars              = local.app_env_vars
-  ecs_wait_for_steady_state = true
+  source                           = "s3::https://s3-eu-central-1.amazonaws.com/terraform-modules-9d7e951c290ec5bbe6506e0ddb064808764bc636/terraform-modules.zip//ecs-service/v5"
+  service_name                     = var.service_name
+  TAGGED_IMAGE                     = var.TAGGED_IMAGE
+  enable_execute_command           = "true"
+  app_port                         = var.app_port
+  desired_count                    = var.desired_count
+  cpu_limit                        = var.cpu_limit
+  mem_reservation                  = var.mem_reservation
+  mem_limit                        = var.mem_limit
+  app_env_vars                     = local.app_env_vars
+  ecs_wait_for_steady_state        = true
+  ecs_service_update_timeout       = "10m"
+  container_restart_policy_enabled = var.container_restart_policy_enabled
   volumes = [
     {
       name          = "docker_socket"

diff --git a/deployment/terraform/variables.tf b/deployment/terraform/variables.tf
@@ -32,6 +32,12 @@ variable "mem_reservation" {
   default = 128
 }
 
+variable "container_restart_policy_enabled" {
+  description = "Whether to enable restart policy for the container."
+  type        = bool
+  default     = true
+}
+
 variable "TAGGED_IMAGE" {
   type = string
 }

diff --git a/deployment/terraform/versions.tf b/deployment/terraform/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.25.0"
+      version = "~> 5.73.0"
     }
     random = {
       source  = "hashicorp/random"