diff --git a/Dockerfile b/Dockerfile index f0134b7..84f6882 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,7 @@ FROM alpine AS selkies-frontend # pull in args for the tag ARG SRC -ENV SELKIES_VERSION="d70c9155e0df97ac1e6ac7a4cce04e4b04840286" +ENV SELKIES_VERSION="af1a1c252563d2f136d641b81d6b1dd38a3a0d93" # grab package lists COPY --from=lists /work/lists/ /lists/ @@ -75,7 +75,7 @@ FROM distro AS base-image ARG SRC # version of selkies to clone -ENV SELKIES_VERSION="d70c9155e0df97ac1e6ac7a4cce04e4b04840286" +ENV SELKIES_VERSION="af1a1c252563d2f136d641b81d6b1dd38a3a0d93" # environment variables ENV PREFIX=/ @@ -120,6 +120,7 @@ COPY common/root/ / # LD_PRELOAD wrapper handlers (selkies hack) RUN chmod +x /usr/bin/thunar \ && chmod +x /usr/bin/sudo \ + && chmod +x /usr/bin/helios \ && chmod +x /usr/bin/google-chrome-stable \ && chmod +x /usr/bin/google-chrome diff --git a/README.md b/README.md index 5209340..e1c0204 100644 --- a/README.md +++ b/README.md @@ -74,18 +74,18 @@ Explore the supported Linux distributions with their versions, image sizes, and #### [Debian 12 (Bookworm)](https://hub.docker.com/_/debian/tags?name=bookworm) -- **Size:** 1.6 GB +- **Size:** 2.35 GB #### [Debian Rolling (Sid)](https://hub.docker.com/_/debian/tags?name=sid) -- **Size:** 1.76 GB +- **Size:** 2.55 GB #### [Kali Linux (Rolling Release)](https://hub.docker.com/r/kalilinux/kali-rolling) > [!TIP] > No default Kali tools are installed in this image. Please refer to the [Kali Linux Docker Image documentation](https://www.kali.org/docs/containers/official-kalilinux-docker-images/) for installing them. -- **Size:** 1.72 GB (Excludes Kali tools which increase image size) +- **Size:** 2.54 GB (Excludes Kali tools which increase image size) --- @@ -93,11 +93,11 @@ Explore the supported Linux distributions with their versions, image sizes, and #### [Ubuntu 24.04 (Noble)](https://hub.docker.com/_/ubuntu/tags?name=noble) -- **Size:** 1.48 GB +- **Size:** 2.14 GB #### [Ubuntu 22.04 (Jammy)](https://hub.docker.com/_/ubuntu/tags?name=jammy) -- **Size:** 1.35 GB +- **Size:** 1.97 GB --- @@ -105,11 +105,11 @@ Explore the supported Linux distributions with their versions, image sizes, and #### [Rocky Linux 9](https://hub.docker.com/_/rockylinux/tags?name=9) -- **Size:** 1.76 GB +- **Size:** 2.6 GB #### [Alma Linux 9](https://hub.docker.com/_/almalinux/tags?name=9) -- **Size:** 1.61 GB +- **Size:** 2.44 GB ## 🏷️ Versioning diff --git a/bookworm/build/system.sh b/bookworm/build/system.sh index 4648547..66a7f80 100644 --- a/bookworm/build/system.sh +++ b/bookworm/build/system.sh @@ -56,4 +56,4 @@ rm -f /etc/apt/sources.list apt clean -y apt autoclean -y apt autoremove --purge -y -rm -rfv /var/lib/{apt,cache,log}/ /tmp/* /etc/systemd /var/lib/apt/lists/* /var/tmp/* /tmp/* +rm -rfv /var/lib/{apt,cache,log}/ /etc/systemd /var/lib/apt/lists/* /var/tmp/* /tmp/* diff --git a/common/root/etc/s6-overlay/s6-rc.d/svc-selkies/run b/common/root/etc/s6-overlay/s6-rc.d/svc-selkies/run index 00b956c..0cbc221 100644 --- a/common/root/etc/s6-overlay/s6-rc.d/svc-selkies/run +++ b/common/root/etc/s6-overlay/s6-rc.d/svc-selkies/run @@ -24,7 +24,7 @@ echo "Starting Selkies..." # Start Selkies exec s6-setuidgid "${USER}" \ - selkies \ + helios \ --addr="0.0.0.0" \ --port="8081" \ --enable_basic_auth="false" \ diff --git a/common/root/usr/bin/helios b/common/root/usr/bin/helios new file mode 100644 index 0000000..6129155 --- /dev/null +++ b/common/root/usr/bin/helios @@ -0,0 +1,10 @@ +#!/bin/bash +unset LD_PRELOAD + +# get the python version formatted as "python3.x" +PYTHON_VERSION=$(python3 -c "import sys; print(f'python{sys.version_info.major}.{sys.version_info.minor}')") + +# add the python version to the LD_PRELOAD path +export LD_PRELOAD="$LD_PRELOAD:/usr/local/lib/${PYTHON_VERSION}/dist-packages/pixelflux/screen_capture_module.so" + +selkies "$@" \ No newline at end of file diff --git a/jammy/build/system.sh b/jammy/build/system.sh index 77ddc18..4ab29a1 100644 --- a/jammy/build/system.sh +++ b/jammy/build/system.sh @@ -50,4 +50,4 @@ rm -f /etc/xdg/autostart/xscreensaver.desktop apt clean -y apt autoclean -y apt autoremove --purge -y -rm -rfv /var/lib/{apt,cache,log}/ /tmp/* /etc/systemd /var/lib/apt/lists/* /var/tmp/* /tmp/* +rm -rfv /var/lib/{apt,cache,log}/ /etc/systemd /var/lib/apt/lists/* /var/tmp/* /tmp/* diff --git a/kali/build/system.sh b/kali/build/system.sh index 4449553..61bf08d 100644 --- a/kali/build/system.sh +++ b/kali/build/system.sh @@ -22,7 +22,8 @@ apt install --no-install-recommends -y \ gcc \ g++ \ python3-dev \ - python3-pip + python3-pip \ + libcrypt-dev # handle background mv -v /usr/share/backgrounds/kali/kali-oleo-16x9.png /tmp/background.png @@ -37,7 +38,8 @@ apt remove --purge -y \ gcc \ g++ \ python3-dev \ - python3-pip + python3-pip \ + libcrypt-dev # remove screensaver and lock screen rm -f /etc/xdg/autostart/xscreensaver.desktop @@ -52,4 +54,4 @@ rm -f /etc/xdg/autostart/xscreensaver.desktop apt clean -y apt autoclean -y apt autoremove --purge -y -rm -rfv /var/lib/{apt,cache,log}/ /tmp/* /etc/systemd /var/lib/apt/lists/* /var/tmp/* /tmp/* +rm -rfv /var/lib/{apt,cache,log}/ /etc/systemd /var/lib/apt/lists/* /var/tmp/* /tmp/* diff --git a/selkies-requirements.txt b/selkies-requirements.txt index 370afd8..b3066ae 100644 --- a/selkies-requirements.txt +++ b/selkies-requirements.txt @@ -1,3 +1,4 @@ # selkies does not pin their upstream requirements properly, so we have to do it ourselves here. -av==14.0.0 -pixelflux==1.4.7 +av==14.2.0 +pixelflux==1.5.9 +xkbcommon==1.0.1 diff --git a/sid/build/system.sh b/sid/build/system.sh index 75cddb3..a20326a 100644 --- a/sid/build/system.sh +++ b/sid/build/system.sh @@ -59,4 +59,4 @@ rm -f /etc/xdg/autostart/xscreensaver.desktop apt clean -y apt autoclean -y apt autoremove --purge -y -rm -rfv /var/lib/{apt,cache,log}/ /tmp/* /etc/systemd /var/lib/apt/lists/* /var/tmp/* /tmp/* +rm -rfv /var/lib/{apt,cache,log}/ /etc/systemd /var/lib/apt/lists/* /var/tmp/* /tmp/*