public/nicotine-less
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Disable Gitea workflows and stabilize VNC startup

Browse Source 
Pause automated builds while updating the image, and improve VNC startup/logging with a one-way clipboard bridge for reliable browser sync.
This commit is contained in:
Claude
2026-03-01 12:21:22 +01:00
parent ba48d1c8d1
commit 2742058a32
9 changed files with 473 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
.gitea/workflows/build.yml → .gitea/workflows/build.yml.disabled
View File

0
.gitea/workflows/mirror-alpine.yml → .gitea/workflows/mirror-alpine.yml.disabled
View File

7
Dockerfile
View File

@@ -42,6 +42,8 @@ RUN apt-get update && apt-get install -y \
xauth \ xauth \
# Supervisord to manage processes # Supervisord to manage processes
supervisor \ supervisor \
# Emoji font support
fonts-noto-color-emoji \
# Utilities # Utilities
wget \ wget \
curl \ curl \
@@ -72,9 +74,12 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY entrypoint.sh /usr/local/bin/entrypoint.sh COPY entrypoint.sh /usr/local/bin/entrypoint.sh
COPY openbox-rc.xml /home/${USER}/.config/openbox/rc.xml COPY openbox-rc.xml /home/${USER}/.config/openbox/rc.xml
COPY index.html /usr/share/novnc/index.html COPY index.html /usr/share/novnc/index.html
COPY vnc-patched.html /usr/share/novnc/vnc.html
COPY vnc-clipboard-bridge.js /usr/share/novnc/vnc-clipboard-bridge.js
COPY log-prefix.sh /usr/local/bin/log-prefix.sh
# Set permissions # Set permissions
RUN chmod +x /usr/local/bin/entrypoint.sh \ RUN chmod +x /usr/local/bin/entrypoint.sh /usr/local/bin/log-prefix.sh \
&& chown -R ${USER}:${USER} /home/${USER} /config /downloads /incomplete && chown -R ${USER}:${USER} /home/${USER} /config /downloads /incomplete
# Expose noVNC and Soulseek ports # Expose noVNC and Soulseek ports

26
entrypoint.sh
View File

