From 4c17f40078187e5944d0468d0b3cfd254d9a4303 Mon Sep 17 00:00:00 2001 From: Ryan Kuba Date: Tue, 17 Jun 2025 14:51:06 +0000 Subject: [PATCH] rebase fedora-xfce to selkies setup default settings (#306) --- .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 | 19 +++-- Dockerfile.aarch64 | 19 +++-- Jenkinsfile | 4 +- jenkins-vars.yml | 4 +- root/defaults/startwm.sh | 17 ++-- root/defaults/xfce/xfce4-panel.xml | 54 ++++++++++++ root/defaults/xfce/xfwm4.xml | 91 +++++++++++++++++++++ root/defaults/xfce/xsettings.xml | 42 ++++++++++ root/usr/bin/exo-open | 2 +- root/usr/bin/thunar | 2 + 16 files changed, 225 insertions(+), 29 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-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 5cf84fc5..53f444a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:fedora41 +FROM ghcr.io/linuxserver/baseimage-selkies:fedora42 # set version label ARG BUILD_DATE @@ -7,12 +7,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thelamer" # title -ENV TITLE="Fedora XFCE" +ENV TITLE="Fedora 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 ****" && \ dnf install -y --setopt=install_weak_deps=False --best \ @@ -36,14 +37,18 @@ RUN \ xfdesktop \ xfwm4 \ xfwm4-themes && \ - echo "**** application tweaks ****" && \ + echo "**** xfce tweaks ****" && \ sed -i \ 's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \ /usr/share/applications/chromium-browser.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/xfce-polkit.desktop && \ + /etc/xdg/autostart/xscreensaver.desktop && \ echo "**** cleanup ****" && \ dnf autoremove -y && \ dnf clean all && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 632fc6c8..317bd6d5 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-fedora41 +FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-fedora42 # set version label ARG BUILD_DATE @@ -7,12 +7,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thelamer" # title -ENV TITLE="Fedora XFCE" +ENV TITLE="Fedora 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 ****" && \ dnf install -y --setopt=install_weak_deps=False --best \ @@ -36,14 +37,18 @@ RUN \ xfdesktop \ xfwm4 \ xfwm4-themes && \ - echo "**** application tweaks ****" && \ + echo "**** xfce tweaks ****" && \ sed -i \ 's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \ /usr/share/applications/chromium-browser.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/xfce-polkit.desktop && \ + /etc/xdg/autostart/xscreensaver.desktop && \ echo "**** cleanup ****" && \ dnf autoremove -y && \ dnf clean all && \ diff --git a/Jenkinsfile b/Jenkinsfile index b581b780..ca34663d 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 fdfc6231..a4e57866 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 fdb93b00..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/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..9d909b83 --- /dev/null +++ b/root/defaults/xfce/xfce4-panel.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root/defaults/xfce/xfwm4.xml b/root/defaults/xfce/xfwm4.xml new file mode 100644 index 00000000..240377d4 --- /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..143138ca --- /dev/null +++ b/root/defaults/xfce/xsettings.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root/usr/bin/exo-open b/root/usr/bin/exo-open index e40fb556..6a7d1be4 100755 --- a/root/usr/bin/exo-open +++ b/root/usr/bin/exo-open @@ -2,6 +2,6 @@ if [ "${2}" == "WebBrowser" ]; then /usr/bin/dex-autostart /usr/share/applications/chromium-browser.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 "$@"