LAB-linuxserver/docker-rdesktop
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-rdesktop.git synced 2026-02-20 06:16:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

sync webtop logic

Browse Source
This commit is contained in:
thelamer 2024-01-17 13:05:47 -08:00 committed by Ryan Kuba
parent 45f5975f7d
commit 205872a081
7 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile
View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-rdesktop:3.18
FROM ghcr.io/linuxserver/baseimage-rdesktop:3.19
# set version label
ARG BUILD_DATE
@ -14,7 +14,7 @@ RUN \
faenza-icon-theme \
faenza-icon-theme-xfce4-appfinder \
faenza-icon-theme-xfce4-panel \
chromium \
firefox \
mousepad \
ristretto \
thunar \
@ -22,11 +22,6 @@ RUN \
xfce4 \
xfce4-pulseaudio-plugin \
xfce4-terminal && \
echo "**** application tweaks ****" && \
sed -i \
's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
/usr/share/applications/chromium.desktop && \
mv /usr/bin/exo-open /usr/bin/exo-open-real && \
echo "**** cleanup ****" && \
rm -f \
/etc/xdg/autostart/xfce4-power-manager.desktop \

9
Dockerfile.aarch64
View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-3.18
FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-3.19
# set version label
ARG BUILD_DATE
@ -14,7 +14,7 @@ RUN \
faenza-icon-theme \
faenza-icon-theme-xfce4-appfinder \
faenza-icon-theme-xfce4-panel \
chromium \
firefox \
mousepad \
ristretto \
thunar \
@ -22,11 +22,6 @@ RUN \
xfce4 \
xfce4-pulseaudio-plugin \
xfce4-terminal && \
echo "**** application tweaks ****" && \
sed -i \
's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
/usr/share/applications/chromium.desktop && \
mv /usr/bin/exo-open /usr/bin/exo-open-real && \
echo "**** cleanup ****" && \
rm -f \
/etc/xdg/autostart/xfce4-power-manager.desktop \

1
README.md
View File

@ -352,6 +352,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **17.01.24:** - Sync webtop logic changes rebase to Alpine 3.19 and Fedora 39.
* **18.05.23:** - Rebase all Alpine images to 3.18, deprecate armhf.
* **27.10.22:** - Rebase all Ubuntu images to Jammy 22.04.
* **26.10.22:** - Rebase Alpine xfce to 3.16, migrate to s6v3.

1
readme-vars.yml
View File

@ -107,6 +107,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "17.01.24:", desc: "Sync webtop logic changes rebase to Alpine 3.19 and Fedora 39." }
- { date: "18.05.23:", desc: "Rebase all Alpine images to 3.18, deprecate armhf." }
- { date: "27.10.22:", desc: "Rebase all Ubuntu images to Jammy 22.04." }
- { date: "26.10.22:", desc: "Rebase Alpine xfce to 3.16, migrate to s6v3." }

7
root/defaults/startwm.sh
View File

@ -1,3 +1,8 @@
#!/bin/bash
/startpulse.sh &
/usr/bin/startxfce4 > /dev/null 2>&1
if [ -f "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml ]; then
sed -i \
'/use_compositing/c <property name="use_compositing" type="bool" value="false"/>' \
"${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
fi
/usr/bin/xfce4-session > /dev/null 2>&1

7
root/usr/bin/exo-open
View File

@ -1,7 +0,0 @@
#!/bin/bash
if [ "${2}" == "WebBrowser" ]; then
/usr/bin/xdg-open /usr/share/applications/chromium.desktop
else
/usr/bin/exo-open-real "$@"
fi

10
root/usr/local/bin/wrapped-chromium
View File

@ -1,10 +0,0 @@
#!/bin/bash
BIN=/usr/bin/chromium-browser
# Run normally on privved containers or modified un non priv
if grep -q 'Seccomp: 0' /proc/1/status; then
${BIN} --password-store=basic "$@"
else
${BIN} --password-store=basic --no-sandbox --test-type "$@"
fi