Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Temporarily use Xpra beta #359

Merged
merged 1 commit into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions remote/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ARG XPRA_REGISTRY=https://xpra.org

# Install xpra and dependencies
RUN wget -qO /usr/share/keyrings/xpra.asc ${XPRA_REGISTRY}/xpra.asc && \
wget -qO /etc/apt/sources.list.d/xpra.sources https://raw.githubusercontent.com/Xpra-org/xpra/master/packaging/repos/bookworm/xpra.sources && \
wget -qO /etc/apt/sources.list.d/xpra.sources https://raw.githubusercontent.com/Xpra-org/xpra/master/packaging/repos/bookworm/xpra-beta.sources && \
sed -i "s|https://xpra.org|${XPRA_REGISTRY}|" /etc/apt/sources.list.d/xpra.sources && \
apt-get update && \
apt-get install -y \
Expand All @@ -45,13 +45,6 @@ RUN wget -qO /usr/share/keyrings/xpra.asc ${XPRA_REGISTRY}/xpra.asc && \
nginx && \
rm -rf /var/lib/apt/lists/*

# Inject script to force focus on modal windows in xpra client
# and remove the compressed index.html files because they don't contain our fix
COPY client-inject.js /tmp/client-inject.js
RUN sed -i -e '/load_default_settings();/i\\' -e '/load_default_settings();/e cat /tmp/client-inject.js' /usr/share/xpra/www/index.html \
&& rm /usr/share/xpra/www/index.html.gz \
&& rm /usr/share/xpra/www/index.html.br

COPY rc.xml /etc/xdg/openbox/rc.xml
COPY menu.xml /etc/xdg/openbox/menu.xml

Expand Down
20 changes: 0 additions & 20 deletions remote/client-inject.js

This file was deleted.

Loading