From ff98a62f1e6546f5e9e894fd4090f82ac9a110c2 Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Wed, 12 Jun 2024 14:00:26 -0700 Subject: [PATCH 1/2] fix(terraform): turn on manual integration we don't want Azure continuous deployment / webhooks --- terraform/app_service.tf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/terraform/app_service.tf b/terraform/app_service.tf index 15dd3e5042..e025e2d319 100644 --- a/terraform/app_service.tf +++ b/terraform/app_service.tf @@ -102,9 +102,10 @@ resource "azurerm_linux_web_app" "main" { } resource "azurerm_app_service_source_control" "main" { - app_id = azurerm_linux_web_app.main.id - repo_url = "https://github.com/cal-itp/benefits" - branch = local.env_name + app_id = azurerm_linux_web_app.main.id + repo_url = "https://github.com/cal-itp/benefits" + branch = local.env_name + use_manual_integration = true } resource "azurerm_app_service_custom_hostname_binding" "main" { From f7951f7b0460006fa77796b1e73c0f618ea6a6e9 Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Wed, 12 Jun 2024 14:01:23 -0700 Subject: [PATCH 2/2] fix(terraform): add container config block it seems like Deployment Center is stuck with pending changes --- terraform/app_service.tf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/terraform/app_service.tf b/terraform/app_service.tf index e025e2d319..af9392351a 100644 --- a/terraform/app_service.tf +++ b/terraform/app_service.tf @@ -106,6 +106,14 @@ resource "azurerm_app_service_source_control" "main" { repo_url = "https://github.com/cal-itp/benefits" branch = local.env_name use_manual_integration = true + + github_action_configuration { + generate_workflow_file = false + container_configuration { + registry_url = "https://ghcr.io/" + image_name = "cal-itp/benefits" + } + } } resource "azurerm_app_service_custom_hostname_binding" "main" {