Skip to content

Commit

Permalink
Enhance DPI settings for Linux VM display (#4206)
Browse files Browse the repository at this point in the history
Linux VM VDI image is blurred.
Fixes #4200

Co-authored-by: Tim Allen <tim.allen@cloudkubed.com>
  • Loading branch information
marrobi and Tim Allen authored Dec 18, 2024
1 parent 5bccd99 commit 04df2b8
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
6 changes: 6 additions & 0 deletions docs/tre-templates/user-resources/guacamole-linux-vm.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.9.1"
__version__ = "0.9.2"
2 changes: 1 addition & 1 deletion templates/workspace_services/guacamole/porter.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 04df2b8

Please sign in to comment.