diff --git a/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf b/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf index aafb9d78fb..79dfa04472 100644 --- a/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf +++ b/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf @@ -83,7 +83,7 @@ resource "azurerm_user_assigned_identity" "nexus_msi" { location = data.azurerm_resource_group.rg.location resource_group_name = local.core_resource_group_name tags = local.tre_shared_service_tags - + lifecycle { ignore_changes = [tags] } } @@ -113,7 +113,7 @@ resource "azurerm_linux_virtual_machine" "nexus" { source_image_reference { publisher = "Canonical" offer = "0001-com-ubuntu-server-jammy" - sku = "22_04-lts" + sku = "22_04-lts-gen2" version = "latest" } diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml index 445232c1f7..99531bf1da 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-service-guacamole-linuxvm -version: 0.6.12 +version: 0.6.13 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre @@ -34,7 +34,7 @@ custom: source_image_reference: publisher: microsoft-dsvm offer: ubuntu-2004 - sku: 2004 + sku: 2004-gen2 version: latest install_ui: true conda_config: true