Merge pull request #16 from dxw/fix/append-workspace-to-ecr-name

leeky · web-flow · commit aa1c5841ec1b · 2018-07-26T11:51:17.000+01:00
(Fix) Append workspace to ECR name
diff --git a/terraform/terraform.tf b/terraform/terraform.tf
@@ -20,7 +20,7 @@ terraform {
 ## ECR
 
 resource "aws_ecr_repository" "api" {
-  name = "${var.app_name}"
+  name = "${var.app_name}-${terraform.workspace}"
 }
 
 ## CodePipeline
@@ -78,7 +78,7 @@ data "template_file" "buildspec" {
 
   vars {
     aws_account_id  = "${data.aws_caller_identity.current.account_id}"
-    image_repo_name = "${var.app_name}"
+    image_repo_name = "${var.app_name}-${terraform.workspace}"
     rails_env       = "${var.rails_env}"
     task_name       = "dss-infrastructure-${terraform.workspace}-api"
   }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ terraform {`
`20`	`20`	`## ECR`
`21`	`21`
`22`	`22`	`resource "aws_ecr_repository" "api" {`
`23`		`- name = "${var.app_name}"`
	`23`	`+ name = "${var.app_name}-${terraform.workspace}"`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`## CodePipeline`
`@@ -78,7 +78,7 @@ data "template_file" "buildspec" {`
`78`	`78`
`79`	`79`	`vars {`
`80`	`80`	`aws_account_id = "${data.aws_caller_identity.current.account_id}"`
`81`		`- image_repo_name = "${var.app_name}"`
	`81`	`+ image_repo_name = "${var.app_name}-${terraform.workspace}"`
`82`	`82`	`rails_env = "${var.rails_env}"`
`83`	`83`	`task_name = "dss-infrastructure-${terraform.workspace}-api"`
`84`	`84`	`}`