Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 30

Ensure extra env vars apply (#9649)

Browse source
This commit is contained in:
Robert Fairburn 2023-02-03 00:40:03 -06:00 committed by GitHub
parent ae8c2a40c9
commit 7f2ff02801
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
terraform/byo-vpc/byo-db/byo-ecs/main.tf
View file

@ -1,3 +1,10 @@
locals {
environment = [ for k, v in var.fleet_config.extra_environment_variables : {
name = k
value = v
}]
}
data "aws_region" "current" {} data "aws_region" "current" {}
resource "aws_ecs_service" "fleet" { resource "aws_ecs_service" "fleet" {
@ -77,7 +84,7 @@ resource "aws_ecs_task_definition" "backend" {
valueFrom = var.fleet_config.database.password_secret_arn valueFrom = var.fleet_config.database.password_secret_arn
} }
] ]
environment = [ environment = concat([
{ {
name = "FLEET_MYSQL_USERNAME" name = "FLEET_MYSQL_USERNAME"
value = var.fleet_config.database.user value = var.fleet_config.database.user
@ -114,7 +121,7 @@ resource "aws_ecs_task_definition" "backend" {
name = "FLEET_SERVER_TLS" name = "FLEET_SERVER_TLS"
value = "false" value = "false"
}, },
] ], local.environment)
} }
]) ])
} }