mirror of
https://github.com/linuxserver/docker-webtop.git
synced 2025-07-09 06:44:49 +02:00
rebase to selkies, setup kde more (#317)
This commit is contained in:
parent
5459c68af9
commit
652ecdce10
0
.editorconfig
Executable file → Normal file
0
.editorconfig
Executable file → Normal file
0
.github/ISSUE_TEMPLATE/issue.bug.yml
vendored
Executable file → Normal file
0
.github/ISSUE_TEMPLATE/issue.bug.yml
vendored
Executable file → Normal file
0
.github/ISSUE_TEMPLATE/issue.feature.yml
vendored
Executable file → Normal file
0
.github/ISSUE_TEMPLATE/issue.feature.yml
vendored
Executable file → Normal file
0
.github/workflows/call_issue_pr_tracker.yml
vendored
Executable file → Normal file
0
.github/workflows/call_issue_pr_tracker.yml
vendored
Executable file → Normal file
0
.github/workflows/call_issues_cron.yml
vendored
Executable file → Normal file
0
.github/workflows/call_issues_cron.yml
vendored
Executable file → Normal file
0
.github/workflows/permissions.yml
vendored
Executable file → Normal file
0
.github/workflows/permissions.yml
vendored
Executable file → Normal file
@ -1,4 +1,4 @@
|
|||||||
FROM ghcr.io/linuxserver/baseimage-kasmvnc:fedora41
|
FROM ghcr.io/linuxserver/baseimage-selkies:fedora42
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
@ -12,7 +12,7 @@ ENV TITLE="Fedora KDE"
|
|||||||
RUN \
|
RUN \
|
||||||
echo "**** add icon ****" && \
|
echo "**** add icon ****" && \
|
||||||
curl -o \
|
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 && \
|
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
|
||||||
echo "**** install packages ****" && \
|
echo "**** install packages ****" && \
|
||||||
dnf install -y --setopt=install_weak_deps=False --best \
|
dnf install -y --setopt=install_weak_deps=False --best \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-fedora41
|
FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-fedora42
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
@ -12,7 +12,7 @@ ENV TITLE="Fedora KDE"
|
|||||||
RUN \
|
RUN \
|
||||||
echo "**** add icon ****" && \
|
echo "**** add icon ****" && \
|
||||||
curl -o \
|
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 && \
|
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
|
||||||
echo "**** install packages ****" && \
|
echo "**** install packages ****" && \
|
||||||
dnf install -y --setopt=install_weak_deps=False --best \
|
dnf install -y --setopt=install_weak_deps=False --best \
|
||||||
|
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@ -30,8 +30,8 @@ pipeline {
|
|||||||
MULTIARCH = 'true'
|
MULTIARCH = 'true'
|
||||||
CI = 'true'
|
CI = 'true'
|
||||||
CI_WEB = 'true'
|
CI_WEB = 'true'
|
||||||
CI_PORT = '3000'
|
CI_PORT = '3001'
|
||||||
CI_SSL = 'false'
|
CI_SSL = 'true'
|
||||||
CI_DELAY = '120'
|
CI_DELAY = '120'
|
||||||
CI_DOCKERENV = 'TZ=US/Pacific'
|
CI_DOCKERENV = 'TZ=US/Pacific'
|
||||||
CI_AUTH = 'user:password'
|
CI_AUTH = 'user:password'
|
||||||
|
@ -19,8 +19,8 @@ repo_vars:
|
|||||||
- MULTIARCH = 'true'
|
- MULTIARCH = 'true'
|
||||||
- CI = 'true'
|
- CI = 'true'
|
||||||
- CI_WEB = 'true'
|
- CI_WEB = 'true'
|
||||||
- CI_PORT = '3000'
|
- CI_PORT = '3001'
|
||||||
- CI_SSL = 'false'
|
- CI_SSL = 'true'
|
||||||
- CI_DELAY = '120'
|
- CI_DELAY = '120'
|
||||||
- CI_DOCKERENV = 'TZ=US/Pacific'
|
- CI_DOCKERENV = 'TZ=US/Pacific'
|
||||||
- CI_AUTH = 'user:password'
|
- CI_AUTH = 'user:password'
|
||||||
|
1
root/defaults/autostart
Normal file
1
root/defaults/autostart
Normal file
@ -0,0 +1 @@
|
|||||||
|
exit 0
|
@ -11,13 +11,54 @@ if [ ! -f $HOME/.config/kdeglobals ]; then
|
|||||||
kwriteconfig6 --file $HOME/.config/kdeglobals --group KDE --key LookAndFeelPackage org.fedoraproject.fedora.desktop
|
kwriteconfig6 --file $HOME/.config/kdeglobals --group KDE --key LookAndFeelPackage org.fedoraproject.fedora.desktop
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Enable Nvidia GPU support if detected
|
# Power related
|
||||||
if which nvidia-smi; then
|
setterm blank 0
|
||||||
|
setterm powerdown 0
|
||||||
|
|
||||||
|
# Direcotries
|
||||||
|
sudo rm -f /usr/share/dbus-1/system-services/org.freedesktop.UDisks2.service
|
||||||
|
mkdir -p "${HOME}/.config/autostart" "${HOME}/.XDG" "${HOME}/.local/share/"
|
||||||
|
chmod 700 "${HOME}/.XDG"
|
||||||
|
touch "${HOME}/.local/share/user-places.xbel"
|
||||||
|
|
||||||
|
# Background perm loop
|
||||||
|
if [ ! -d $HOME/.config/kde.org ]; then
|
||||||
|
(
|
||||||
|
loop_end_time=$((SECONDS + 30))
|
||||||
|
while [ $SECONDS -lt $loop_end_time ]; do
|
||||||
|
find "$HOME/.cache" "$HOME/.config" "$HOME/.local" -type f -perm 000 -exec chmod 644 {} + 2>/dev/null
|
||||||
|
sleep .1
|
||||||
|
done
|
||||||
|
) &
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create startup script if it does not exist (keep in sync with openbox)
|
||||||
|
STARTUP_FILE="${HOME}/.config/autostart/autostart.desktop"
|
||||||
|
if [ ! -f "${STARTUP_FILE}" ]; then
|
||||||
|
echo "[Desktop Entry]" > $STARTUP_FILE
|
||||||
|
echo "Exec=bash /config/.config/openbox/autostart" >> $STARTUP_FILE
|
||||||
|
echo "Icon=dialog-scripts" >> $STARTUP_FILE
|
||||||
|
echo "Name=autostart" >> $STARTUP_FILE
|
||||||
|
echo "Path=" >> $STARTUP_FILE
|
||||||
|
echo "Type=Application" >> $STARTUP_FILE
|
||||||
|
echo "X-KDE-AutostartScript=true" >> $STARTUP_FILE
|
||||||
|
chmod +x $STARTUP_FILE
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check for any render nodes
|
||||||
|
for node in /dev/dri/renderD*; do
|
||||||
|
if [ -e "$node" ]; then
|
||||||
|
render_node_exists=true
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
# Enable Zink support if detected
|
||||||
|
if [ "$render_node_exists" = true ] && [ "${DISABLE_ZINK}" == "false" ]; then
|
||||||
export LIBGL_KOPPER_DRI2=1
|
export LIBGL_KOPPER_DRI2=1
|
||||||
export MESA_LOADER_DRIVER_OVERRIDE=zink
|
export MESA_LOADER_DRIVER_OVERRIDE=zink
|
||||||
export GALLIUM_DRIVER=zink
|
export GALLIUM_DRIVER=zink
|
||||||
fi
|
fi
|
||||||
|
|
||||||
setterm blank 0
|
# Stat DE
|
||||||
setterm powerdown 0
|
unset LD_PRELOAD
|
||||||
/usr/bin/startplasma-x11 > /dev/null 2>&1
|
/usr/bin/startplasma-x11 > /dev/null 2>&1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user