Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions dss_ecr.tf
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@

# dss containers
# DSpace Submission Service (dss) containers
# This is a standard ECR for an ECS with a Fargate launch type

locals {
ecr_dss = "dspace-submission-service-${var.environment}"
}

module "ecr_dss" {
source = "./modules/ecr"
repo_name = "dspace-submission-service"
Expand All @@ -21,7 +22,7 @@ module "ecr_dss" {
## For dss application repo and ECR repository
# Outputs in dev
output "dss_fargate_dev_build_workflow" {
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build.tpl", {
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build-cpu-arch.tpl", {
region = var.aws_region
role = module.ecr_dss.gha_role
ecr = module.ecr_dss.repository_name
Expand All @@ -31,7 +32,7 @@ output "dss_fargate_dev_build_workflow" {
description = "Full contents of the dev-build.yml for the dss repo"
}
output "dss_fargate_makefile" {
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile.tpl", {
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile-cpu-arch.tpl", {
ecr_name = module.ecr_dss.repository_name
ecr_url = module.ecr_dss.repository_url
function = ""
Expand All @@ -42,7 +43,7 @@ output "dss_fargate_makefile" {

# Outputs in stage
output "dss_fargate_stage_build_workflow" {
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build.tpl", {
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build-cpu-arch.tpl", {
region = var.aws_region
role = module.ecr_dss.gha_role
ecr = module.ecr_dss.repository_name
Expand All @@ -54,7 +55,7 @@ output "dss_fargate_stage_build_workflow" {

# Outputs after promotion to prod
output "dss_fargate_prod_promote_workflow" {
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote.tpl", {
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote-cpu-arch.tpl", {
region = var.aws_region
role_stage = "${module.ecr_dss.repo_name}-gha-stage"
role_prod = "${module.ecr_dss.repo_name}-gha-prod"
Expand Down