diff --git a/CHANGELOG.md b/CHANGELOG.md index cd432d87ca..71fd30deac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ ENHANCEMENTS: * Add option to configure auto shutdown for Linux VM ([#4186](https://github.com/microsoft/AzureTRE/issues/4186)) * Add ability to download VSCode Extensions ([[#4187](https://github.com/microsoft/AzureTRE/issues/4187)]) * Update Windows VM Images ([#4198](https://github.com/microsoft/AzureTRE/pull/4198)) +* Enhance DPI of Linux display ([[#4200](https://github.com/microsoft/AzureTRE/issues/4200)]) BUG FIXES: * Update KeyVault references in API to use the version so Terraform cascades the update ([#4112](https://github.com/microsoft/AzureTRE/pull/4112)) diff --git a/docs/tre-templates/user-resources/guacamole-linux-vm.md b/docs/tre-templates/user-resources/guacamole-linux-vm.md index 31c08f55a0..16f87abff1 100644 --- a/docs/tre-templates/user-resources/guacamole-linux-vm.md +++ b/docs/tre-templates/user-resources/guacamole-linux-vm.md @@ -15,5 +15,11 @@ It blocks all inbound and outbound traffic to the internet and allows only RDP c - In production we recommend using VM images to avoid transient issues downloading and installing packages. The included user resource templates for VMs with bootstrap scripts should only be used for trial/demonstration purposes. More info can be found [here](./custom.md). - Snap (app store for linux via [snapcraft.io](https://snapcraft.io)) hasn't been configured to work via the nexus proxy +## Modifying the DPI of the Linux VM display + +Depending on the display resolution and your personal preference, you may want to adjust the DPI (Dots Per Inch) setting of your Linux VM to make text and UI elements appear larger or smaller, and hence clearer. This can be done by modifying the Xft.dpi value in `.Xresources` file. + +After running this command, you may need to run `reboot` to restart the VM so that the changes to take effect. + ## Using Custom Images For custom image usage, visit this [page](./custom.md). diff --git a/templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile b/templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile index 31dc30d0cd..fe0b8012a5 100644 --- a/templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile +++ b/templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile @@ -53,7 +53,7 @@ COPY ./docker/services /etc/services.d/ COPY --from=client_build /target/lib/* "${GUACAMOLE_LIB}" COPY --from=client_build "/target/guacamole-auth-tre-${GUACAMOLE_AZURE_VERSION}.jar" "${GUACAMOLE_HOME}/extensions/" -RUN wget -O "${GUACAMOLE_HOME}/guacamole.war" "http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/1.5.3/binary/guacamole-1.5.3.war" --progress=dot:giga +RUN wget -O "${GUACAMOLE_HOME}/guacamole.war" "http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/1.5.5/binary/guacamole-1.5.5.war" --progress=dot:giga ENV OAUTH2_PROXY_HOME=/etc/oauth2-proxy RUN OAUTH2_PROXY_ARCHIVE=oauth2-proxy.tar.gz && \ diff --git a/templates/workspace_services/guacamole/guacamole-server/docker/version.txt b/templates/workspace_services/guacamole/guacamole-server/docker/version.txt index d69d16e980..a2fecb4576 100644 --- a/templates/workspace_services/guacamole/guacamole-server/docker/version.txt +++ b/templates/workspace_services/guacamole/guacamole-server/docker/version.txt @@ -1 +1 @@ -__version__ = "0.9.1" +__version__ = "0.9.2" diff --git a/templates/workspace_services/guacamole/porter.yaml b/templates/workspace_services/guacamole/porter.yaml index 7222122624..f38bd2fc72 100644 --- a/templates/workspace_services/guacamole/porter.yaml +++ b/templates/workspace_services/guacamole/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-service-guacamole -version: 0.12.1 +version: 0.12.2 description: "An Azure TRE service for Guacamole" 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 fa04988905..1c1f918f45 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 @@ -152,6 +152,7 @@ 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 jq -n --arg proxy "${NEXUS_PROXY_URL}:8083" '{"registry-mirrors": [$proxy]}' > /etc/docker/daemon.json +sudo usermod -aG docker "${VM_USER}" sudo systemctl daemon-reload sudo systemctl restart docker @@ -185,6 +186,7 @@ sudo adduser xrdp ssl-cert sudo -u "${VM_USER}" -i bash -c 'echo xfce4-session > ~/.xsession' sudo -u "${VM_USER}" -i bash -c 'echo xset s off >> ~/.xsession' sudo -u "${VM_USER}" -i bash -c 'echo xset -dpms >> ~/.xsession' +sudo -u "${VM_USER}" -i bash -c 'echo Xft.dpi: 192 >> ~/.Xresources' # 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