From 27167496ec361294dcfe851bed55a30541594416 Mon Sep 17 00:00:00 2001 From: wojciechcloudkubed <159798789+wojciechcloudkubed@users.noreply.github.com> Date: Tue, 2 Apr 2024 09:23:37 +0100 Subject: [PATCH 01/62] Ubuntu update (#1) * personal * update ubuntu image * revert changes * update ubuntu version * update version * update offer * update sku * change offer --------- Co-authored-by: Wojciech <57405495+thewbuk@users.noreply.github.com> --- .../resource_processor/vmss_porter/main.tf | 4 ++-- core/version.txt | 2 +- e2e_tests/test_performance.py | 2 +- .../sonatype-nexus-vm/terraform/vm.tf | 2 +- .../guacamole/user_resources/README.md | 17 +++++++---------- .../guacamole-azure-linuxvm/porter.yaml | 15 +++++++-------- .../template_schema.json | 4 ++-- .../terraform/apt_sources_config.yml | 2 +- 8 files changed, 22 insertions(+), 26 deletions(-) diff --git a/core/terraform/resource_processor/vmss_porter/main.tf b/core/terraform/resource_processor/vmss_porter/main.tf index a9599527d2..a361a42faa 100644 --- a/core/terraform/resource_processor/vmss_porter/main.tf +++ b/core/terraform/resource_processor/vmss_porter/main.tf @@ -107,8 +107,8 @@ resource "azurerm_linux_virtual_machine_scale_set" "vm_linux" { source_image_reference { publisher = "Canonical" - offer = "UbuntuServer" - sku = "18.04-LTS" + offer = "0001-com-ubuntu-server-jammy" + sku = "22_04-lts" version = "latest" } diff --git a/core/version.txt b/core/version.txt index 50533e307d..f5b77301f5 100644 --- a/core/version.txt +++ b/core/version.txt @@ -1 +1 @@ -__version__ = "0.9.6" +__version__ = "0.9.7" diff --git a/e2e_tests/test_performance.py b/e2e_tests/test_performance.py index 9f284fc235..6c6d836d9d 100644 --- a/e2e_tests/test_performance.py +++ b/e2e_tests/test_performance.py @@ -106,7 +106,7 @@ async def test_bulk_updates_to_ensure_each_resource_updated_in_series(verify) -> "properties": { "display_name": "Perf test VM", "description": "", - "os_image": "Ubuntu 18.04" + "os_image": "Ubuntu 22.04 LTS" } } diff --git a/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf b/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf index 27a6a3d04f..48270d7602 100644 --- a/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf +++ b/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf @@ -112,7 +112,7 @@ resource "azurerm_linux_virtual_machine" "nexus" { source_image_reference { publisher = "Canonical" offer = "0001-com-ubuntu-server-jammy" - sku = "22_04-lts-gen2" + sku = "22_04-lts" version = "latest" } diff --git a/templates/workspace_services/guacamole/user_resources/README.md b/templates/workspace_services/guacamole/user_resources/README.md index c553e1673a..69fc1a08dc 100644 --- a/templates/workspace_services/guacamole/user_resources/README.md +++ b/templates/workspace_services/guacamole/user_resources/README.md @@ -2,10 +2,9 @@ This folder contains user resources that can be deployed with the Guacamole workspace service: -- linuxvm - a Linux-based virtual machine (expects an Ubuntu 18.04-based VM) +- linuxvm - a Linux-based virtual machine (expects an Ubuntu 18.Ubuntu 22.04 LTS-based VM) - windowsvm - A Windows-based virtual machine - ## Customising the user resources The `guacamole-azure-linuxvm` and `guacamole-azure-windowsvm` folders follow a consistent layout. @@ -29,19 +28,19 @@ custom: "8 CPU | 32GB RAM": Standard_D8s_v5 "16 CPU | 64GB RAM": Standard_D16s_v5 image_options: - "Ubuntu 18.04": + "Ubuntu 22.04 LTS": source_image_reference: publisher: canonical - offer: ubuntuserver - sku: 18_04-lts-gen2 + offer: 0001-com-ubuntu-server-jammy + sku: 22_04-lts version: latest install_ui: true conda_config: false - "Ubuntu 18.04 Data Science VM": + "Ubuntu 22.04 LTS Data Science VM": source_image_reference: publisher: microsoft-dsvm - offer: ubuntu-1804 - sku: 1804-gen2 + offer: 0001-com-ubuntu-server-jammy + sku: 22_04-lts version: latest install_ui: false conda_config: true @@ -68,8 +67,6 @@ When specifying images using `source_image_name`, the image must be stored in an To enable re-using built user resource templates across environments where the image may vary, the image gallery is configured via the `RP_BUNDLE_VALUES` environment variable when deploying the TRE. The `RP_BUNDLE_VALUES` variable is a JSON object, and the `image_gallery_id` property within it identifies the image gallery that contains the images specified by `source_image_name`: - ```bash RP_BUNDLE_VALUES='{"image_gallery_id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups//providers/Microsoft.Compute/galleries/"} ``` - 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 f36a668258..d9eed64fe0 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 @@ -14,19 +14,19 @@ custom: "8 CPU | 32GB RAM": Standard_D8s_v5 "16 CPU | 64GB RAM": Standard_D16s_v5 image_options: - "Ubuntu 18.04": + "Ubuntu 22.04 LTS": source_image_reference: publisher: canonical - offer: ubuntuserver - sku: 18_04-lts-gen2 + offer: 0001-com-ubuntu-server-jammy + sku: 22_04-lts version: latest install_ui: true conda_config: false - "Ubuntu 18.04 Data Science VM": + "Ubuntu 22.04 LTS Data Science VM": source_image_reference: publisher: microsoft-dsvm - offer: ubuntu-1804 - sku: 1804-gen2 + offer: 0001-com-ubuntu-server-jammy + sku: 22_04-lts version: latest install_ui: false conda_config: true @@ -36,7 +36,6 @@ custom: # install_ui: true # conda_config: true - credentials: - name: azure_tenant_id env: ARM_TENANT_ID @@ -91,7 +90,7 @@ parameters: default: "public" - name: os_image type: string - default: "Ubuntu 18.04 Data Science VM" + default: "Ubuntu 22.04 LTS Data Science VM" - name: vm_size type: string default: "2 CPU | 8GB RAM" diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/template_schema.json b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/template_schema.json index 9c7aec15a3..95bc05b4e8 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/template_schema.json +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/template_schema.json @@ -16,8 +16,8 @@ "title": "Linux image", "description": "Select Linux image to use for VM", "enum": [ - "Ubuntu 18.04", - "Ubuntu 18.04 Data Science VM" + "Ubuntu 22.04 LTS", + "Ubuntu 22.04 LTS Data Science VM" ] }, "vm_size": { diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml index 22b3418d5b..f46ccf0dad 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml @@ -14,6 +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/18.04/prod $RELEASE main + 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/repos/edge stable main deb [signed-by=/etc/apt/trusted.gpg.d/docker-archive-keyring.gpg] ${nexus_proxy_url}/repository/docker/ $RELEASE stable From 7aa64ba948609526b283c8142ab3d2e3d9581bf2 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Tue, 9 Apr 2024 12:09:38 +0100 Subject: [PATCH 02/62] update --- templates/shared_services/sonatype-nexus-vm/terraform/vm.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf b/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf index 48270d7602..aafb9d78fb 100644 --- a/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf +++ b/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf @@ -83,6 +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] } } From 33d14bee981e529928dcd8d21018555d69a1d9dc Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Tue, 9 Apr 2024 14:33:52 +0100 Subject: [PATCH 03/62] update image options --- .../guacamole-azure-linuxvm/porter.yaml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 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 index d9eed64fe0..42c41bf354 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.9 +version: 0.6.10 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre @@ -22,11 +22,19 @@ custom: version: latest install_ui: true conda_config: false - "Ubuntu 22.04 LTS Data Science VM": + "Ubuntu 20.04 LTS": + source_image_reference: + publisher: canonical + offer: 0001-com-ubuntu-server-focal + sku: 20_04-lts + version: latest + install_ui: true + conda_config: false + "Ubuntu 20.04 LTS Data Science VM": source_image_reference: publisher: microsoft-dsvm - offer: 0001-com-ubuntu-server-jammy - sku: 22_04-lts + offer: ubuntu-2004 + sku: 2004 version: latest install_ui: false conda_config: true From 30ecfa2401c2096237c02c336fccd47f90e606ed Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Tue, 9 Apr 2024 14:55:25 +0100 Subject: [PATCH 04/62] add in image to enum --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 2 +- .../guacamole-azure-linuxvm/template_schema.json | 3 ++- 2 files changed, 3 insertions(+), 2 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 index 42c41bf354..eb0eae51b6 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.10 +version: 0.6.11 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/template_schema.json b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/template_schema.json index 95bc05b4e8..39ed01c343 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/template_schema.json +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/template_schema.json @@ -17,7 +17,8 @@ "description": "Select Linux image to use for VM", "enum": [ "Ubuntu 22.04 LTS", - "Ubuntu 22.04 LTS Data Science VM" + "Ubuntu 20.04 LTS", + "Ubuntu 20.04 LTS Data Science VM" ] }, "vm_size": { From 072cfdc24936ea65194152d6eb5fe39c6485d55c Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Tue, 9 Apr 2024 17:26:28 +0100 Subject: [PATCH 05/62] add in microsoft-apt/ubuntu/20.04 to source-list --- .../guacamole-azure-linuxvm/terraform/apt_sources_config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml index f46ccf0dad..43d1d1b7c0 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml @@ -15,5 +15,6 @@ apt: 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/repos/edge stable main deb [signed-by=/etc/apt/trusted.gpg.d/docker-archive-keyring.gpg] ${nexus_proxy_url}/repository/docker/ $RELEASE stable From 19316a16ee519157748753867b2f5e8d7d553178 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Wed, 10 Apr 2024 14:03:08 +0100 Subject: [PATCH 06/62] update install UI --- .../guacamole/user_resources/README.md | 16 ++++++++++++---- .../guacamole-azure-linuxvm/porter.yaml | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/templates/workspace_services/guacamole/user_resources/README.md b/templates/workspace_services/guacamole/user_resources/README.md index 69fc1a08dc..9483dd964e 100644 --- a/templates/workspace_services/guacamole/user_resources/README.md +++ b/templates/workspace_services/guacamole/user_resources/README.md @@ -36,13 +36,21 @@ custom: version: latest install_ui: true conda_config: false - "Ubuntu 22.04 LTS Data Science VM": + "Ubuntu 20.04 LTS": + source_image_reference: + publisher: canonical + offer: 0001-com-ubuntu-server-focal + sku: 20_04-lts + version: latest + install_ui: true + conda_config: false + "Ubuntu 20.04 LTS Data Science VM": source_image_reference: publisher: microsoft-dsvm - offer: 0001-com-ubuntu-server-jammy - sku: 22_04-lts + offer: ubuntu-2004 + sku: 2004 version: latest - install_ui: false + install_ui: true conda_config: true # "Custom Image From Gallery": # source_image_name: your-image 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 eb0eae51b6..445232c1f7 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.11 +version: 0.6.12 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre @@ -36,7 +36,7 @@ custom: offer: ubuntu-2004 sku: 2004 version: latest - install_ui: false + install_ui: true conda_config: true # For information on using custom images, see README.me in the guacamole/user-resources folder # "Custom Image From Gallery": From 18df98cfca0445f76378f12c552f97d3353f6954 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Wed, 10 Apr 2024 15:27:42 +0100 Subject: [PATCH 07/62] update version --- templates/shared_services/sonatype-nexus-vm/terraform/vm.tf | 4 ++-- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 From c7ebc5b9330846d5c10ac0194442c3075eeb6c1d Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Wed, 10 Apr 2024 15:29:00 +0100 Subject: [PATCH 08/62] update linux vms --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 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 index 99531bf1da..c0cd91247c 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.13 +version: 0.6.14 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre @@ -18,7 +18,7 @@ custom: source_image_reference: publisher: canonical offer: 0001-com-ubuntu-server-jammy - sku: 22_04-lts + sku: 22_04-lts-gen2 version: latest install_ui: true conda_config: false @@ -26,7 +26,7 @@ custom: source_image_reference: publisher: canonical offer: 0001-com-ubuntu-server-focal - sku: 20_04-lts + sku: 22_04-lts-gen2 version: latest install_ui: true conda_config: false From 9c2211b70ae50930df09ed681e61553728254cb0 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Wed, 10 Apr 2024 15:31:17 +0100 Subject: [PATCH 09/62] update core --- core/terraform/resource_processor/vmss_porter/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/terraform/resource_processor/vmss_porter/main.tf b/core/terraform/resource_processor/vmss_porter/main.tf index a361a42faa..1f4f063ae2 100644 --- a/core/terraform/resource_processor/vmss_porter/main.tf +++ b/core/terraform/resource_processor/vmss_porter/main.tf @@ -108,7 +108,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "vm_linux" { source_image_reference { publisher = "Canonical" offer = "0001-com-ubuntu-server-jammy" - sku = "22_04-lts" + sku = "22_04-lts-gen2" version = "latest" } From d1beb038d67b9f1e0dba1f0be9bfb18bf25e9b38 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Wed, 10 Apr 2024 15:51:51 +0100 Subject: [PATCH 10/62] updaye --- core/terraform/resource_processor/vmss_porter/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/terraform/resource_processor/vmss_porter/main.tf b/core/terraform/resource_processor/vmss_porter/main.tf index 1f4f063ae2..a361a42faa 100644 --- a/core/terraform/resource_processor/vmss_porter/main.tf +++ b/core/terraform/resource_processor/vmss_porter/main.tf @@ -108,7 +108,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "vm_linux" { source_image_reference { publisher = "Canonical" offer = "0001-com-ubuntu-server-jammy" - sku = "22_04-lts-gen2" + sku = "22_04-lts" version = "latest" } From 1ea11594ac3efe1f6dfcf49a975ba8b287c329cf Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Wed, 10 Apr 2024 15:53:40 +0100 Subject: [PATCH 11/62] update --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 index c0cd91247c..aa9db48b5a 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.14 +version: 0.6.15 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre @@ -26,7 +26,7 @@ custom: source_image_reference: publisher: canonical offer: 0001-com-ubuntu-server-focal - sku: 22_04-lts-gen2 + sku: 20_04-lts-gen2 version: latest install_ui: true conda_config: false From 271c7e0fc3ebc2c108caf99d4669f182cc4a11a6 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Wed, 10 Apr 2024 15:57:32 +0100 Subject: [PATCH 12/62] update pypi source --- .../guacamole-azure-linuxvm/terraform/pypi_sources_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/pypi_sources_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/pypi_sources_config.sh index 6d70862655..9380cbc9e1 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/pypi_sources_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/pypi_sources_config.sh @@ -1,5 +1,5 @@ #!/bin/bash -sudo tee /etc/pip.conf > dev/null <<'EOF' +sudo tee /etc/pip.conf > /dev/null <<'EOF' [global] index = ${nexus_proxy_url}/repository/pypi/pypi index-url = ${nexus_proxy_url}/repository/pypi/simple From a09af34ee572e166f5498825ef98450e3af9ced1 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Wed, 10 Apr 2024 16:44:01 +0100 Subject: [PATCH 13/62] update apt-source-list --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 5 ++++- .../guacamole-azure-linuxvm/terraform/apt_sources_config.yml | 3 +-- .../guacamole-azure-linuxvm/terraform/linuxvm.tf | 1 + .../guacamole-azure-linuxvm/terraform/locals.tf | 2 +- 4 files changed, 7 insertions(+), 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 index aa9db48b5a..e422649247 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.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/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml index 43d1d1b7c0..6d0dc4e9b3 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml +++ b/templates/workspace_services/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/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf index 247c4f77e0..4f286ab659 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf +++ b/templates/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/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/locals.tf b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/locals.tf index 43a6d5982b..56c957e4eb 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/locals.tf +++ b/templates/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"] } From bc414b75addc05fd5560bfbe14bd9d512e235c9b Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 11:07:43 +0100 Subject: [PATCH 14/62] update config --- .../guacamole-azure-linuxvm/terraform/vm_config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index 7db5f89b82..282a6c648f 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -86,7 +86,8 @@ fi # Docker install and config sudo apt-get install -y ca-certificates curl gnupg lsb-release -sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin jq +sudo apt-get install -y docker-ce docker-ce-cli containerd.io jq +sudo apt-get install -y docker-compose-plugin jq -n --arg proxy "${NEXUS_PROXY_URL}:8083" '{"registry-mirrors": [$proxy]}' > /etc/docker/daemon.json sudo systemctl daemon-reload sudo systemctl restart docker From af50b399b90dbffca77c1e113ac66c755c5f502d Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 11:12:46 +0100 Subject: [PATCH 15/62] update apt-get --- .../guacamole-azure-linuxvm/terraform/vm_config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index 282a6c648f..8a9eaec273 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -86,8 +86,8 @@ fi # Docker install and config sudo apt-get install -y ca-certificates curl gnupg lsb-release -sudo apt-get install -y docker-ce docker-ce-cli containerd.io jq -sudo apt-get install -y docker-compose-plugin +sudo apt-get install -y docker-compose-plugin docker-ce-cli containerd.io jq +sudo apt-get install -y docker-ce jq -n --arg proxy "${NEXUS_PROXY_URL}:8083" '{"registry-mirrors": [$proxy]}' > /etc/docker/daemon.json sudo systemctl daemon-reload sudo systemctl restart docker From d4a57a331763ce86f57bda17204212a1f0af5633 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 11:28:21 +0100 Subject: [PATCH 16/62] update Readme for user resources --- templates/workspace_services/guacamole/user_resources/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/workspace_services/guacamole/user_resources/README.md b/templates/workspace_services/guacamole/user_resources/README.md index 9483dd964e..82beca7f84 100644 --- a/templates/workspace_services/guacamole/user_resources/README.md +++ b/templates/workspace_services/guacamole/user_resources/README.md @@ -2,7 +2,7 @@ This folder contains user resources that can be deployed with the Guacamole workspace service: -- linuxvm - a Linux-based virtual machine (expects an Ubuntu 18.Ubuntu 22.04 LTS-based VM) +- linuxvm - a Linux-based virtual machine - windowsvm - A Windows-based virtual machine ## Customising the user resources From d75e442ffca717e05abb8a4cf2453ac0691ec59f Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 11:34:15 +0100 Subject: [PATCH 17/62] update to gen2 --- core/terraform/resource_processor/vmss_porter/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/terraform/resource_processor/vmss_porter/main.tf b/core/terraform/resource_processor/vmss_porter/main.tf index a361a42faa..1f4f063ae2 100644 --- a/core/terraform/resource_processor/vmss_porter/main.tf +++ b/core/terraform/resource_processor/vmss_porter/main.tf @@ -108,7 +108,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "vm_linux" { source_image_reference { publisher = "Canonical" offer = "0001-com-ubuntu-server-jammy" - sku = "22_04-lts" + sku = "22_04-lts-gen2" version = "latest" } From 3b7522eebb4674fd60c1afdeca40fc60e727b36a Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 11:49:49 +0100 Subject: [PATCH 18/62] version for guac --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e422649247..3d6852e5ed 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.16 +version: 0.6.17 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre From 3a9eecbf08be075a14a2875cfa97cd21073b4258 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 12:12:16 +0100 Subject: [PATCH 19/62] testing --- core/terraform/resource_processor/vmss_porter/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/terraform/resource_processor/vmss_porter/main.tf b/core/terraform/resource_processor/vmss_porter/main.tf index 1f4f063ae2..a361a42faa 100644 --- a/core/terraform/resource_processor/vmss_porter/main.tf +++ b/core/terraform/resource_processor/vmss_porter/main.tf @@ -108,7 +108,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "vm_linux" { source_image_reference { publisher = "Canonical" offer = "0001-com-ubuntu-server-jammy" - sku = "22_04-lts-gen2" + sku = "22_04-lts" version = "latest" } From 875f2f454ddce9ffbab8e490fc91b25df59789e3 Mon Sep 17 00:00:00 2001 From: wojciechcloudkubed <159798789+wojciechcloudkubed@users.noreply.github.com> Date: Tue, 2 Apr 2024 09:23:37 +0100 Subject: [PATCH 20/62] Ubuntu update (#1) * personal * update ubuntu image * revert changes * update ubuntu version * update version * update offer * update sku * change offer --------- Co-authored-by: Wojciech <57405495+thewbuk@users.noreply.github.com> --- templates/shared_services/sonatype-nexus-vm/terraform/vm.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf b/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf index 79dfa04472..5d1ebdef11 100644 --- a/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf +++ b/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf @@ -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-gen2" + sku = "22_04-lts" version = "latest" } From a3d9109ed4736348238b54ad4ceb0be4fa2145d2 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 12:18:36 +0100 Subject: [PATCH 21/62] update readme and changelog --- CHANGELOG.md | 3 ++- .../workspace_services/guacamole/user_resources/README.md | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61bac4fa19..9ab2746964 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,8 @@ FEATURES: ENHANCEMENTS: BUG FIXES: - +* Update Guacomole Linux VM Images to 22.04 and 20.04 Data Science VM. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) + COMPONENTS: ## 0.17.0 diff --git a/templates/workspace_services/guacamole/user_resources/README.md b/templates/workspace_services/guacamole/user_resources/README.md index 82beca7f84..c36a365f21 100644 --- a/templates/workspace_services/guacamole/user_resources/README.md +++ b/templates/workspace_services/guacamole/user_resources/README.md @@ -32,7 +32,7 @@ custom: source_image_reference: publisher: canonical offer: 0001-com-ubuntu-server-jammy - sku: 22_04-lts + sku: 22_04-lts-gen2 version: latest install_ui: true conda_config: false @@ -40,7 +40,7 @@ custom: source_image_reference: publisher: canonical offer: 0001-com-ubuntu-server-focal - sku: 20_04-lts + sku: 20_04-lts-gen2 version: latest install_ui: true conda_config: false @@ -48,7 +48,7 @@ custom: source_image_reference: publisher: microsoft-dsvm offer: ubuntu-2004 - sku: 2004 + sku: 2004-gen2 version: latest install_ui: true conda_config: true From 3a30d23cd81eedaefabd5291dcbb2fe0cab526ba Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 13:40:18 +0100 Subject: [PATCH 22/62] ds install_ui: false --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3d6852e5ed..cb7fa480cf 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 @@ -39,7 +39,7 @@ custom: sku: 2004-gen2 version: latest apt-sku: 20.04 - install_ui: true + install_ui: false conda_config: true # For information on using custom images, see README.me in the guacamole/user-resources folder # "Custom Image From Gallery": From be7212b684ac32f0df27ea3e3e1198c6d1aeeb5b Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 13:40:29 +0100 Subject: [PATCH 23/62] update version --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cb7fa480cf..98cc8a3e0c 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.17 +version: 0.6.18 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre From 8ff7f69abeb8e50c3b301b1023a6155d665335da Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 14:08:22 +0100 Subject: [PATCH 24/62] update script --- .../guacamole-azure-linuxvm/terraform/vm_config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index 8a9eaec273..b8abf734c1 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -27,6 +27,7 @@ sudo sed -i 's|!/bin/sh|!/bin/bash|g' /etc/xrdp/startwm.sh # Make sure xrdp service starts up with the system sudo systemctl enable xrdp +sudo service xrdp restart if [ "${SHARED_STORAGE_ACCESS}" -eq 1 ]; then # Install required packages From 7db0e5fdcb0c2f16224ca86224df96fbe1ad1e76 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 14:46:09 +0100 Subject: [PATCH 25/62] update ds install_ui: true --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 index 98cc8a3e0c..a90cf81f02 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.18 +version: 0.6.19 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre @@ -39,7 +39,7 @@ custom: sku: 2004-gen2 version: latest apt-sku: 20.04 - install_ui: false + install_ui: true conda_config: true # For information on using custom images, see README.me in the guacamole/user-resources folder # "Custom Image From Gallery": From 7a43e653d840cc436cc0754aa7bf9493b5222306 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 15:52:58 +0100 Subject: [PATCH 26/62] update vm config --- .../guacamole-azure-linuxvm/terraform/vm_config.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index b8abf734c1..3539158239 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -86,6 +86,7 @@ if [ "${CONDA_CONFIG}" -eq 1 ]; then fi # Docker install and config +sudo apt-get install -y r-base-core sudo apt-get install -y ca-certificates curl gnupg lsb-release sudo apt-get install -y docker-compose-plugin docker-ce-cli containerd.io jq sudo apt-get install -y docker-ce @@ -95,3 +96,4 @@ sudo systemctl restart docker # R config sudo echo -e "local({\n r <- getOption(\"repos\")\n r[\"Nexus\"] <- \"""${NEXUS_PROXY_URL}\"/repository/r-proxy/\"\n options(repos = r)\n})" | sudo tee /etc/R/Rprofile.site +sudo shutdown -r now \ No newline at end of file From ce4dc82ba377fc28ee4f55be2968618a42178347 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 15:53:12 +0100 Subject: [PATCH 27/62] update version --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a90cf81f02..99302e4e22 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.19 +version: 0.6.20 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre From 104939002386bb1c70eb22873cc5f00b40facffe Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 17:01:21 +0100 Subject: [PATCH 28/62] remove moby-tini --- .../guacamole-azure-linuxvm/terraform/vm_config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index 3539158239..f9c2a0835c 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -86,6 +86,7 @@ if [ "${CONDA_CONFIG}" -eq 1 ]; then fi # Docker install and config +sudo apt-get remove -y moby-tini sudo apt-get install -y r-base-core sudo apt-get install -y ca-certificates curl gnupg lsb-release sudo apt-get install -y docker-compose-plugin docker-ce-cli containerd.io jq From c08a2b78f600b73ad6e1ea6771f00ceac806897b Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 17:02:01 +0100 Subject: [PATCH 29/62] update version --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 99302e4e22..20810b12c6 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.20 +version: 0.6.21 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre From e06dbcd284b42231261f09d2d9078446119af706 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 19:57:14 +0100 Subject: [PATCH 30/62] moby-tini || true --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 2 +- .../guacamole-azure-linuxvm/terraform/vm_config.sh | 2 +- 2 files changed, 2 insertions(+), 2 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 index 20810b12c6..b64a85a149 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.21 +version: 0.6.22 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index f9c2a0835c..2594b6adbe 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -86,7 +86,7 @@ if [ "${CONDA_CONFIG}" -eq 1 ]; then fi # Docker install and config -sudo apt-get remove -y moby-tini +sudo apt-get remove -y moby-tini || true sudo apt-get install -y r-base-core sudo apt-get install -y ca-certificates curl gnupg lsb-release sudo apt-get install -y docker-compose-plugin docker-ce-cli containerd.io jq From 39aa2846941ac02dac76ae8b546d58470c018983 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 12 Apr 2024 09:12:48 +0100 Subject: [PATCH 31/62] resolving comments --- .../workspace_services/guacamole/user_resources/README.md | 3 +++ .../user_resources/guacamole-azure-linuxvm/porter.yaml | 8 ++++---- .../terraform/apt_sources_config.yml | 2 +- .../guacamole-azure-linuxvm/terraform/linuxvm.tf | 2 +- .../guacamole-azure-linuxvm/terraform/locals.tf | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/templates/workspace_services/guacamole/user_resources/README.md b/templates/workspace_services/guacamole/user_resources/README.md index c36a365f21..d0db21cb86 100644 --- a/templates/workspace_services/guacamole/user_resources/README.md +++ b/templates/workspace_services/guacamole/user_resources/README.md @@ -34,6 +34,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": @@ -42,6 +43,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": @@ -50,6 +52,7 @@ custom: offer: ubuntu-2004 sku: 2004-gen2 version: latest + apt_sku: 20.04 install_ui: true conda_config: true # "Custom Image From Gallery": 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 b64a85a149..193a834853 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.22 +version: 0.6.23 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre @@ -20,7 +20,7 @@ custom: offer: 0001-com-ubuntu-server-jammy sku: 22_04-lts-gen2 version: latest - apt-sku: 22.04 + apt_sku: 22.04 install_ui: true conda_config: false "Ubuntu 20.04 LTS": @@ -29,7 +29,7 @@ custom: offer: 0001-com-ubuntu-server-focal sku: 20_04-lts-gen2 version: latest - apt-sku: 20.04 + apt_sku: 20.04 install_ui: true conda_config: false "Ubuntu 20.04 LTS Data Science VM": @@ -38,7 +38,7 @@ custom: offer: ubuntu-2004 sku: 2004-gen2 version: latest - apt-sku: 20.04 + 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/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml index 6d0dc4e9b3..d805cb8983 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml @@ -14,6 +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/${sku}/prod $RELEASE main + deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/ubuntu/${apt_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/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf index 4f286ab659..d45d5d3a00 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf @@ -131,7 +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 + apt_sku = local.apt_sku } } diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/locals.tf b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/locals.tf index 56c957e4eb..e0281269fd 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/locals.tf +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/locals.tf @@ -25,5 +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"] + apt_sku = local.selected_image_source_refs[0]["apt_sku"] } From aa4b9487467420435cac009441f19bbb8f265f02 Mon Sep 17 00:00:00 2001 From: Tim Allen Date: Fri, 12 Apr 2024 09:01:26 +0100 Subject: [PATCH 32/62] Update Resource processor Ubuntu Image (#3902) * Update clean_validation_envs.yml * update * update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8 * update core resource processor image * remove clean env * update version * update changelog --- CHANGELOG.md | 3 ++- core/version.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ab2746964..0fd5cff863 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,8 @@ ENHANCEMENTS: BUG FIXES: * Update Guacomole Linux VM Images to 22.04 and 20.04 Data Science VM. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) - +* Update to Resource Processor Image, now using Ubuntu 22.04 (jammy). Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) + COMPONENTS: ## 0.17.0 diff --git a/core/version.txt b/core/version.txt index f5b77301f5..a25765c3e1 100644 --- a/core/version.txt +++ b/core/version.txt @@ -1 +1 @@ -__version__ = "0.9.7" +__version__ = "0.9.8" From 9af4f05a2bedfb54b769bc11ef81bbc607680801 Mon Sep 17 00:00:00 2001 From: wojciechcloudkubed <159798789+wojciechcloudkubed@users.noreply.github.com> Date: Tue, 2 Apr 2024 09:23:37 +0100 Subject: [PATCH 33/62] Ubuntu update (#1) * personal * update ubuntu image * revert changes * update ubuntu version * update version * update offer * update sku * change offer --------- Co-authored-by: Wojciech <57405495+thewbuk@users.noreply.github.com> --- core/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version.txt b/core/version.txt index a25765c3e1..f5b77301f5 100644 --- a/core/version.txt +++ b/core/version.txt @@ -1 +1 @@ -__version__ = "0.9.8" +__version__ = "0.9.7" From 5e2cdb52f04d0b4d18dee8f287f2a2e0672cfb7b Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 12:18:36 +0100 Subject: [PATCH 34/62] update readme and changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fd5cff863..df4cb4c9ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,8 @@ ENHANCEMENTS: BUG FIXES: * Update Guacomole Linux VM Images to 22.04 and 20.04 Data Science VM. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) * Update to Resource Processor Image, now using Ubuntu 22.04 (jammy). Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) - +* Update Guacomole Linux VM Images to 22.04 and 20.04 Data Science VM. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) + COMPONENTS: ## 0.17.0 From d8fa5d412184c821361b623233c79d3b8f238242 Mon Sep 17 00:00:00 2001 From: Tim Allen Date: Fri, 12 Apr 2024 09:01:26 +0100 Subject: [PATCH 35/62] Update Resource processor Ubuntu Image (#3902) * Update clean_validation_envs.yml * update * update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8 * update core resource processor image * remove clean env * update version * update changelog --- CHANGELOG.md | 5 ++--- core/version.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df4cb4c9ad..c4c30945c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,8 @@ ENHANCEMENTS: BUG FIXES: * Update Guacomole Linux VM Images to 22.04 and 20.04 Data Science VM. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) -* Update to Resource Processor Image, now using Ubuntu 22.04 (jammy). Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) -* Update Guacomole Linux VM Images to 22.04 and 20.04 Data Science VM. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) - +* Update to Resource Processor Image, now using Ubuntu 22.04 (jammy). Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) + COMPONENTS: ## 0.17.0 diff --git a/core/version.txt b/core/version.txt index f5b77301f5..a25765c3e1 100644 --- a/core/version.txt +++ b/core/version.txt @@ -1 +1 @@ -__version__ = "0.9.7" +__version__ = "0.9.8" From b17bfabd8aac12a5ac1709e8dcd973afbd993f21 Mon Sep 17 00:00:00 2001 From: wojciechcloudkubed <159798789+wojciechcloudkubed@users.noreply.github.com> Date: Tue, 2 Apr 2024 09:23:37 +0100 Subject: [PATCH 36/62] Ubuntu update (#1) * personal * update ubuntu image * revert changes * update ubuntu version * update version * update offer * update sku * change offer --------- Co-authored-by: Wojciech <57405495+thewbuk@users.noreply.github.com> --- core/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version.txt b/core/version.txt index a25765c3e1..f5b77301f5 100644 --- a/core/version.txt +++ b/core/version.txt @@ -1 +1 @@ -__version__ = "0.9.8" +__version__ = "0.9.7" From 85cdb983a17297e853c199c0c0ba1bc06b989c50 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 12:18:36 +0100 Subject: [PATCH 37/62] update readme and changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4c30945c7..5c2d8f00de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ BUG FIXES: * Update Guacomole Linux VM Images to 22.04 and 20.04 Data Science VM. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) * Update to Resource Processor Image, now using Ubuntu 22.04 (jammy). Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) +* Update Guacomole Linux VM Images to 22.04 and 20.04 Data Science VM. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) + COMPONENTS: ## 0.17.0 From f3b4efb385019cf67acdd2115386d0ce94a16d42 Mon Sep 17 00:00:00 2001 From: Tim Allen Date: Fri, 12 Apr 2024 09:01:26 +0100 Subject: [PATCH 38/62] Update Resource processor Ubuntu Image (#3902) * Update clean_validation_envs.yml * update * update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8 * update core resource processor image * remove clean env * update version * update changelog --- CHANGELOG.md | 3 ++- core/version.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c2d8f00de..2d4cc9be7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,8 @@ BUG FIXES: * Update to Resource Processor Image, now using Ubuntu 22.04 (jammy). Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) * Update Guacomole Linux VM Images to 22.04 and 20.04 Data Science VM. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) - +* Update to Resource Processor Image, now using Ubuntu 22.04 (jammy). Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) + COMPONENTS: ## 0.17.0 diff --git a/core/version.txt b/core/version.txt index f5b77301f5..a25765c3e1 100644 --- a/core/version.txt +++ b/core/version.txt @@ -1 +1 @@ -__version__ = "0.9.7" +__version__ = "0.9.8" From e8ba5fda9f058b0f94135848f8f898083ecb552d Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 11 Apr 2024 12:18:36 +0100 Subject: [PATCH 39/62] update readme and changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d4cc9be7d..1eafe84ea1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,8 @@ BUG FIXES: * Update Guacomole Linux VM Images to 22.04 and 20.04 Data Science VM. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) * Update to Resource Processor Image, now using Ubuntu 22.04 (jammy). Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) - +* Update Guacomole Linux VM Images to 22.04 and 20.04 Data Science VM. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) + COMPONENTS: ## 0.17.0 From e1939430b31c13ea1183924c91554100061d162d Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 12 Apr 2024 09:27:52 +0100 Subject: [PATCH 40/62] changelog update --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1eafe84ea1..a7842aaa94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,10 +10,6 @@ ENHANCEMENTS: BUG FIXES: * Update Guacomole Linux VM Images to 22.04 and 20.04 Data Science VM. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) * Update to Resource Processor Image, now using Ubuntu 22.04 (jammy). Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) - -* Update Guacomole Linux VM Images to 22.04 and 20.04 Data Science VM. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) -* Update to Resource Processor Image, now using Ubuntu 22.04 (jammy). Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) -* Update Guacomole Linux VM Images to 22.04 and 20.04 Data Science VM. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) COMPONENTS: From 4a2036bc4c897754f91d19824e01505f81f48197 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 12 Apr 2024 09:29:53 +0100 Subject: [PATCH 41/62] update resource proccesor --- core/terraform/resource_processor/vmss_porter/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/terraform/resource_processor/vmss_porter/main.tf b/core/terraform/resource_processor/vmss_porter/main.tf index a361a42faa..1f4f063ae2 100644 --- a/core/terraform/resource_processor/vmss_porter/main.tf +++ b/core/terraform/resource_processor/vmss_porter/main.tf @@ -108,7 +108,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "vm_linux" { source_image_reference { publisher = "Canonical" offer = "0001-com-ubuntu-server-jammy" - sku = "22_04-lts" + sku = "22_04-lts-gen2" version = "latest" } From 9a28c42075148a4a58ab2ecde2db3ca1d15b9d3e Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 12 Apr 2024 09:31:47 +0100 Subject: [PATCH 42/62] reset --- core/terraform/resource_processor/vmss_porter/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/terraform/resource_processor/vmss_porter/main.tf b/core/terraform/resource_processor/vmss_porter/main.tf index 1f4f063ae2..a361a42faa 100644 --- a/core/terraform/resource_processor/vmss_porter/main.tf +++ b/core/terraform/resource_processor/vmss_porter/main.tf @@ -108,7 +108,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "vm_linux" { source_image_reference { publisher = "Canonical" offer = "0001-com-ubuntu-server-jammy" - sku = "22_04-lts-gen2" + sku = "22_04-lts" version = "latest" } From c5ce11b550e29c13881bc2ada49c18893ae1c716 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 12 Apr 2024 10:43:48 +0100 Subject: [PATCH 43/62] update config --- .../user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf | 1 + .../guacamole-azure-linuxvm/terraform/vm_config.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf index d45d5d3a00..a2756de06d 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf @@ -110,6 +110,7 @@ data "template_file" "vm_config" { FILESHARE_NAME = var.shared_storage_access ? data.azurerm_storage_share.shared_storage[0].name : "" NEXUS_PROXY_URL = local.nexus_proxy_url CONDA_CONFIG = local.selected_image.conda_config ? 1 : 0 + VM_USER = random_string.username.result } } diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index 2594b6adbe..2a2794f72c 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -20,6 +20,7 @@ sudo adduser xrdp ssl-cert if [ "${INSTALL_UI}" -eq 1 ]; then sudo apt-get install xorg xfce4 xfce4-goodies dbus-x11 x11-xserver-utils -y echo xfce4-session > ~/.xsession + sudo su - ${VM_USER} -c "echo xfce4-session > ~/.xsession" fi # Fix for blank screen on DSVM (/sh -> /bash due to conflict with profile.d scripts) From 86909a3b8a8bbe9b6a6b253761c29d0dd5e7049d Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 12 Apr 2024 12:50:34 +0100 Subject: [PATCH 44/62] vm-config --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 2 +- .../guacamole-azure-linuxvm/terraform/vm_config.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 193a834853..22b2a786bb 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.23 +version: 0.6.24 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index 2a2794f72c..76f6a861de 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -12,6 +12,7 @@ sudo rm -f /etc/apt/sources.list.d/* # Update apt packages from configured Nexus sources sudo apt-get update +sudo dpkg --configure lightdm # Install xrdp so Guacamole can connect via RDP sudo apt-get install xrdp -y sudo adduser xrdp ssl-cert From 81801f8914d1fae57a024c40d30e74849cb2358f Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 12 Apr 2024 14:36:17 +0100 Subject: [PATCH 45/62] update version --- .../guacamole-azure-linuxvm/porter.yaml | 2 +- .../guacamole-azure-linuxvm/terraform/vm_config.sh | 11 +++++++---- 2 files changed, 8 insertions(+), 5 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 index 22b2a786bb..e74e5989a5 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.24 +version: 0.6.25 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index 76f6a861de..68403b3f6e 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -2,6 +2,7 @@ set -o errexit set -o pipefail +set -vx # set -o nounset # Uncomment this line to see each command for debugging (careful: this will show secrets!) # set -o xtrace @@ -12,16 +13,18 @@ sudo rm -f /etc/apt/sources.list.d/* # Update apt packages from configured Nexus sources sudo apt-get update -sudo dpkg --configure lightdm # Install xrdp so Guacamole can connect via RDP sudo apt-get install xrdp -y sudo adduser xrdp ssl-cert # Install desktop environment if image doesn't have one already if [ "${INSTALL_UI}" -eq 1 ]; then - sudo apt-get install xorg xfce4 xfce4-goodies dbus-x11 x11-xserver-utils -y - echo xfce4-session > ~/.xsession - sudo su - ${VM_USER} -c "echo xfce4-session > ~/.xsession" + sudo apt-get install -y xorg + sudo apt-get install -y xfce4 + sudo apt-get install -y xfce4-goodies + sudo apt-get install -y dbus-x11 + sudo apt-get install -y x11-xserver-utils + sudo -u ${VM_USER} -i bash -c 'echo xfce4-session > ~/.xsession' fi # Fix for blank screen on DSVM (/sh -> /bash due to conflict with profile.d scripts) From ba9ae5088cdb902953381c9f3909a10d19eca617 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 12 Apr 2024 15:10:09 +0100 Subject: [PATCH 46/62] update --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 2 +- .../guacamole-azure-linuxvm/terraform/get_apt_keys.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 e74e5989a5..21147a301c 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.25 +version: 0.6.26 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/get_apt_keys.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/get_apt_keys.sh index 5849eaede3..1e91f9b894 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/get_apt_keys.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/get_apt_keys.sh @@ -6,6 +6,10 @@ set -o nounset # Uncomment this line to see each command for debugging (careful: this will show secrets!) # set -o xtrace +#remove key if they already exist +sudo rm-f /etc/apt/trusted.gpg.d/docker-archive-keyring.gpg || true +sudo rm-f /etc/apt/trusted.gpg.d/microsoft.gpg || true + # Get Docker Public key from Nexus curl -fsSL "${NEXUS_PROXY_URL}"/repository/docker-public-key/gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/docker-archive-keyring.gpg From eff70504b880de8645e2d5e6ca3db4e849cccb0d Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 12 Apr 2024 16:00:41 +0100 Subject: [PATCH 47/62] edit --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 2 +- .../guacamole-azure-linuxvm/terraform/get_apt_keys.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 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 index 21147a301c..3b87e01b7a 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.26 +version: 0.6.27 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/get_apt_keys.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/get_apt_keys.sh index 1e91f9b894..6e69009525 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/get_apt_keys.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/get_apt_keys.sh @@ -7,8 +7,8 @@ set -o nounset # set -o xtrace #remove key if they already exist -sudo rm-f /etc/apt/trusted.gpg.d/docker-archive-keyring.gpg || true -sudo rm-f /etc/apt/trusted.gpg.d/microsoft.gpg || true +sudo rm -f /etc/apt/trusted.gpg.d/docker-archive-keyring.gpg || true +sudo rm -f /etc/apt/trusted.gpg.d/microsoft.gpg || true # Get Docker Public key from Nexus curl -fsSL "${NEXUS_PROXY_URL}"/repository/docker-public-key/gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/docker-archive-keyring.gpg From cd1a4dbf2fdbfda70c493880f3be4fde3a1590d8 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 12 Apr 2024 16:49:59 +0100 Subject: [PATCH 48/62] updaet vm config --- .../guacamole-azure-linuxvm/porter.yaml | 2 +- .../terraform/vm_config.sh | 25 ++++++++++--------- 2 files changed, 14 insertions(+), 13 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 index 3b87e01b7a..3878c7a694 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.27 +version: 0.6.28 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index 68403b3f6e..712cc31be3 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -3,9 +3,9 @@ set -o errexit set -o pipefail set -vx -# set -o nounset +set -o nounset # Uncomment this line to see each command for debugging (careful: this will show secrets!) -# set -o xtrace +set -o xtrace # Remove apt sources not included in sources.list file sudo rm -f /etc/apt/sources.list.d/* @@ -14,18 +14,19 @@ sudo rm -f /etc/apt/sources.list.d/* sudo apt-get update # Install xrdp so Guacamole can connect via RDP -sudo apt-get install xrdp -y sudo adduser xrdp ssl-cert -# Install desktop environment if image doesn't have one already -if [ "${INSTALL_UI}" -eq 1 ]; then - sudo apt-get install -y xorg - sudo apt-get install -y xfce4 - sudo apt-get install -y xfce4-goodies - sudo apt-get install -y dbus-x11 - sudo apt-get install -y x11-xserver-utils - sudo -u ${VM_USER} -i bash -c 'echo xfce4-session > ~/.xsession' -fi +# # Install desktop environment if image doesn't have one already +# if [ "${INSTALL_UI}" -eq 1 ]; then +# sudo apt-get install xrdp -y +# sudo apt-get install -y xorg +# sudo apt-get install -y xfce4 +# sudo apt-get install -y xfce4-goodies +# sudo apt-get install -y dbus-x11 +# sudo apt-get install -y x11-xserver-utils +# fi + +sudo -u ${VM_USER} -i bash -c 'echo xfce4-session > ~/.xsession' # Fix for blank screen on DSVM (/sh -> /bash due to conflict with profile.d scripts) sudo sed -i 's|!/bin/sh|!/bin/bash|g' /etc/xrdp/startwm.sh From 2082559750d01e06032396be3c222d100e7671a1 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Mon, 15 Apr 2024 09:28:08 +0100 Subject: [PATCH 49/62] update to gen2 --- templates/shared_services/sonatype-nexus-vm/terraform/vm.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf b/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf index 5d1ebdef11..cf4d4b71a9 100644 --- a/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf +++ b/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf @@ -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-gen" version = "latest" } From aa4713ca58eba12cc3033b66893cb87ff011bd0a Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Mon, 15 Apr 2024 12:08:41 +0100 Subject: [PATCH 50/62] update image version --- templates/shared_services/sonatype-nexus-vm/porter.yaml | 2 +- templates/shared_services/sonatype-nexus-vm/terraform/vm.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/shared_services/sonatype-nexus-vm/porter.yaml b/templates/shared_services/sonatype-nexus-vm/porter.yaml index 307bee19bc..ce17cff98a 100644 --- a/templates/shared_services/sonatype-nexus-vm/porter.yaml +++ b/templates/shared_services/sonatype-nexus-vm/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-shared-service-sonatype-nexus -version: 2.8.13 +version: 2.8.14 description: "A Sonatype Nexus shared service" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf b/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf index cf4d4b71a9..79dfa04472 100644 --- a/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf +++ b/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf @@ -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-gen" + sku = "22_04-lts-gen2" version = "latest" } From d5a40452e5c226afe78805d9cd9fcb34818da279 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Mon, 15 Apr 2024 14:39:17 +0100 Subject: [PATCH 51/62] update --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 2 +- .../guacamole-azure-linuxvm/terraform/vm_config.sh | 1 - 2 files changed, 1 insertion(+), 2 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 index 3878c7a694..ee93c8bd05 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.28 +version: 0.6.29s description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index 712cc31be3..7bc896ed44 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -2,7 +2,6 @@ set -o errexit set -o pipefail -set -vx set -o nounset # Uncomment this line to see each command for debugging (careful: this will show secrets!) set -o xtrace From f9d9ffcd4ae7f54e88f3e242c2e7fbd22ded53f1 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Mon, 15 Apr 2024 14:44:27 +0100 Subject: [PATCH 52/62] update --- .../guacamole-azure-linuxvm/porter.yaml | 4 ++-- .../terraform/vm_config.sh | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 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 index ee93c8bd05..039b560dc8 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.29s +version: 0.6.30 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre @@ -39,7 +39,7 @@ custom: sku: 2004-gen2 version: latest apt_sku: 20.04 - install_ui: true + install_ui: false conda_config: true # For information on using custom images, see README.me in the guacamole/user-resources folder # "Custom Image From Gallery": diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index 7bc896ed44..1a28912d0a 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -13,17 +13,17 @@ sudo rm -f /etc/apt/sources.list.d/* sudo apt-get update # Install xrdp so Guacamole can connect via RDP +sudo apt-get install xrdp -y sudo adduser xrdp ssl-cert # # Install desktop environment if image doesn't have one already -# if [ "${INSTALL_UI}" -eq 1 ]; then -# sudo apt-get install xrdp -y -# sudo apt-get install -y xorg -# sudo apt-get install -y xfce4 -# sudo apt-get install -y xfce4-goodies -# sudo apt-get install -y dbus-x11 -# sudo apt-get install -y x11-xserver-utils -# fi +if [ "${INSTALL_UI}" -eq 1 ]; then + sudo apt-get install -y xorg + sudo apt-get install -y xfce4 + sudo apt-get install -y xfce4-goodies + sudo apt-get install -y dbus-x11 + sudo apt-get install -y x11-xserver-utils +fi sudo -u ${VM_USER} -i bash -c 'echo xfce4-session > ~/.xsession' From a3e5492f79a52eccd634f5591f865e791d07633f Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Mon, 15 Apr 2024 16:16:38 +0100 Subject: [PATCH 53/62] update --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 039b560dc8..8e834d4ffc 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 @@ -30,7 +30,7 @@ custom: sku: 20_04-lts-gen2 version: latest apt_sku: 20.04 - install_ui: true + install_ui: false conda_config: false "Ubuntu 20.04 LTS Data Science VM": source_image_reference: From 6980ecbb832e2e46578953e46b7ab91f57e3a980 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Mon, 15 Apr 2024 16:16:50 +0100 Subject: [PATCH 54/62] update --- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8e834d4ffc..ba673d3bb2 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.30 +version: 0.6.31 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre From 4354ca0917935d14c282d38ba896a7a90d08f9e8 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Tue, 16 Apr 2024 14:06:49 +0100 Subject: [PATCH 55/62] format --- .../user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf index a2756de06d..dfc32c1997 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf @@ -132,7 +132,7 @@ data "template_file" "apt_sources_config" { template = file("${path.module}/apt_sources_config.yml") vars = { nexus_proxy_url = local.nexus_proxy_url - apt_sku = local.apt_sku + apt_sku = local.apt_sku } } From 770e4c76dbcb4225cb76fc3d03dd27f8ff03c99c Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Tue, 16 Apr 2024 15:31:25 +0100 Subject: [PATCH 56/62] fix linting --- .../guacamole-azure-linuxvm/terraform/vm_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index 1a28912d0a..0d80ce262d 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -25,7 +25,7 @@ if [ "${INSTALL_UI}" -eq 1 ]; then sudo apt-get install -y x11-xserver-utils fi -sudo -u ${VM_USER} -i bash -c 'echo xfce4-session > ~/.xsession' +sudo -u "${VM_USER}" -i bash -c 'echo xfce4-session > ~/.xsession' # Fix for blank screen on DSVM (/sh -> /bash due to conflict with profile.d scripts) sudo sed -i 's|!/bin/sh|!/bin/bash|g' /etc/xrdp/startwm.sh From 7a4d250d3b9ed12624b0c7e1481fce93285ba9ff Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 18 Apr 2024 09:57:54 +0100 Subject: [PATCH 57/62] update linux --- .../guacamole-azure-linuxvm/porter.yaml | 2 +- .../template_schema.json | 3 +- .../terraform/apt_sources_config.yml | 2 + .../terraform/vm_config.sh | 89 ++++++++++++++++++- 4 files changed, 90 insertions(+), 6 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 index ba673d3bb2..b0814c3512 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.31 +version: 0.6.32 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/template_schema.json b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/template_schema.json index 39ed01c343..2e13d8b6fc 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/template_schema.json +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/template_schema.json @@ -17,8 +17,7 @@ "description": "Select Linux image to use for VM", "enum": [ "Ubuntu 22.04 LTS", - "Ubuntu 20.04 LTS", - "Ubuntu 20.04 LTS Data Science VM" + "Ubuntu 20.04 LTS" ] }, "vm_size": { diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml index d805cb8983..ae558a7085 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml @@ -16,4 +16,6 @@ apt: 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/${apt_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/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/repos/vscode stable main + deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/repos/azure-cli stable main deb [signed-by=/etc/apt/trusted.gpg.d/docker-archive-keyring.gpg] ${nexus_proxy_url}/repository/docker/ $RELEASE stable diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index 0d80ce262d..784dd51f13 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -10,11 +10,59 @@ set -o xtrace sudo rm -f /etc/apt/sources.list.d/* # Update apt packages from configured Nexus sources +echo "init_vm.sh: START" +sudo apt update +sudo apt upgrade -y +sudo apt install -y gnupg2 software-properties-common apt-transport-https wget dirmngr gdebi-core sudo apt-get update -# Install xrdp so Guacamole can connect via RDP -sudo apt-get install xrdp -y +## Desktop +echo "init_vm.sh: Desktop" +sudo DEBIAN_FRONTEND=noninteractive +sudo apt install -y xfce4 xfce4-goodies xorg dbus-x11 x11-xserver-utils + + +## Install xrdp so Guacamole can connect via RDP +echo "init_vm.sh: xrdp" +sudo apt install -y xrdp xorgxrdp xfce4-session sudo adduser xrdp ssl-cert +sudo systemctl enable xrdp + + +## Python 3.8 and Jupyter +# sudo apt install -y python3.8 python3.8-venv python3.8-dev jupyter-notebook + +## VS Code +echo "init_vm.sh: Folders" +sudo mkdir /opt/vscode/user-data +sudo mkdir /opt/vscode/extensions + +echo "init_vm.sh: VS Code" +sudo apt install -y code gvfs-bin + +## VSCode Extensions +echo "init_vm.sh: VSCode extensions" +code --extensions-dir="/opt/vscode/extensions" --user-data-dir="/opt/vscode/user-data" --install-extension ms-python.python +code --extensions-dir="/opt/vscode/extensions" --user-data-dir="/opt/vscode/user-data" --install-extension REditorSupport.r +code --extensions-dir="/opt/vscode/extensions" --user-data-dir="/opt/vscode/user-data" --install-extension RDebugger.r-debugger + +## R +echo "init_vm.sh: R Setup" +wget -q https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc -O- | sudo apt-key add - +sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/" +sudo apt update +sudo apt install -y r-base + +## RStudio Desktop +echo "init_vm.sh: RStudio" +wget https://download1.rstudio.org/desktop/bionic/amd64/rstudio-2022.07.2-576-amd64.deb -P /tmp +sudo gdebi --non-interactive /tmp/rstudio-2022.07.2-576-amd64.deb + +## Azure Storage Explorer +sudo apt install gnome-keyring -y +sudo snap install storage-explorer +sudo snap connect storage-explorer:password-manager-service :password-manager-service + # # Install desktop environment if image doesn't have one already if [ "${INSTALL_UI}" -eq 1 ]; then @@ -81,6 +129,7 @@ fi ### Anaconda Config if [ "${CONDA_CONFIG}" -eq 1 ]; then + echo "init_vm.sh: Anaconda" export PATH="/anaconda/condabin":$PATH export PATH="/anaconda/bin":$PATH export PATH="/anaconda/envs/py38_default/bin":$PATH @@ -102,4 +151,38 @@ sudo systemctl restart docker # R config sudo echo -e "local({\n r <- getOption(\"repos\")\n r[\"Nexus\"] <- \"""${NEXUS_PROXY_URL}\"/repository/r-proxy/\"\n options(repos = r)\n})" | sudo tee /etc/R/Rprofile.site -sudo shutdown -r now \ No newline at end of file + +## Add ouh_researcher group for directory permissions +echo "init_vm.sh: directory permissions" +getent group ouh_researcher || sudo groupadd ouh_researcher +sudo chgrp -R ouh_researcher /opt/anaconda +sudo chgrp -R ouh_researcher /opt/prom-tools +sudo chgrp -R ouh_researcher /opt/vscode/user-data +sudo chgrp -R ouh_researcher /opt/vscode/extensions + +sudo chmod -R g+w /opt/anaconda +sudo chmod -R g+w /opt/prom-tools +sudo chmod -R g+w /opt/vscode/user-data +sudo chmod -R g+w /opt/vscode/extensions + + +## Add ouh_researcher as default extra group when creating new users +# echo "init_vm.sh: Add OUH User Group" +# sudo cp -f /tmp/adduser.conf /etc/adduser.conf + + +# ## Install script to run at user login +# echo "init_vm.sh: User Login Script" +# sudo cp -f /tmp/init_user_profile.sh /etc/profile.d/init_user_profile.sh + + +# ## Cleanup +echo "init_vm.sh: Cleanup" +# sudo rm -R /tmp/init_vm.sh +# sudo rm -R /tmp/init_user_profile.sh +# sudo rm -R /tmp/adduser.conf +# sudo rm -R /tmp/Anaconda3-2022.05-Linux-x86_64.sh +# sudo rm -R /tmp/rstudio-2022.07.2-576-amd64.deb +# sudo rm -R /tmp/google-chrome-stable_current_amd64.deb +sudo apt -y autoremove +sudo apt install unattended-upgrades \ No newline at end of file From 943e07b9d5eb50a6a2925080bdbbd8a457477b9c Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Tue, 23 Apr 2024 15:16:03 +0100 Subject: [PATCH 58/62] add in ms download and other apps --- .../microsoft_download_conf.json | 32 +++++++++++ .../terraform/vm_config.sh | 53 +++++++------------ 2 files changed, 50 insertions(+), 35 deletions(-) create mode 100644 templates/shared_services/sonatype-nexus-vm/scripts/nexus_repos_config/microsoft_download_conf.json diff --git a/templates/shared_services/sonatype-nexus-vm/scripts/nexus_repos_config/microsoft_download_conf.json b/templates/shared_services/sonatype-nexus-vm/scripts/nexus_repos_config/microsoft_download_conf.json new file mode 100644 index 0000000000..a153c626a9 --- /dev/null +++ b/templates/shared_services/sonatype-nexus-vm/scripts/nexus_repos_config/microsoft_download_conf.json @@ -0,0 +1,32 @@ +{ + "name": "microsoft-download", + "online": true, + "storage": { + "blobStoreName": "default", + "strictContentTypeValidation": true, + "write_policy": "ALLOW" + }, + "proxy": { + "remoteUrl": "https://download.microsoft.com/download", + "contentMaxAge": 1440, + "metadataMaxAge": 1440 + }, + "negativeCache": { + "enabled": true, + "timeToLive": 1440 + }, + "httpClient": { + "blocked": false, + "autoBlock": false, + "connection": { + "retries": 0, + "userAgentSuffix": "string", + "timeout": 60, + "enableCircularRedirects": false, + "enableCookies": false, + "useTrustStore": false + } + }, + "baseType": "raw", + "repoType": "proxy" + } \ No newline at end of file diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index 784dd51f13..e9532ff6e6 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -21,16 +21,14 @@ echo "init_vm.sh: Desktop" sudo DEBIAN_FRONTEND=noninteractive sudo apt install -y xfce4 xfce4-goodies xorg dbus-x11 x11-xserver-utils - ## Install xrdp so Guacamole can connect via RDP echo "init_vm.sh: xrdp" sudo apt install -y xrdp xorgxrdp xfce4-session sudo adduser xrdp ssl-cert sudo systemctl enable xrdp - ## Python 3.8 and Jupyter -# sudo apt install -y python3.8 python3.8-venv python3.8-dev jupyter-notebook +sudo apt install -y python3.8 python3.8-venv python3.8-dev jupyter-notebook ## VS Code echo "init_vm.sh: Folders" @@ -40,29 +38,31 @@ sudo mkdir /opt/vscode/extensions echo "init_vm.sh: VS Code" sudo apt install -y code gvfs-bin +# TODO: need to look at proxy extentions ## VSCode Extensions -echo "init_vm.sh: VSCode extensions" -code --extensions-dir="/opt/vscode/extensions" --user-data-dir="/opt/vscode/user-data" --install-extension ms-python.python -code --extensions-dir="/opt/vscode/extensions" --user-data-dir="/opt/vscode/user-data" --install-extension REditorSupport.r -code --extensions-dir="/opt/vscode/extensions" --user-data-dir="/opt/vscode/user-data" --install-extension RDebugger.r-debugger +# echo "init_vm.sh: VSCode extensions" +# code --extensions-dir="/opt/vscode/extensions" --user-data-dir="/opt/vscode/user-data" --install-extension ms-python.python +# code --extensions-dir="/opt/vscode/extensions" --user-data-dir="/opt/vscode/user-data" --install-extension REditorSupport.r +# code --extensions-dir="/opt/vscode/extensions" --user-data-dir="/opt/vscode/user-data" --install-extension RDebugger.r-debugger ## R -echo "init_vm.sh: R Setup" -wget -q https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc -O- | sudo apt-key add - -sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/" -sudo apt update -sudo apt install -y r-base +# echo "init_vm.sh: R Setup" +# wget -q https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc -O- | sudo apt-key add - +# sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/" +# sudo apt update +# sudo apt install -y r-base ## RStudio Desktop -echo "init_vm.sh: RStudio" -wget https://download1.rstudio.org/desktop/bionic/amd64/rstudio-2022.07.2-576-amd64.deb -P /tmp -sudo gdebi --non-interactive /tmp/rstudio-2022.07.2-576-amd64.deb +# echo "init_vm.sh: RStudio" +# wget https://download1.rstudio.org/desktop/bionic/amd64/rstudio-2022.07.2-576-amd64.deb -P /tmp +# sudo gdebi --non-interactive /tmp/rstudio-2022.07.2-576-amd64.deb ## Azure Storage Explorer sudo apt install gnome-keyring -y -sudo snap install storage-explorer -sudo snap connect storage-explorer:password-manager-service :password-manager-service - +wget -q ${NEXUS_PROXY_URL}/A/E/3/AE32C485-B62B-4437-92F7-8B6B2C48CB40/StorageExplorer-linux-x64.tar.gz -P /tmp +sudo mkdir /opt/storage-explorer +tar -xf /tmp/StorageExplorer-linux-x64.tar.gz -C /opt/storage-explorer +sudo chmod +x /opt/storage-explorer/*.sh # # Install desktop environment if image doesn't have one already if [ "${INSTALL_UI}" -eq 1 ]; then @@ -165,24 +165,7 @@ sudo chmod -R g+w /opt/prom-tools sudo chmod -R g+w /opt/vscode/user-data sudo chmod -R g+w /opt/vscode/extensions - -## Add ouh_researcher as default extra group when creating new users -# echo "init_vm.sh: Add OUH User Group" -# sudo cp -f /tmp/adduser.conf /etc/adduser.conf - - -# ## Install script to run at user login -# echo "init_vm.sh: User Login Script" -# sudo cp -f /tmp/init_user_profile.sh /etc/profile.d/init_user_profile.sh - - # ## Cleanup echo "init_vm.sh: Cleanup" -# sudo rm -R /tmp/init_vm.sh -# sudo rm -R /tmp/init_user_profile.sh -# sudo rm -R /tmp/adduser.conf -# sudo rm -R /tmp/Anaconda3-2022.05-Linux-x86_64.sh -# sudo rm -R /tmp/rstudio-2022.07.2-576-amd64.deb -# sudo rm -R /tmp/google-chrome-stable_current_amd64.deb sudo apt -y autoremove sudo apt install unattended-upgrades \ No newline at end of file From 760f783fef6b6eaaaff8bb6e0d500723286937c2 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Tue, 23 Apr 2024 16:58:05 +0100 Subject: [PATCH 59/62] updat --- templates/shared_services/sonatype-nexus-vm/porter.yaml | 2 +- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/shared_services/sonatype-nexus-vm/porter.yaml b/templates/shared_services/sonatype-nexus-vm/porter.yaml index ce17cff98a..2e73d5f318 100644 --- a/templates/shared_services/sonatype-nexus-vm/porter.yaml +++ b/templates/shared_services/sonatype-nexus-vm/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-shared-service-sonatype-nexus -version: 2.8.14 +version: 2.8.15 description: "A Sonatype Nexus shared service" dockerfile: Dockerfile.tmpl registry: azuretre 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 b0814c3512..0d8180a417 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.32 +version: 0.6.33 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre From c4e70942407a5134bd6b7bb04e8a900dc8790787 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 25 Apr 2024 14:20:05 +0100 Subject: [PATCH 60/62] update --- .../guacamole-azure-linuxvm/terraform/vm_config.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index e9532ff6e6..80b54120f1 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -11,10 +11,10 @@ sudo rm -f /etc/apt/sources.list.d/* # Update apt packages from configured Nexus sources echo "init_vm.sh: START" -sudo apt update +sudo apt update || continue sudo apt upgrade -y sudo apt install -y gnupg2 software-properties-common apt-transport-https wget dirmngr gdebi-core -sudo apt-get update +sudo apt-get update || continue ## Desktop echo "init_vm.sh: Desktop" @@ -38,6 +38,9 @@ sudo mkdir /opt/vscode/extensions echo "init_vm.sh: VS Code" sudo apt install -y code gvfs-bin +echo "init_vm.sh: azure-cli" +sudo apt install azure-cli -y + # TODO: need to look at proxy extentions ## VSCode Extensions # echo "init_vm.sh: VSCode extensions" @@ -59,7 +62,7 @@ sudo apt install -y code gvfs-bin ## Azure Storage Explorer sudo apt install gnome-keyring -y -wget -q ${NEXUS_PROXY_URL}/A/E/3/AE32C485-B62B-4437-92F7-8B6B2C48CB40/StorageExplorer-linux-x64.tar.gz -P /tmp +wget -q ${NEXUS_PROXY_URL}/microsoft-download/A/E/3/AE32C485-B62B-4437-92F7-8B6B2C48CB40/StorageExplorer-linux-x64.tar.gz -P /tmp sudo mkdir /opt/storage-explorer tar -xf /tmp/StorageExplorer-linux-x64.tar.gz -C /opt/storage-explorer sudo chmod +x /opt/storage-explorer/*.sh From 060b6fd5d0e611323047615122950f76188b1f75 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 25 Apr 2024 16:17:09 +0100 Subject: [PATCH 61/62] vm update --- .../guacamole-azure-linuxvm/porter.yaml | 2 +- .../terraform/vm_config.sh | 37 +++++++------------ 2 files changed, 14 insertions(+), 25 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 index 0d8180a417..7628764016 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.33 +version: 0.6.34 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index 80b54120f1..8b98b463ea 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -12,13 +12,16 @@ sudo rm -f /etc/apt/sources.list.d/* # Update apt packages from configured Nexus sources echo "init_vm.sh: START" sudo apt update || continue -sudo apt upgrade -y sudo apt install -y gnupg2 software-properties-common apt-transport-https wget dirmngr gdebi-core sudo apt-get update || continue ## Desktop echo "init_vm.sh: Desktop" -sudo DEBIAN_FRONTEND=noninteractive +echo /usr/sbin/gdm3 > /etc/X11/default-display-manager +DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true dpkg-reconfigure gdm3 +echo set shared/default-x-display-manager gdm3 | debconf-communicate &> /dev/null + +sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true sudo apt install -y xfce4 xfce4-goodies xorg dbus-x11 x11-xserver-utils ## Install xrdp so Guacamole can connect via RDP @@ -28,20 +31,20 @@ sudo adduser xrdp ssl-cert sudo systemctl enable xrdp ## Python 3.8 and Jupyter -sudo apt install -y python3.8 python3.8-venv python3.8-dev jupyter-notebook +sudo apt install -y jupyter-notebook ## VS Code -echo "init_vm.sh: Folders" -sudo mkdir /opt/vscode/user-data -sudo mkdir /opt/vscode/extensions - echo "init_vm.sh: VS Code" -sudo apt install -y code gvfs-bin +sudo apt install -y code +sudo apt install -y gvfs-bin || contine echo "init_vm.sh: azure-cli" sudo apt install azure-cli -y # TODO: need to look at proxy extentions +# echo "init_vm.sh: Folders" +# sudo mkdir /opt/vscode/user-data +# sudo mkdir /opt/vscode/extensions ## VSCode Extensions # echo "init_vm.sh: VSCode extensions" # code --extensions-dir="/opt/vscode/extensions" --user-data-dir="/opt/vscode/user-data" --install-extension ms-python.python @@ -49,11 +52,11 @@ sudo apt install azure-cli -y # code --extensions-dir="/opt/vscode/extensions" --user-data-dir="/opt/vscode/user-data" --install-extension RDebugger.r-debugger ## R -# echo "init_vm.sh: R Setup" +echo "init_vm.sh: R Setup" # wget -q https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc -O- | sudo apt-key add - # sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/" # sudo apt update -# sudo apt install -y r-base +sudo apt install -y r-base ## RStudio Desktop # echo "init_vm.sh: RStudio" @@ -67,15 +70,6 @@ sudo mkdir /opt/storage-explorer tar -xf /tmp/StorageExplorer-linux-x64.tar.gz -C /opt/storage-explorer sudo chmod +x /opt/storage-explorer/*.sh -# # Install desktop environment if image doesn't have one already -if [ "${INSTALL_UI}" -eq 1 ]; then - sudo apt-get install -y xorg - sudo apt-get install -y xfce4 - sudo apt-get install -y xfce4-goodies - sudo apt-get install -y dbus-x11 - sudo apt-get install -y x11-xserver-utils -fi - sudo -u "${VM_USER}" -i bash -c 'echo xfce4-session > ~/.xsession' # Fix for blank screen on DSVM (/sh -> /bash due to conflict with profile.d scripts) @@ -157,16 +151,11 @@ sudo echo -e "local({\n r <- getOption(\"repos\")\n r[\"Nexus\"] <- \"""${ ## Add ouh_researcher group for directory permissions echo "init_vm.sh: directory permissions" -getent group ouh_researcher || sudo groupadd ouh_researcher sudo chgrp -R ouh_researcher /opt/anaconda sudo chgrp -R ouh_researcher /opt/prom-tools -sudo chgrp -R ouh_researcher /opt/vscode/user-data -sudo chgrp -R ouh_researcher /opt/vscode/extensions sudo chmod -R g+w /opt/anaconda sudo chmod -R g+w /opt/prom-tools -sudo chmod -R g+w /opt/vscode/user-data -sudo chmod -R g+w /opt/vscode/extensions # ## Cleanup echo "init_vm.sh: Cleanup" From f1d68da0cdcf8c2e61a6c71c2c625fa21f06e31c Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 25 Apr 2024 17:58:40 +0100 Subject: [PATCH 62/62] update --- .../guacamole-azure-linuxvm/porter.yaml | 2 +- .../terraform/apt_sources_config.yml | 1 - .../guacamole-azure-linuxvm/terraform/vm_config.sh | 11 +++-------- 3 files changed, 4 insertions(+), 10 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 index 7628764016..ef8971cbc6 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.34 +version: 0.6.35 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml index ae558a7085..faeaa61cd3 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml @@ -17,5 +17,4 @@ apt: deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/ubuntu/${apt_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/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/repos/vscode stable main - deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/repos/azure-cli stable main deb [signed-by=/etc/apt/trusted.gpg.d/docker-archive-keyring.gpg] ${nexus_proxy_url}/repository/docker/ $RELEASE stable diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index 8b98b463ea..f0d0c8a63b 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -28,7 +28,7 @@ sudo apt install -y xfce4 xfce4-goodies xorg dbus-x11 x11-xserver-utils echo "init_vm.sh: xrdp" sudo apt install -y xrdp xorgxrdp xfce4-session sudo adduser xrdp ssl-cert -sudo systemctl enable xrdp +sudo -u "${VM_USER}" -i bash -c 'echo xfce4-session > ~/.xsession' ## Python 3.8 and Jupyter sudo apt install -y jupyter-notebook @@ -38,8 +38,8 @@ echo "init_vm.sh: VS Code" sudo apt install -y code sudo apt install -y gvfs-bin || contine -echo "init_vm.sh: azure-cli" -sudo apt install azure-cli -y +# echo "init_vm.sh: azure-cli" +# sudo apt install azure-cli -y # TODO: need to look at proxy extentions # echo "init_vm.sh: Folders" @@ -70,8 +70,6 @@ sudo mkdir /opt/storage-explorer tar -xf /tmp/StorageExplorer-linux-x64.tar.gz -C /opt/storage-explorer sudo chmod +x /opt/storage-explorer/*.sh -sudo -u "${VM_USER}" -i bash -c 'echo xfce4-session > ~/.xsession' - # Fix for blank screen on DSVM (/sh -> /bash due to conflict with profile.d scripts) sudo sed -i 's|!/bin/sh|!/bin/bash|g' /etc/xrdp/startwm.sh @@ -152,10 +150,7 @@ sudo echo -e "local({\n r <- getOption(\"repos\")\n r[\"Nexus\"] <- \"""${ ## Add ouh_researcher group for directory permissions echo "init_vm.sh: directory permissions" sudo chgrp -R ouh_researcher /opt/anaconda -sudo chgrp -R ouh_researcher /opt/prom-tools - sudo chmod -R g+w /opt/anaconda -sudo chmod -R g+w /opt/prom-tools # ## Cleanup echo "init_vm.sh: Cleanup"