Skip to content

Commit 91f964c

Browse files
committed
rebase to selkies
1 parent ca540c3 commit 91f964c

6 files changed

Lines changed: 47 additions & 17 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-kasmvnc:kali
1+
FROM ghcr.io/linuxserver/baseimage-selkies:kali
22

33
# set version label
44
ARG BUILD_DATE
@@ -12,7 +12,7 @@ ENV TITLE="Kali Linux"
1212
RUN \
1313
echo "**** add icon ****" && \
1414
curl -o \
15-
/kclient/public/icon.png \
15+
/usr/share/selkies/www/icon.png \
1616
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/kali-logo.png && \
1717
echo "**** install packages ****" && \
1818
apt-get update && \

Dockerfile.aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-kali
1+
FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-kali
22

33
# set version label
44
ARG BUILD_DATE
@@ -12,7 +12,7 @@ ENV TITLE="Kali Linux"
1212
RUN \
1313
echo "**** add icon ****" && \
1414
curl -o \
15-
/kclient/public/icon.png \
15+
/usr/share/selkies/www/icon.png \
1616
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/kali-logo.png && \
1717
echo "**** install packages ****" && \
1818
apt-get update && \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,5 +426,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
426426

427427
## Versions
428428

429+
* **19.06.25:** - Rebase to Selkies baseimage.
429430
* **24.01.25:** - Fix SVG icons not rendering.
430431
* **18.07.24:** - Initial release.

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,5 +119,6 @@ init_diagram: |
119119
"kali-linux:latest" <- Base Images
120120
# changelog
121121
changelogs:
122+
- {date: "19.06.25:", desc: "Rebase to Selkies baseimage."}
122123
- {date: "24.01.25:", desc: "Fix SVG icons not rendering."}
123124
- {date: "18.07.24:", desc: "Initial release."}

root/defaults/autostart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
exit 0

root/defaults/startwm.sh

Lines changed: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,54 @@
11
#!/bin/bash
22

3-
# Enable Nvidia GPU support if detected
4-
if which nvidia-smi; then
5-
export LIBGL_KOPPER_DRI2=1
6-
export MESA_LOADER_DRIVER_OVERRIDE=zink
7-
export GALLIUM_DRIVER=zink
8-
fi
9-
10-
# Disable compositing and screen lock
3+
# Disable compositing and screen locking
114
if [ ! -f $HOME/.config/kwinrc ]; then
125
kwriteconfig6 --file $HOME/.config/kwinrc --group Compositing --key Enabled false
136
fi
147
if [ ! -f $HOME/.config/kscreenlockerrc ]; then
158
kwriteconfig6 --file $HOME/.config/kscreenlockerrc --group Daemon --key Autolock false
169
fi
10+
11+
# Power related
1712
setterm blank 0
1813
setterm powerdown 0
1914

20-
# Set default bashrc
21-
if [ ! -f $HOME/.bashlock ]; then
22-
sudo cp /root/.bashrc $HOME/.bashrc
23-
touch $HOME/.bashlock
15+
# Direcotries
16+
sudo rm -f /usr/share/dbus-1/system-services/org.freedesktop.UDisks2.service
17+
mkdir -p "${HOME}/.config/autostart" "${HOME}/.XDG" "${HOME}/.local/share/"
18+
chmod 700 "${HOME}/.XDG"
19+
touch "${HOME}/.local/share/user-places.xbel"
20+
21+
# Background perm loop
22+
if [ ! -d $HOME/.config/kde.org ]; then
23+
(
24+
loop_end_time=$((SECONDS + 30))
25+
while [ $SECONDS -lt $loop_end_time ]; do
26+
find "$HOME/.cache" "$HOME/.config" "$HOME/.local" -type f -perm 000 -exec chmod 644 {} + 2>/dev/null
27+
sleep .1
28+
done
29+
) &
30+
fi
31+
32+
# Create startup script if it does not exist (keep in sync with openbox)
33+
STARTUP_FILE="${HOME}/.config/autostart/autostart.desktop"
34+
if [ ! -f "${STARTUP_FILE}" ]; then
35+
echo "[Desktop Entry]" > $STARTUP_FILE
36+
echo "Exec=bash /config/.config/openbox/autostart" >> $STARTUP_FILE
37+
echo "Icon=dialog-scripts" >> $STARTUP_FILE
38+
echo "Name=autostart" >> $STARTUP_FILE
39+
echo "Path=" >> $STARTUP_FILE
40+
echo "Type=Application" >> $STARTUP_FILE
41+
echo "X-KDE-AutostartScript=true" >> $STARTUP_FILE
42+
chmod +x $STARTUP_FILE
43+
fi
44+
45+
# Enable Nvidia GPU support if detected
46+
if which nvidia-smi && [ "${DISABLE_ZINK}" == "false" ]; then
47+
export LIBGL_KOPPER_DRI2=1
48+
export MESA_LOADER_DRIVER_OVERRIDE=zink
49+
export GALLIUM_DRIVER=zink
2450
fi
2551

26-
# Launch DE
52+
# Stat DE
53+
unset LD_PRELOAD
2754
/usr/bin/startplasma-x11 > /dev/null 2>&1

0 commit comments

Comments
 (0)