update apt-source-list

ImperialCollegeLondon · Apr 10, 2024 · a09af34 · a09af34
1 parent 271c7e0
commit a09af34
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
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
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-service-guacamole-linuxvm
-version: 0.6.15
+version: 0.6.16
 description: "An Azure TRE User Resource Template for Guacamole (Linux)"
 dockerfile: Dockerfile.tmpl
 registry: azuretre
@@ -20,6 +20,7 @@ custom:
         offer: 0001-com-ubuntu-server-jammy
         sku: 22_04-lts-gen2
         version: latest
+        apt-sku: 22.04
       install_ui: true
       conda_config: false
     "Ubuntu 20.04 LTS":
@@ -28,6 +29,7 @@ custom:
         offer: 0001-com-ubuntu-server-focal
         sku: 20_04-lts-gen2
         version: latest
+        apt-sku: 20.04
       install_ui: true
       conda_config: false
     "Ubuntu 20.04 LTS Data Science VM":
@@ -36,6 +38,7 @@ custom:
         offer: ubuntu-2004
         sku: 2004-gen2
         version: latest
+        apt-sku: 20.04
       install_ui: true
       conda_config: true
     # For information on using custom images, see README.me in the guacamole/user-resources folder

diff --git a/...ervices/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml b/...ervices/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml
@@ -14,7 +14,6 @@ apt:
     deb [trusted=yes] $PRIMARY $RELEASE main restricted universe multiverse
     deb [trusted=yes] $PRIMARY $RELEASE-updates main restricted universe multiverse
     deb [trusted=yes] $SECURITY $RELEASE main restricted universe multiverse
-    deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/ubuntu/22.04/prod $RELEASE main
-    deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/ubuntu/20.04/prod $RELEASE main
+    deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/ubuntu/${sku}/prod $RELEASE main
     deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/repos/edge stable main
     deb [signed-by=/etc/apt/trusted.gpg.d/docker-archive-keyring.gpg] ${nexus_proxy_url}/repository/docker/ $RELEASE stable
diff --git a/.../workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf b/.../workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf
@@ -131,6 +131,7 @@ data "template_file" "apt_sources_config" {
   template = file("${path.module}/apt_sources_config.yml")
   vars = {
     nexus_proxy_url = local.nexus_proxy_url
+    sku             = local.apt_sku
   }
 }
 

diff --git a/...s/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/locals.tf b/...s/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/locals.tf
@@ -15,7 +15,6 @@ locals {
     tre_user_resource_id     = var.tre_resource_id
   }
   nexus_proxy_url = "https://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"]
@@ -26,4 +25,5 @@ locals {
   # 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]
   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                    = local.selected_image_source_refs[0]["apt-sku"]
 }