diff --git a/.editorconfig b/.editorconfig
old mode 100755
new mode 100644
diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml
old mode 100755
new mode 100644
diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml
old mode 100755
new mode 100644
diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml
old mode 100755
new mode 100644
diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml
old mode 100755
new mode 100644
diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml
old mode 100755
new mode 100644
diff --git a/Dockerfile b/Dockerfile
index 034c769c..6a1bf538 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm
+FROM ghcr.io/linuxserver/baseimage-selkies:debianbookworm
# set version label
ARG BUILD_DATE
@@ -12,7 +12,7 @@ ENV TITLE="Debian XFCE"
RUN \
echo "**** add icon ****" && \
curl -o \
- /kclient/public/icon.png \
+ /usr/share/selkies/www/icon.png \
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
echo "**** install packages ****" && \
apt-get update && \
@@ -20,9 +20,10 @@ RUN \
apt-get install -y --no-install-recommends \
chromium \
chromium-l10n \
+ elementary-xfce-icon-theme \
+ greybird-gtk-theme \
libxfce4ui-utils \
mousepad \
- tango-icon-theme \
thunar \
xfce4-appfinder \
xfce4-panel \
@@ -33,12 +34,16 @@ RUN \
xfconf \
xfdesktop4 \
xfwm4 && \
- echo "**** application tweaks ****" && \
+ echo "**** xfce 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 "**** xfce tweaks ****" && \
+ mv \
+ /usr/bin/exo-open \
+ /usr/bin/exo-open-real && \
+ mv \
+ /usr/bin/thunar \
+ /usr/bin/thunar-real && \
rm -f \
/etc/xdg/autostart/xscreensaver.desktop && \
echo "**** cleanup ****" && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index deae6cb2..e425fe51 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-debianbookworm
+FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-debianbookworm
# set version label
ARG BUILD_DATE
@@ -12,7 +12,7 @@ ENV TITLE="Debian XFCE"
RUN \
echo "**** add icon ****" && \
curl -o \
- /kclient/public/icon.png \
+ /usr/share/selkies/www/icon.png \
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
echo "**** install packages ****" && \
apt-get update && \
@@ -20,9 +20,10 @@ RUN \
apt-get install -y --no-install-recommends \
chromium \
chromium-l10n \
+ elementary-xfce-icon-theme \
+ greybird-gtk-theme \
libxfce4ui-utils \
mousepad \
- tango-icon-theme \
thunar \
xfce4-appfinder \
xfce4-panel \
@@ -33,12 +34,16 @@ RUN \
xfconf \
xfdesktop4 \
xfwm4 && \
- echo "**** application tweaks ****" && \
+ echo "**** xfce 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 "**** xfce tweaks ****" && \
+ mv \
+ /usr/bin/exo-open \
+ /usr/bin/exo-open-real && \
+ mv \
+ /usr/bin/thunar \
+ /usr/bin/thunar-real && \
rm -f \
/etc/xdg/autostart/xscreensaver.desktop && \
echo "**** cleanup ****" && \
diff --git a/Jenkinsfile b/Jenkinsfile
index ddeac373..8f06ef86 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,8 +30,8 @@ pipeline {
MULTIARCH='true'
CI='true'
CI_WEB='true'
- CI_PORT='3000'
- CI_SSL='false'
+ CI_PORT='3001'
+ CI_SSL='true'
CI_DELAY='120'
CI_DOCKERENV='TZ=US/Pacific'
CI_AUTH='user:password'
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index d54915ee..54199fd0 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -19,8 +19,8 @@ repo_vars:
- MULTIARCH='true'
- CI='true'
- CI_WEB='true'
- - CI_PORT='3000'
- - CI_SSL='false'
+ - CI_PORT='3001'
+ - CI_SSL='true'
- CI_DELAY='120'
- CI_DOCKERENV='TZ=US/Pacific'
- CI_AUTH='user:password'
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index dd17d920..f955cebb 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -1,6 +1,5 @@
#!/bin/bash
-
# Enable Nvidia GPU support if detected
if which nvidia-smi; then
export LIBGL_KOPPER_DRI2=1
@@ -8,14 +7,11 @@ if which nvidia-smi; then
export GALLIUM_DRIVER=zink
fi
-# Disable compositing
-setterm blank 0
-setterm powerdown 0
-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
+# Default settings
+if [ ! -d "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml ]; then
+ mkdir -p "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml
+ cp /defaults/xfce/* "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/
fi
-# Launch DE
-/usr/bin/xfce4-session > /dev/null 2>&1
+# Start DE
+dbus-launch /usr/bin/xfce4-session > /dev/null 2>&1
diff --git a/root/defaults/xfce/xfce4-panel.xml b/root/defaults/xfce/xfce4-panel.xml
new file mode 100644
index 00000000..366452ab
--- /dev/null
+++ b/root/defaults/xfce/xfce4-panel.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/root/defaults/xfce/xfwm4.xml b/root/defaults/xfce/xfwm4.xml
new file mode 100644
index 00000000..01982880
--- /dev/null
+++ b/root/defaults/xfce/xfwm4.xml
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/root/defaults/xfce/xsettings.xml b/root/defaults/xfce/xsettings.xml
new file mode 100644
index 00000000..cdd9f366
--- /dev/null
+++ b/root/defaults/xfce/xsettings.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/root/usr/bin/thunar b/root/usr/bin/thunar
new file mode 100755
index 00000000..f4e3f8e7
--- /dev/null
+++ b/root/usr/bin/thunar
@@ -0,0 +1,3 @@
+#!/bin/bash
+unset LD_PRELOAD
+thunar-real "$@"