small fix

OxBRCInformatics · Sep 29, 2024 · fc354ed · fc354ed
1 parent ca32156
commit fc354ed
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/...ates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/porter.yaml b/...ates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/porter.yaml
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-service-guacamole-linuxvm-ouh2
-version: 1.0.11
+version: 1.0.12
 description: "An Azure TRE User Resource Template for Guacamole (Linux)"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/...kspace_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/terraform/locals.tf b/...kspace_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/terraform/locals.tf
@@ -15,7 +15,6 @@ locals {
     tre_user_resource_id     = var.tre_resource_id
   }
   nexus_proxy_url = "http://nexus-${data.azurerm_public_ip.app_gateway_ip.fqdn}"
-
   # Load VM SKU/image details from porter.yaml
   porter_yaml   = yamldecode(file("${path.module}/../porter.yaml"))
   vm_sizes      = local.porter_yaml["custom"]["vm_sizes"]
@@ -25,8 +24,6 @@ locals {
   selected_image = local.image_details[var.image]
   # selected_image_source_refs is an array to enable easy use of a dynamic block
   selected_image_source_refs = lookup(local.selected_image, "source_image_reference", null) == null ? [] : [local.selected_image.source_image_reference]
-  # Handle both source_image_reference and source_image_name cases
   selected_image_source_id   = lookup(local.selected_image, "source_image_name", null) == null ? null : "${var.image_gallery_id}/images/${local.selected_image.source_image_name}"
-  # Apt SKU should only be referenced if source_image_reference is not null
-  apt_sku                    = length(local.selected_image_source_refs) > 0 ? local.selected_image_source_refs[0]["apt_sku"] : "22.04"
+  apt_sku                    = local.selected_image_source_refs[0]["apt_sku"]
 }
diff --git a/...es/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm-ouh2/porter.yaml b/...es/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm-ouh2/porter.yaml
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-service-guacamole-windowsvm-ouh2
-version: 1.0.2
+version: 1.0.3
 description: "An Azure TRE User Resource Template for Guacamole (Windows 10)"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/..._services/guacamole/user_resources/guacamole-azure-windowsvm-ouh2/terraform/vm_config.ps1 b/..._services/guacamole/user_resources/guacamole-azure-windowsvm-ouh2/terraform/vm_config.ps1
@@ -36,8 +36,8 @@ if( ${CondaConfig} -eq 1 )
 }
 
 # Define the download URL and output path
-$libreOfficeUrl = "https://download.documentfoundation.org/libreoffice/stable/7.6.2/win/x86_64/LibreOffice_7.6.2_Win_x64.msi"
-$installerPath = "$env:TEMP\LibreOffice_7.6.2_Win_x64.msi"
+$libreOfficeUrl = "https://download.documentfoundation.org/libreoffice/stable/24.2.6/win/x86_64/LibreOffice_24.2.6_Win_x86-64.msi"
+$installerPath = "C:\BuildArtifacts\LibreOffice_24.2.6_Win_x86-64.msi"
 
 # Download the LibreOffice installer
 Invoke-WebRequest -Uri $libreOfficeUrl -OutFile $installerPath