diff --git a/remote/Dockerfile b/remote/Dockerfile index 36ba9019..6d7a5a79 100644 --- a/remote/Dockerfile +++ b/remote/Dockerfile @@ -45,8 +45,10 @@ RUN wget -qO /usr/share/keyrings/xpra.asc ${XPRA_REGISTRY}/xpra.asc && \ nginx && \ rm -rf /var/lib/apt/lists/* +COPY openbox-launcher.sh /usr/local/bin/openbox-launcher.sh COPY rc.xml /etc/xdg/openbox/rc.xml COPY menu.xml /etc/xdg/openbox/menu.xml +RUN printf '\nGTK_IM_MODULE=ibus\n' >> /etc/environment # Setup Nitrogen (Desktop background) COPY wallpaper.png /tmp/wallpaper.png diff --git a/remote/openbox-launcher.sh b/remote/openbox-launcher.sh new file mode 100755 index 00000000..30e900c1 --- /dev/null +++ b/remote/openbox-launcher.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# SPDX-FileCopyrightText: Copyright DB InfraGO AG and contributors +# SPDX-License-Identifier: Apache-2.0 + +xrdb -merge <<\EOF +Xft.dpi: 96 +EOF + +exec openbox-session diff --git a/remote/supervisord.xpra.conf b/remote/supervisord.xpra.conf index e43d4a4a..1d0ccc9a 100644 --- a/remote/supervisord.xpra.conf +++ b/remote/supervisord.xpra.conf @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 [program:xpra] -command=xpra start :10 --start=/home/techuser/.config/openbox/autostart --start-env=GTK_IM_MODULE=ibus --attach=yes --daemon=no --bind-tcp=0.0.0.0:10001 --min-quality=70 +command=xpra start-desktop :10 --start=/usr/local/bin/openbox-launcher.sh --attach=yes --daemon=no --bind-tcp=0.0.0.0:10001 --min-quality=70 user=techuser autorestart=true environment=DISPLAY=":10",XPRA_DEFAULT_CONTENT_TYPE="text",XPRA_DEFAULT_VFB_RESOLUTION="1920x1080"