diff --git a/Dockerfile b/Dockerfile index d63bf948..4f239f60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c0f38496..5b9e087b 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -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 \ diff --git a/README.md b/README.md index e0f18399..6db078b5 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/readme-vars.yml b/readme-vars.yml index 929b05c7..40fa6693 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -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." } diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh index a91a812d..9019e260 100755 --- a/root/defaults/startwm.sh +++ b/root/defaults/startwm.sh @@ -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 ' \ + "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml +fi +/usr/bin/xfce4-session > /dev/null 2>&1 diff --git a/root/usr/bin/exo-open b/root/usr/bin/exo-open deleted file mode 100755 index 41c561bb..00000000 --- a/root/usr/bin/exo-open +++ /dev/null @@ -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 diff --git a/root/usr/local/bin/wrapped-chromium b/root/usr/local/bin/wrapped-chromium deleted file mode 100755 index 58b953c0..00000000 --- a/root/usr/local/bin/wrapped-chromium +++ /dev/null @@ -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