Skip to content

Commit

Permalink
Merge pull request #12 from druids/chore/update-terraform
Browse files Browse the repository at this point in the history
chore: update for Terraform 1.0.1
  • Loading branch information
radimsuckr authored Jun 25, 2021
2 parents e0d50fa + 18013dc commit 3f355ce
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
7 changes: 4 additions & 3 deletions container.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module "container_definition_noalb" { // Without ALB
count = var.create_alb_resources ? 0 : 1

source = "cloudposse/ecs-container-definition/aws"
version = "v0.45.2"
version = "v0.57.0"

container_name = var.name
container_image = var.image == "" ? aws_ecr_repository.application[0].repository_url : var.image
Expand Down Expand Up @@ -45,7 +45,7 @@ module "container_definition_alb" { // With ALB
count = var.create_alb_resources ? 1 : 0

source = "cloudposse/ecs-container-definition/aws"
version = "v0.45.2"
version = "v0.57.0"

container_name = var.name
container_image = var.image == "" ? aws_ecr_repository.application[0].repository_url : var.image
Expand All @@ -66,6 +66,7 @@ module "container_definition_alb" { // With ALB
{
containerPath = "/etc/nginx/conf.d/"
sourceVolume = "nginx_config"
readOnly = true
},
] : []

Expand All @@ -86,7 +87,7 @@ module "container_definition_nginx" { // Nginx task
count = var.create_alb_resources && var.create_nginx ? 1 : 0

source = "cloudposse/ecs-container-definition/aws"
version = "v0.45.2"
version = "v0.57.0"

container_name = var.nginx_container_name
container_image = var.nginx_container_image
Expand Down
13 changes: 7 additions & 6 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ locals {
name_underscore = "${var.project}_${var.app}_${var.stage}_${var.name}"

tags = merge(
map(
"Name", local.name,
"Project", var.project,
"Stage", var.stage,
"App", var.app,
), var.tags
tomap({
"Name" = local.name
"Project" = var.project
"Stage" = var.stage
"App" = var.app
}),
var.tags,
)
}

Expand Down

0 comments on commit 3f355ce

Please sign in to comment.