@@ -32,12 +32,36 @@ if [ ! -z "$VNC_PASSWORD" ]; then
fi fi
# Export environment variables for supervisord # Export environment variables for supervisord
export DISPLAY export DISPLAY=${DISPLAY:-:0}
export VNC_PORT export VNC_PORT
export NOVNC_PORT export NOVNC_PORT
export VNC_RESOLUTION export VNC_RESOLUTION
export VNC_DEPTH export VNC_DEPTH
export USER export USER
# Ensure X11 socket directory exists with the correct permissions (needed by Xvnc)
mkdir -p /tmp/.X11-unix
chmod 1777 /tmp/.X11-unix
chown root:root /tmp/.X11-unix
# Remove stale X lock files for the configured DISPLAY to avoid "Server is already active" errors
DISPLAY_NUM=${DISPLAY#:}
LOCK_FILE="/tmp/.X${DISPLAY_NUM}-lock"
SOCKET_FILE="/tmp/.X11-unix/X${DISPLAY_NUM}"
if [ -f "$LOCK_FILE" ]; then
LOCK_PID=$(cat "$LOCK_FILE" 2>/dev/null || true)
if pgrep -f "Xvnc :${DISPLAY_NUM}" >/dev/null 2>&1; then
echo "Existing Xvnc server detected for display :${DISPLAY_NUM}; leaving lock file intact"
elif [ -n "$LOCK_PID" ] && kill -0 "$LOCK_PID" 2>/dev/null; then
echo "Lock file $LOCK_FILE points to PID $LOCK_PID, but no Xvnc found; removing stale lock"
rm -f "$LOCK_FILE"
rm -f "$SOCKET_FILE"
else
echo "Removing stale X lock file $LOCK_FILE"
rm -f "$LOCK_FILE"
rm -f "$SOCKET_FILE"
fi
fi
# Start supervisord as root (which will start processes as nicotine user) # Start supervisord as root (which will start processes as nicotine user)
exec "$@" exec "$@"

5
index.html
View File

@@ -6,7 +6,8 @@
<title>Nicotine+ noVNC</title> <title>Nicotine+ noVNC</title>
</head> </head>
<body> <body>
<p>Redirecting to noVNC with remote resize enabled...</p> <p>Redirecting to Nicotine+ VNC interface...</p>
<p>If not redirected automatically, <a href="vnc.html?autoconnect=true&resize=local">click here</a>.</p> <p>If not redirected automatically, <a href="vnc.html?autoconnect=true&resize=remote">click here</a>.</p>
<p><strong>Note:</strong> Seamless clipboard sync is enabled when accessing via HTTPS.</p>
</body> </body>
</html> </html>

5
log-prefix.sh Normal file
View File

@@ -0,0 +1,5 @@
#!/bin/bash
# Wrapper script to prefix output with program name
PROGRAM_NAME="$1"
shift
exec "$@" 2>&1 | stdbuf -oL -eL sed "s/^/[$PROGRAM_NAME] /"

38
supervisord.conf
View File

@@ -1,43 +1,53 @@
[supervisord] [supervisord]
nodaemon=true nodaemon=true
user=root user=root
logfile=/var/log/supervisor/supervisord.log logfile=/dev/stdout
logfile_maxbytes=0
pidfile=/var/run/supervisord.pid pidfile=/var/run/supervisord.pid
[program:xvnc] [program:xvnc]
command=/usr/bin/Xvnc :0 -geometry %(ENV_VNC_RESOLUTION)s -depth %(ENV_VNC_DEPTH)s -SecurityTypes None -rfbport %(ENV_VNC_PORT)s -AcceptSetDesktopSize=1 command=/usr/local/bin/log-prefix.sh xvnc /usr/bin/Xvnc :0 -geometry %(ENV_VNC_RESOLUTION)s -depth %(ENV_VNC_DEPTH)s -SecurityTypes None -rfbport %(ENV_VNC_PORT)s -AcceptSetDesktopSize=1 -AlwaysShared -SendPrimary -SendCutText -AcceptCutText
user=%(ENV_USER)s user=%(ENV_USER)s
autostart=true autostart=true
autorestart=true autorestart=true
priority=10 priority=10
stdout_logfile=/var/log/supervisor/xvnc.log stdout_logfile=/dev/stdout
stderr_logfile=/var/log/supervisor/xvnc_err.log stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[program:openbox] [program:openbox]
command=/usr/bin/openbox command=/usr/local/bin/log-prefix.sh openbox /usr/bin/openbox
environment=DISPLAY=":0" environment=DISPLAY=":0",HOME="/home/%(ENV_USER)s",XDG_CONFIG_HOME="/home/%(ENV_USER)s/.config",XDG_DATA_HOME="/home/%(ENV_USER)s/.local/share",XDG_CACHE_HOME="/home/%(ENV_USER)s/.cache"
user=%(ENV_USER)s user=%(ENV_USER)s
autostart=true autostart=true
autorestart=true autorestart=true
priority=20 priority=20
stdout_logfile=/var/log/supervisor/openbox.log stdout_logfile=/dev/stdout
stderr_logfile=/var/log/supervisor/openbox_err.log stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[program:novnc] [program:novnc]
command=/usr/share/novnc/utils/novnc_proxy --vnc localhost:%(ENV_VNC_PORT)s --listen %(ENV_NOVNC_PORT)s command=/usr/local/bin/log-prefix.sh novnc /usr/share/novnc/utils/novnc_proxy --vnc localhost:%(ENV_VNC_PORT)s --listen %(ENV_NOVNC_PORT)s --heartbeat 30 --idle-timeout 0
environment=HOME="/home/%(ENV_USER)s",XDG_CONFIG_HOME="/home/%(ENV_USER)s/.config",XDG_DATA_HOME="/home/%(ENV_USER)s/.local/share",XDG_CACHE_HOME="/home/%(ENV_USER)s/.cache"
user=%(ENV_USER)s user=%(ENV_USER)s
autostart=true autostart=true
autorestart=true autorestart=true
priority=30 priority=30
stdout_logfile=/var/log/supervisor/novnc.log stdout_logfile=/dev/stdout
stderr_logfile=/var/log/supervisor/novnc_err.log stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[program:nicotine] [program:nicotine]
command=/usr/local/bin/nicotine command=/usr/local/bin/log-prefix.sh nicotine /usr/local/bin/nicotine
environment=DISPLAY=":0",HOME="/home/%(ENV_USER)s",XDG_CONFIG_HOME="/home/%(ENV_USER)s/.config",XDG_DATA_HOME="/home/%(ENV_USER)s/.local/share" environment=DISPLAY=":0",HOME="/home/%(ENV_USER)s",XDG_CONFIG_HOME="/home/%(ENV_USER)s/.config",XDG_DATA_HOME="/home/%(ENV_USER)s/.local/share"
user=%(ENV_USER)s user=%(ENV_USER)s
autostart=true autostart=true
autorestart=true autorestart=true
priority=40 priority=40
stdout_logfile=/var/log/supervisor/nicotine.log stdout_logfile=/dev/stdout
stderr_logfile=/var/log/supervisor/nicotine_err.log stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0

65
vnc-clipboard-bridge.js Normal file
View File

@@ -0,0 +1,65 @@
// VNC → Browser clipboard sync only (one-way)
(function() {
'use strict';
console.log('🔌 Clipboard sync initializing (VNC → Browser only)...');
const clipboardAvailable = navigator.clipboard && window.isSecureContext;
if (!clipboardAvailable) {
console.warn('⚠️ Clipboard API not available - requires HTTPS or localhost');
return;
}
console.log('✓ Clipboard API available (HTTPS detected)');
let lastPanelClipboard = '';
// Wait for clipboard panel to be available
function waitForPanel(callback) {
const panel = document.getElementById('noVNC_clipboard_text');
if (panel) {
console.log('✓ Found noVNC clipboard panel');
callback(panel);
} else {
setTimeout(() => waitForPanel(callback), 100);
}
}
waitForPanel(function(clipboardPanel) {
console.log('✓ Setting up VNC → Browser clipboard sync');
// Sync VNC clipboard to browser
function syncVNCToBrowser() {
const text = clipboardPanel.value;
if (text && text !== lastPanelClipboard) {
lastPanelClipboard = text;
console.log('📋 VNC → Browser: ' + text.substring(0, 50) + (text.length > 50 ? '... (' + text.length + ' chars)' : ''));
navigator.clipboard.writeText(text).then(() => {
console.log('✓ Synced to system clipboard');
}).catch(err => {
console.error('✗ Failed to write to clipboard:', err);
});
}
}
// Monitor changes to the clipboard panel
const observer = new MutationObserver(syncVNCToBrowser);
clipboardPanel.addEventListener('input', syncVNCToBrowser);
clipboardPanel.addEventListener('change', syncVNCToBrowser);
// Poll the panel periodically as fallback
setInterval(syncVNCToBrowser, 300);
observer.observe(clipboardPanel, {
attributes: true,
childList: true,
characterData: true,
subtree: true
});
console.log('✓ VNC → Browser clipboard sync ACTIVE');
});
})();

345
vnc-patched.html Normal file
View File

@@ -0,0 +1,345 @@
<!DOCTYPE html>
<html lang="en" class="noVNC_loading">
<head>
<!--
noVNC example: simple example using default UI
Copyright (C) 2019 The noVNC Authors
noVNC is licensed under the MPL 2.0 (see LICENSE.txt)
This file is licensed under the 2-Clause BSD license (see LICENSE.txt).
Connect parameters are provided in query string:
http://example.com/?host=HOST&port=PORT&encrypt=1
or the fragment:
http://example.com/#host=HOST&port=PORT&encrypt=1
-->
<title>noVNC</title>
<meta charset="utf-8">
<!-- Icons (see app/images/icons/Makefile for what the sizes are for) -->
<link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png">
<link rel="icon" sizes="24x24" type="image/png" href="app/images/icons/novnc-24x24.png">
<link rel="icon" sizes="32x32" type="image/png" href="app/images/icons/novnc-32x32.png">
<link rel="icon" sizes="48x48" type="image/png" href="app/images/icons/novnc-48x48.png">
<link rel="icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60x60.png">
<link rel="icon" sizes="64x64" type="image/png" href="app/images/icons/novnc-64x64.png">
<link rel="icon" sizes="72x72" type="image/png" href="app/images/icons/novnc-72x72.png">
<link rel="icon" sizes="76x76" type="image/png" href="app/images/icons/novnc-76x76.png">
<link rel="icon" sizes="96x96" type="image/png" href="app/images/icons/novnc-96x96.png">
<link rel="icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
<link rel="icon" sizes="144x144" type="image/png" href="app/images/icons/novnc-144x144.png">
<link rel="icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152x152.png">
<link rel="icon" sizes="192x192" type="image/png" href="app/images/icons/novnc-192x192.png">
<!-- Firefox currently mishandles SVG, see #1419039
<link rel="icon" sizes="any" type="image/svg+xml" href="app/images/icons/novnc-icon.svg">
-->
<!-- Repeated last so that legacy handling will pick this -->
<link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png">
<!-- Apple iOS Safari settings -->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<!-- Home Screen Icons (favourites and bookmarks use the normal icons) -->
<link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60x60.png">
<link rel="apple-touch-icon" sizes="76x76" type="image/png" href="app/images/icons/novnc-76x76.png">
<link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
<link rel="apple-touch-icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152x152.png">
<!-- Stylesheets -->
<link rel="stylesheet" href="app/styles/base.css">
<!-- Disable annoying clipboard context menu -->
<style>
/* Hide browser's native clipboard suggestion popup */
* {
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
/* Re-enable selection for clipboard panel */
#noVNC_clipboard_text {
-webkit-user-select: text;
-moz-user-select: text;
-ms-user-select: text;
user-select: text;
}
/* Hide mini-menu/clipboard suggestion popup on canvas */
#noVNC_canvas {
-webkit-touch-callout: none;
}
</style>
<!-- Images that will later appear via CSS -->
<link rel="preload" as="image" href="app/images/info.svg">
<link rel="preload" as="image" href="app/images/error.svg">
<link rel="preload" as="image" href="app/images/warning.svg">
<script src="app/error-handler.js"></script>
<script type="module" crossorigin="anonymous" src="app/ui.js"></script>
<script defer src="vnc-clipboard-bridge.js"></script>
</head>
<body>
<div id="noVNC_fallback_error" class="noVNC_center">
<div>
<div>noVNC encountered an error:</div>
<br>
<div id="noVNC_fallback_errormsg"></div>
</div>
</div>
<!-- noVNC Control Bar -->
<div id="noVNC_control_bar_anchor" class="noVNC_vcenter">
<div id="noVNC_control_bar">
<div id="noVNC_control_bar_handle" title="Hide/Show the control bar"><div></div></div>
<div class="noVNC_scroll">
<h1 class="noVNC_logo" translate="no"><span>no</span><br>VNC</h1>
<!-- Drag/Pan the viewport -->
<input type="image" alt="Drag" src="app/images/drag.svg"
id="noVNC_view_drag_button" class="noVNC_button noVNC_hidden"
title="Move/Drag Viewport">
<!--noVNC Touch Device only buttons-->
<div id="noVNC_mobile_buttons">
<input type="image" alt="Keyboard" src="app/images/keyboard.svg"
id="noVNC_keyboard_button" class="noVNC_button" title="Show Keyboard">
</div>
<!-- Extra manual keys -->
<input type="image" alt="Extra keys" src="app/images/toggleextrakeys.svg"
id="noVNC_toggle_extra_keys_button" class="noVNC_button"
title="Show Extra Keys">
<div class="noVNC_vcenter">
<div id="noVNC_modifiers" class="noVNC_panel">
<input type="image" alt="Ctrl" src="app/images/ctrl.svg"
id="noVNC_toggle_ctrl_button" class="noVNC_button"
title="Toggle Ctrl">
<input type="image" alt="Alt" src="app/images/alt.svg"
id="noVNC_toggle_alt_button" class="noVNC_button"
title="Toggle Alt">
<input type="image" alt="Windows" src="app/images/windows.svg"
id="noVNC_toggle_windows_button" class="noVNC_button"
title="Toggle Windows">
<input type="image" alt="Tab" src="app/images/tab.svg"
id="noVNC_send_tab_button" class="noVNC_button"
title="Send Tab">
<input type="image" alt="Esc" src="app/images/esc.svg"
id="noVNC_send_esc_button" class="noVNC_button"
title="Send Escape">
<input type="image" alt="Ctrl+Alt+Del" src="app/images/ctrlaltdel.svg"
id="noVNC_send_ctrl_alt_del_button" class="noVNC_button"
title="Send Ctrl-Alt-Del">
</div>
</div>
<!-- Shutdown/Reboot -->
<input type="image" alt="Shutdown/Reboot" src="app/images/power.svg"
id="noVNC_power_button" class="noVNC_button"
title="Shutdown/Reboot...">
<div class="noVNC_vcenter">
<div id="noVNC_power" class="noVNC_panel">
<div class="noVNC_heading">
<img alt="" src="app/images/power.svg"> Power
</div>
<input type="button" id="noVNC_shutdown_button" value="Shutdown">
<input type="button" id="noVNC_reboot_button" value="Reboot">
<input type="button" id="noVNC_reset_button" value="Reset">
</div>
</div>
<!-- Clipboard -->
<input type="image" alt="Clipboard" src="app/images/clipboard.svg"
id="noVNC_clipboard_button" class="noVNC_button"
title="Clipboard">
<div class="noVNC_vcenter">
<div id="noVNC_clipboard" class="noVNC_panel">
<div class="noVNC_heading">
<img alt="" src="app/images/clipboard.svg"> Clipboard
</div>
<textarea id="noVNC_clipboard_text" rows=5></textarea>
<br>
<input id="noVNC_clipboard_clear_button" type="button"
value="Clear" class="noVNC_submit">
</div>
</div>
<!-- Toggle fullscreen -->
<input type="image" alt="Fullscreen" src="app/images/fullscreen.svg"
id="noVNC_fullscreen_button" class="noVNC_button noVNC_hidden"
title="Fullscreen">
<!-- Settings -->
<input type="image" alt="Settings" src="app/images/settings.svg"
id="noVNC_settings_button" class="noVNC_button"
title="Settings">
<div class="noVNC_vcenter">
<div id="noVNC_settings" class="noVNC_panel">
<ul>
<li class="noVNC_heading">
<img alt="" src="app/images/settings.svg"> Settings
</li>
<li>
<label><input id="noVNC_setting_shared" type="checkbox"> Shared Mode</label>
</li>
<li>
<label><input id="noVNC_setting_view_only" type="checkbox"> View Only</label>
</li>
<li><hr></li>
<li>
<label><input id="noVNC_setting_view_clip" type="checkbox"> Clip to Window</label>
</li>
<li>
<label for="noVNC_setting_resize">Scaling Mode:</label>
<select id="noVNC_setting_resize" name="vncResize">
<option value="off">None</option>
<option value="scale">Local Scaling</option>
<option value="remote">Remote Resizing</option>
</select>
</li>
<li><hr></li>
<li>
<div class="noVNC_expander">Advanced</div>
<div><ul>
<li>
<label for="noVNC_setting_quality">Quality:</label>
<input id="noVNC_setting_quality" type="range" min="0" max="9" value="6">
</li>
<li>
<label for="noVNC_setting_compression">Compression level:</label>
<input id="noVNC_setting_compression" type="range" min="0" max="9" value="2">
</li>
<li><hr></li>
<li>
<label for="noVNC_setting_repeaterID">Repeater ID:</label>
<input id="noVNC_setting_repeaterID" type="text" value="">
</li>
<li>
<div class="noVNC_expander">WebSocket</div>
<div><ul>
<li>
<label><input id="noVNC_setting_encrypt" type="checkbox"> Encrypt</label>
</li>
<li>
<label for="noVNC_setting_host">Host:</label>
<input id="noVNC_setting_host">
</li>
<li>
<label for="noVNC_setting_port">Port:</label>
<input id="noVNC_setting_port" type="number">
</li>
<li>
<label for="noVNC_setting_path">Path:</label>
<input id="noVNC_setting_path" type="text" value="websockify">
</li>
</ul></div>
</li>
<li><hr></li>
<li>
<label><input id="noVNC_setting_reconnect" type="checkbox"> Automatic Reconnect</label>
</li>
<li>
<label for="noVNC_setting_reconnect_delay">Reconnect Delay (ms):</label>
<input id="noVNC_setting_reconnect_delay" type="number">
</li>
<li><hr></li>
<li>
<label><input id="noVNC_setting_show_dot" type="checkbox"> Show Dot when No Cursor</label>
</li>
<li><hr></li>
<!-- Logging selection dropdown -->
<li>
<label>Logging:
<select id="noVNC_setting_logging" name="vncLogging">
</select>
</label>
</li>
</ul></div>
</li>
<li class="noVNC_version_separator"><hr></li>
<li class="noVNC_version_wrapper">
<span>Version:</span>
<span class="noVNC_version"></span>
</li>
</ul>
</div>
</div>
<!-- Connection Controls -->
<input type="image" alt="Disconnect" src="app/images/disconnect.svg"
id="noVNC_disconnect_button" class="noVNC_button"
title="Disconnect">
</div>
</div>
<div id="noVNC_control_bar_hint"></div>
</div> <!-- End of noVNC_control_bar -->
<!-- Status Dialog -->
<div id="noVNC_status"></div>
<!-- Connect button -->
<div class="noVNC_center">
<div id="noVNC_connect_dlg">
<div class="noVNC_logo" translate="no"><span>no</span>VNC</div>
<div id="noVNC_connect_button"><div>
<img alt="" src="app/images/connect.svg"> Connect
</div></div>
</div>
</div>
<!-- Password Dialog -->
<div class="noVNC_center noVNC_connect_layer">
<div id="noVNC_credentials_dlg" class="noVNC_panel"><form>
<ul>
<li id="noVNC_username_block">
<label>Username:</label>
<input id="noVNC_username_input">
</li>
<li id="noVNC_password_block">
<label>Password:</label>
<input id="noVNC_password_input" type="password">
</li>
<li>
<input id="noVNC_credentials_button" type="submit" value="Send Credentials" class="noVNC_submit">
</li>
</ul>
</form></div>
</div>
<!-- Transition Screens -->
<div id="noVNC_transition">
<div id="noVNC_transition_text"></div>
<div>
<input type="button" id="noVNC_cancel_reconnect_button" value="Cancel" class="noVNC_submit">
</div>
<div class="noVNC_spinner"></div>
</div>
<!-- This is where the RFB elements will attach -->
<div id="noVNC_container">
<!-- Note that Google Chrome on Android doesn't respect any of these,
html attributes which attempt to disable text suggestions on the
on-screen keyboard. Let's hope Chrome implements the ime-mode
style for example -->
<textarea id="noVNC_keyboardinput" autocapitalize="off"
autocomplete="off" spellcheck="false" tabindex="-1"></textarea>
</div>
<audio id="noVNC_bell">
<source src="app/sounds/bell.oga" type="audio/ogg">
<source src="app/sounds/bell.mp3" type="audio/mpeg">
</audio>
</body>
</html>