From cd1a4dbf2fdbfda70c493880f3be4fde3a1590d8 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 12 Apr 2024 16:49:59 +0100 Subject: [PATCH] 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