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 bfcbcd8a..3280cc73 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:arch
+FROM ghcr.io/linuxserver/baseimage-selkies:arch
# set version label
ARG BUILD_DATE
@@ -8,12 +8,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="thelamer"
# title
-ENV TITLE="Arch XFCE"
+ENV TITLE="Arch XFCE" \
+ NO_GAMEPAD="true"
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 ****" && \
pacman -Sy --noconfirm --needed \
@@ -21,12 +22,16 @@ RUN \
mousepad \
xfce4 \
xfce4-pulseaudio-plugin && \
- 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/xfce4-power-manager.desktop \
/etc/xdg/autostart/xfce-polkit.desktop \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index e6717274..78d6085a 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-arch
+FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-arch
# set version label
ARG BUILD_DATE
@@ -8,12 +8,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="thelamer"
# title
-ENV TITLE="Arch XFCE"
+ENV TITLE="Arch XFCE" \
+ NO_GAMEPAD="true"
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 ****" && \
pacman -Sy --noconfirm --needed \
@@ -21,12 +22,16 @@ RUN \
mousepad \
xfce4 \
xfce4-pulseaudio-plugin && \
- 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/xfce4-power-manager.desktop \
/etc/xdg/autostart/xfce-polkit.desktop \
diff --git a/Jenkinsfile b/Jenkinsfile
index 5aac76a7..426ee157 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 413380f5..b497ea7d 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -20,8 +20,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 c71a563c..eab612f1 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bash
# Enable Nvidia GPU support if detected
if which nvidia-smi; then
@@ -7,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/dbus-launch /usr/bin/startxfce4 --replace > /dev/null 2>&1
+# Start DE
+dbus-launch /usr/bin/xfce4-session > /dev/null 2>&1
diff --git a/root/defaults/xfce/xfce4-desktop.xml b/root/defaults/xfce/xfce4-desktop.xml
new file mode 100644
index 00000000..769b2048
--- /dev/null
+++ b/root/defaults/xfce/xfce4-desktop.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/root/defaults/xfce/xfce4-panel.xml b/root/defaults/xfce/xfce4-panel.xml
new file mode 100644
index 00000000..fbcf2917
--- /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..ab08aaa9
--- /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..ab08aaa9
--- /dev/null
+++ b/root/defaults/xfce/xsettings.xml
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/root/usr/bin/exo-open b/root/usr/bin/exo-open
index 87d07324..1d67b54d 100755
--- a/root/usr/bin/exo-open
+++ b/root/usr/bin/exo-open
@@ -2,6 +2,6 @@
if [ "${2}" == "WebBrowser" ]; then
/usr/bin/xdg-open /usr/share/applications/chromium.desktop
-else
+else
/usr/bin/exo-open-real "$@"
fi
diff --git a/root/usr/bin/thunar b/root/usr/bin/thunar
new file mode 100755
index 00000000..952938a2
--- /dev/null
+++ b/root/usr/bin/thunar
@@ -0,0 +1,2 @@
+#!/bin/bash
+dbus-launch thunar-real "$@"
diff --git a/root/usr/local/bin/wrapped-chromium b/root/usr/local/bin/wrapped-chromium
index 093678e1..bfad4dad 100755
--- a/root/usr/local/bin/wrapped-chromium
+++ b/root/usr/local/bin/wrapped-chromium
@@ -8,7 +8,7 @@ if ! pgrep chromium > /dev/null;then
fi
# Run normally on privved containers or modified un non priv
-if grep -q 'Seccomp:.0' /proc/1/status; then
+if grep -q 'Seccomp:.0' /proc/1/status; then
${BIN} --password-store=basic "$@"
else
${BIN} --password-store=basic --no-sandbox --test-type "$@"