From 24776d95e4021874e607bc3debb5108fa41aae4e Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 16 Jun 2025 17:19:39 -0400 Subject: [PATCH 1/3] rebase arch-xfce to selkies set defaults --- .editorconfig | 0 .github/ISSUE_TEMPLATE/issue.bug.yml | 0 .github/ISSUE_TEMPLATE/issue.feature.yml | 0 .github/workflows/call_issue_pr_tracker.yml | 0 .github/workflows/call_issues_cron.yml | 0 .github/workflows/permissions.yml | 0 Dockerfile | 17 ++-- Jenkinsfile | 4 +- jenkins-vars.yml | 4 +- root/defaults/startwm.sh | 17 ++-- root/defaults/xfce/xfce4-desktop.xml | 18 ++++ root/defaults/xfce/xfce4-panel.xml | 53 ++++++++++++ root/defaults/xfce/xfwm4.xml | 91 +++++++++++++++++++++ root/defaults/xfce/xsettings.xml | 91 +++++++++++++++++++++ root/usr/bin/exo-open | 4 +- root/usr/bin/thunar | 2 + root/usr/local/bin/wrapped-chromium | 2 +- 17 files changed, 280 insertions(+), 23 deletions(-) mode change 100755 => 100644 .editorconfig mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.bug.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.feature.yml mode change 100755 => 100644 .github/workflows/call_issue_pr_tracker.yml mode change 100755 => 100644 .github/workflows/call_issues_cron.yml mode change 100755 => 100644 .github/workflows/permissions.yml create mode 100644 root/defaults/xfce/xfce4-desktop.xml create mode 100644 root/defaults/xfce/xfce4-panel.xml create mode 100644 root/defaults/xfce/xfwm4.xml create mode 100644 root/defaults/xfce/xsettings.xml create mode 100755 root/usr/bin/thunar 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 bfcbcd8af..3280cc733 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/Jenkinsfile b/Jenkinsfile index 5aac76a78..426ee157a 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 413380f55..b497ea7dd 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 c71a563c5..eab612f1f 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 000000000..769b20487 --- /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 000000000..fbcf29179 --- /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 000000000..ab08aaa9c --- /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 000000000..ab08aaa9c --- /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 87d073247..6a7d1be45 100755 --- a/root/usr/bin/exo-open +++ b/root/usr/bin/exo-open @@ -1,7 +1,7 @@ #! /bin/bash if [ "${2}" == "WebBrowser" ]; then - /usr/bin/xdg-open /usr/share/applications/chromium.desktop -else + /usr/bin/dex-autostart /usr/share/applications/chromium-browser.desktop +else /usr/bin/exo-open-real "$@" fi diff --git a/root/usr/bin/thunar b/root/usr/bin/thunar new file mode 100755 index 000000000..952938a20 --- /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 093678e1c..bfad4dad5 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 "$@" From 8dbbdf0838b744f8a54f23777f252a2042fe6bc5 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 16 Jun 2025 17:23:30 -0400 Subject: [PATCH 2/3] forgot web browser path --- root/usr/bin/exo-open | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/usr/bin/exo-open b/root/usr/bin/exo-open index 6a7d1be45..1d67b54d2 100755 --- a/root/usr/bin/exo-open +++ b/root/usr/bin/exo-open @@ -1,7 +1,7 @@ #! /bin/bash if [ "${2}" == "WebBrowser" ]; then - /usr/bin/dex-autostart /usr/share/applications/chromium-browser.desktop + /usr/bin/xdg-open /usr/share/applications/chromium.desktop else /usr/bin/exo-open-real "$@" fi From 90acc0ad4f762c53af7584bfbf6ee66243bf69c3 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 16 Jun 2025 17:44:05 -0400 Subject: [PATCH 3/3] forgot aarch64 --- Dockerfile.aarch64 | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e67172740..78d6085a4 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 \