From c10e577aa73d57f5f102c430fd94d02f69cf9bd2 Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Wed, 5 Jun 2024 14:54:45 -0700 Subject: [PATCH 1/2] fix(terraform): match config to state for source_control don't need the github_action_configuration, but removing this dropped the DOCKER_REGISTRY_SERVER_URL setting, so adding it back --- terraform/app_service.tf | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/terraform/app_service.tf b/terraform/app_service.tf index a332b29b9..8b04a7943 100644 --- a/terraform/app_service.tf +++ b/terraform/app_service.tf @@ -45,7 +45,7 @@ resource "azurerm_linux_web_app" "main" { } app_settings = { - "DOCKER_ENABLE_CI" = "false", + "DOCKER_REGISTRY_SERVER_URL" = "https://ghcr.io/" "WEBSITE_HTTPLOGGING_RETENTION_DAYS" = "99999", "WEBSITE_TIME_ZONE" = "America/Los_Angeles", "WEBSITES_ENABLE_APP_SERVICE_STORAGE" = "false", @@ -103,19 +103,9 @@ 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 - rollback_enabled = true - - github_action_configuration { - generate_workflow_file = false - - container_configuration { - image_name = "cal-itp/benefits" - registry_url = "https://ghcr.io/" - } - } + app_id = azurerm_linux_web_app.main.id + repo_url = "https://github.com/cal-itp/benefits" + branch = local.env_name } resource "azurerm_app_service_custom_hostname_binding" "main" { From 77c4981f0b6164385e5ce849f68202327e7bebdf Mon Sep 17 00:00:00 2001 From: Kegan Maher Date: Wed, 5 Jun 2024 14:55:33 -0700 Subject: [PATCH 2/2] fix(terraform): remove unused? app setting this is always re-added by plan/apply, so apparently it isn't saved anyway --- terraform/app_service.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/terraform/app_service.tf b/terraform/app_service.tf index 8b04a7943..c150ceaca 100644 --- a/terraform/app_service.tf +++ b/terraform/app_service.tf @@ -46,7 +46,6 @@ resource "azurerm_linux_web_app" "main" { app_settings = { "DOCKER_REGISTRY_SERVER_URL" = "https://ghcr.io/" - "WEBSITE_HTTPLOGGING_RETENTION_DAYS" = "99999", "WEBSITE_TIME_ZONE" = "America/Los_Angeles", "WEBSITES_ENABLE_APP_SERVICE_STORAGE" = "false", "WEBSITES_PORT" = "8000",