From dc7c7a91b74cd34fbfba560fe55728298ca7eed6 Mon Sep 17 00:00:00 2001 From: Zach Russell Date: Tue, 16 Dec 2025 21:27:31 -0700 Subject: [PATCH 1/5] icon fix --- Dockerfile | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index ac0669e..30aaef9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ENV TITLE=Beeper RUN \ echo "**** add icon ****" && \ curl -o \ - /kclient/public/icon.png \ + /usr/share/selkies/www/icon.png \ https://avatars.githubusercontent.com/u/74791520?s=200&v=4 && \ echo "**** install packages ****" && \ apt-get update && \ @@ -30,11 +30,16 @@ RUN \ chromium \ chromium-l10n \ git \ - libgtk-3-bin \ - libatk1.0 \ - libatk-bridge2.0 \ - libnss3 \ - python3-xdg && \ + fonts-dejavu \ + fonts-dejavu-extra \ + gir1.2-gst-plugins-bad-1.0 \ + gir1.2-gstreamer-1.0 \ + gstreamer1.0-nice \ + gstreamer1.0-plugins-* \ + gstreamer1.0-pulseaudio \ + libosmesa6 \ + libwebkit2gtk-4.1-0 \ + libwx-perl && \ cd /tmp && \ echo "**** download beta ****" && \ curl -o \ From 3dc3d422274da0bbc49fbf98abc16a8d52d30cbe Mon Sep 17 00:00:00 2001 From: Zach Russell Date: Tue, 16 Dec 2025 21:21:47 -0700 Subject: [PATCH 2/5] move to selkies --- Dockerfile | 6 +- Dockerfile.aarch64 | 59 ------------------- root/defaults/autostart | 6 +- .../dependencies.d/init-config | 0 .../s6-overlay/s6-rc.d/init-beeper-config/run | 10 ---- .../s6-rc.d/init-beeper-config/type | 1 - .../s6-overlay/s6-rc.d/init-beeper-config/up | 1 - .../dependencies.d/init-beeper-config | 0 .../user/contents.d/init-beeper-config | 0 root/usr/bin/beeper | 21 ------- root/usr/bin/chromium | 29 --------- 11 files changed, 5 insertions(+), 128 deletions(-) delete mode 100644 Dockerfile.aarch64 delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-beeper-config/dependencies.d/init-config delete mode 100755 root/etc/s6-overlay/s6-rc.d/init-beeper-config/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-beeper-config/type delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-beeper-config/up delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-beeper-config delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-beeper-config delete mode 100755 root/usr/bin/beeper delete mode 100755 root/usr/bin/chromium diff --git a/Dockerfile b/Dockerfile index 30aaef9..829e09e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm +FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble # set version label # ARG BUILD_DATE @@ -19,6 +19,7 @@ RUN \ /usr/share/selkies/www/icon.png \ https://avatars.githubusercontent.com/u/74791520?s=200&v=4 && \ echo "**** install packages ****" && \ + add-apt-repository ppa:xtradeb/apps && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive \ echo "**** install beeper ****" && \ @@ -44,13 +45,14 @@ RUN \ echo "**** download beta ****" && \ curl -o \ /tmp/beeper.app -L \ - "https://beeper-desktop.download.beeper.com/builds/Beeper-4.2.269-x86_64.AppImage" && \ + "https://beeper-desktop.download.beeper.com/builds/Beeper-4.2.330-x86_64.AppImage" && \ chmod +x /tmp/beeper.app && \ ./beeper.app --appimage-extract && \ mv squashfs-root /opt/beeper && \ cp \ /opt/beeper/beepertexts.png \ /usr/share/icons/hicolor/512x512/apps/beeper.png && \ + localedef -i en_GB -f UTF-8 en_GB.UTF-8 && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 deleted file mode 100644 index e5c89c2..0000000 --- a/Dockerfile.aarch64 +++ /dev/null @@ -1,59 +0,0 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-debianbookworm - -# set version label -# ARG BUILD_DATE -# ARG VERSION -# ARG BEEPER_VERSION -# LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="zachatrocity" - -# title -ENV TITLE=Beeper - -RUN \ - echo "**** add icon ****" && \ - curl -o \ - /kclient/public/icon.png \ - https://avatars.githubusercontent.com/u/74791520?s=200&v=4 && \ - echo "**** install packages ****" && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive \ - echo "**** install beeper ****" && \ - # Todo don't hard code beeper version - # if [ -z ${BEEPER_VERSION+x} ]; then \ - # BEEPER_VERSION=$(curl -sX GET "https://api.github.com/repos/obsidianmd/obsidian-releases/releases/latest"| awk '/tag_name/{print $4;exit}' FS='[""]'); \ - # fi && \ - apt-get install -y --no-install-recommends \ - chromium \ - chromium-l10n \ - git \ - libgtk-3-bin \ - libatk1.0 \ - libatk-bridge2.0 \ - libnss3 \ - python3-xdg && \ - cd /tmp && \ - curl -o \ - /tmp/beeper.app -L \ - "https://beeper-desktop.download.beeper.com/builds/Beeper-4.2.269.AppImage" && \ - chmod +x /tmp/beeper.app && \ - ./beeper.app --appimage-extract && \ - mv squashfs-root /opt/beeper && \ - cp \ - /opt/beeper/beepertexts.png \ - /usr/share/icons/hicolor/512x512/apps/beeper.png && \ - echo "**** cleanup ****" && \ - apt-get autoclean && \ - rm -rf \ - /config/.cache \ - /config/.launchpadlib \ - /var/lib/apt/lists/* \ - /var/tmp/* \ - /tmp/* - -# add local files -COPY /root / - -# ports and volumes -EXPOSE 3000 -VOLUME /config diff --git a/root/defaults/autostart b/root/defaults/autostart index 741c71b..669c393 100644 --- a/root/defaults/autostart +++ b/root/defaults/autostart @@ -1,6 +1,3 @@ -# Fix permissions -sudo lsiown -R $(id -u):$(id -u) /opt/beeper - # Enable dark mode if defined if [ "${DARK_MODE}" = "true" ] && [ ! -f "$HOME/.config/gtk-3.0/settings.ini" ]; then mkdir -p $HOME/.config/gtk-3.0 @@ -10,5 +7,4 @@ elif [ "${DARK_MODE}" != "true" ] && [ -f "$HOME/.config/gtk-3.0/settings.ini" ] rm -f "$HOME/.config/gtk-3.0/settings.ini" fi -export APPDIR='/opt/beeper' -/opt/beeper/AppRun --no-sandbox --disable-gpu \ No newline at end of file +/opt/beeper/AppRun diff --git a/root/etc/s6-overlay/s6-rc.d/init-beeper-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-beeper-config/dependencies.d/init-config deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/init-beeper-config/run b/root/etc/s6-overlay/s6-rc.d/init-beeper-config/run deleted file mode 100755 index 0a5857e..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-beeper-config/run +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/with-contenv bash -# shellcheck shell=bash - -# permissions -lsiown -R abc:abc \ - /config -lsiown -R abc:abc \ - /opt/beeper -lsiown -R abc:abc \ - /opt/beeper-legacy diff --git a/root/etc/s6-overlay/s6-rc.d/init-beeper-config/type b/root/etc/s6-overlay/s6-rc.d/init-beeper-config/type deleted file mode 100644 index 3d92b15..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-beeper-config/type +++ /dev/null @@ -1 +0,0 @@ -oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-beeper-config/up b/root/etc/s6-overlay/s6-rc.d/init-beeper-config/up deleted file mode 100644 index 4f0105d..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-beeper-config/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-beeper-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-beeper-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-beeper-config deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-beeper-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-beeper-config deleted file mode 100644 index e69de29..0000000 diff --git a/root/usr/bin/beeper b/root/usr/bin/beeper deleted file mode 100755 index 15918f1..0000000 --- a/root/usr/bin/beeper +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -BIN=/opt/beeper/beepertexts -LEGACY_BIN=/opt/beeper-legacy/beeper - -# Use legacy bin if USE_LEGACY_BIN is set to true -if [ "$USE_LEGACY_BIN" = "true" ]; then - SELECTED_BIN=$LEGACY_BIN -else - SELECTED_BIN=$BIN -fi - -# Run normally on privved containers or modified in non priv -if grep -q 'Seccomp:.0' /proc/1/status; then - ${SELECTED_BIN} \ - "$@" > /dev/null 2>&1 -else - ${SELECTED_BIN} \ - --no-sandbox \ - "$@" > /dev/null 2>&1 -fi diff --git a/root/usr/bin/chromium b/root/usr/bin/chromium deleted file mode 100755 index bc67373..0000000 --- a/root/usr/bin/chromium +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -BIN=/usr/lib/chromium/chromium - -# Cleanup -if ! pgrep chromium > /dev/null;then - rm -f $HOME/.config/chromium/Singleton* -fi - -# Run normally on privved containers or modified un non priv -if grep -q 'Seccomp:.0' /proc/1/status; then - ${BIN} \ - --ignore-gpu-blocklist \ - --no-first-run \ - --password-store=basic \ - --simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT' \ - --user-data-dir \ - "$@" > /dev/null 2>&1 -else - ${BIN} \ - --ignore-gpu-blocklist \ - --no-first-run \ - --no-sandbox \ - --password-store=basic \ - --simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT' \ - --test-type \ - --user-data-dir \ - "$@" > /dev/null 2>&1 -fi From cc2288886d7bdd3c7ecba8e662f1cff7c58d8da0 Mon Sep 17 00:00:00 2001 From: Zach Russell Date: Sun, 21 Dec 2025 17:08:26 -0700 Subject: [PATCH 3/5] electron --- root/defaults/autostart | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/root/defaults/autostart b/root/defaults/autostart index 669c393..9d33d52 100644 --- a/root/defaults/autostart +++ b/root/defaults/autostart @@ -1,3 +1,6 @@ +# Fix permissions +sudo lsiown -R $(id -u):$(id -u) /opt/beeper + # Enable dark mode if defined if [ "${DARK_MODE}" = "true" ] && [ ! -f "$HOME/.config/gtk-3.0/settings.ini" ]; then mkdir -p $HOME/.config/gtk-3.0 @@ -7,4 +10,5 @@ elif [ "${DARK_MODE}" != "true" ] && [ -f "$HOME/.config/gtk-3.0/settings.ini" ] rm -f "$HOME/.config/gtk-3.0/settings.ini" fi -/opt/beeper/AppRun +export APPDIR='/opt/beeper' +/opt/beeper/AppRun --no-sandbox --disable-gpu From 4489dbe640d442d48e09897f11af4c886cb1ffc9 Mon Sep 17 00:00:00 2001 From: Zach Russell Date: Sun, 21 Dec 2025 17:24:50 -0700 Subject: [PATCH 4/5] fix auto start --- root/defaults/autostart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/autostart b/root/defaults/autostart index 9d33d52..24953b0 100644 --- a/root/defaults/autostart +++ b/root/defaults/autostart @@ -11,4 +11,4 @@ elif [ "${DARK_MODE}" != "true" ] && [ -f "$HOME/.config/gtk-3.0/settings.ini" ] fi export APPDIR='/opt/beeper' -/opt/beeper/AppRun --no-sandbox --disable-gpu +/opt/beeper/beepertexts --no-sandbox From f95045990231235b7a2da44125a16cf8fade7366 Mon Sep 17 00:00:00 2001 From: Zach Russell Date: Sun, 21 Dec 2025 17:32:41 -0700 Subject: [PATCH 5/5] fix perms --- root/defaults/autostart | 3 --- 1 file changed, 3 deletions(-) diff --git a/root/defaults/autostart b/root/defaults/autostart index 24953b0..c873d12 100644 --- a/root/defaults/autostart +++ b/root/defaults/autostart @@ -1,6 +1,3 @@ -# Fix permissions -sudo lsiown -R $(id -u):$(id -u) /opt/beeper - # Enable dark mode if defined if [ "${DARK_MODE}" = "true" ] && [ ! -f "$HOME/.config/gtk-3.0/settings.ini" ]; then mkdir -p $HOME/.config/gtk-3.0