gsadmin/BetterDesk
1
0
Fork 0
mirror of https://github.com/UNITRONIX/BetterDesk.git synced 2026-09-10 01:27:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/UNITRONIX/BetterDesk into dev

Browse Source
This commit is contained in:
UNITRONIX
2026-07-09 19:42:59 +02:00
parent fa053a32a7 cbbfce6bb3
commit 72ff8d4d61
17 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+8
View File
@@ -8,6 +8,13 @@
---
## [3.3.127] — 2026-07-09
### Changed
- _(none yet)_
---
## [3.3.126] — 2026-07-07
### Changed
@@ -1782,3 +1789,4 @@ Format based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
[3.3.124]: https://github.com/UNITRONIX/BetterDesk/compare/v3.3.123...v3.3.124
[3.3.125]: https://github.com/UNITRONIX/BetterDesk/compare/v3.3.124...v3.3.125
[3.3.126]: https://github.com/UNITRONIX/BetterDesk/compare/v3.3.125...v3.3.126
[3.3.127]: https://github.com/UNITRONIX/BetterDesk/compare/v3.3.126...v3.3.127
Dockerfile
+1 -1
View File
@@ -55,7 +55,7 @@ FROM node:20-alpine
LABEL maintainer="UNITRONIX"
LABEL description="BetterDesk — All-in-One (Go Server + Node.js Console)"
LABEL version="3.3.126"
LABEL version="3.3.127"
# Install runtime packages (retry for transient DNS failures)
RUN apk add --no-cache \
Dockerfile.console
+1 -1
View File
@@ -25,7 +25,7 @@ FROM node:20-alpine
LABEL maintainer="UNITRONIX"
LABEL description="BetterDesk Console - Web Management Panel"
LABEL version="3.3.126"
LABEL version="3.3.127"
WORKDIR /app
Dockerfile.server
+1 -1
View File
@@ -34,7 +34,7 @@ FROM alpine:3.20
LABEL maintainer="UNITRONIX"
LABEL description="BetterDesk Server - RustDesk-compatible signal + relay"
LABEL version="3.3.126"
LABEL version="3.3.127"
RUN apk add --no-cache \
ca-certificates \
README.md
+1 -1
View File
@@ -9,7 +9,7 @@
![License](https://img.shields.io/badge/license-AGPL--3.0-blue.svg)
![Go](https://img.shields.io/badge/Go-1.21+-00ADD8.svg)
![Node.js](https://img.shields.io/badge/Node.js-18+-339933.svg)
![Version](https://img.shields.io/badge/version-3.3.126-brightgreen.svg)
![Version](https://img.shields.io/badge/version-3.3.127-brightgreen.svg)
![Security](https://img.shields.io/badge/Security-TLS%20%2B%20NaCl%20%2B%20TOTP%20%2B%20E2EE-green.svg)
![Database](https://img.shields.io/badge/DB-SQLite%20%2B%20PostgreSQL-blue.svg)
![CDAP](https://img.shields.io/badge/CDAP-v1.0-orange.svg)
VERSION
+1 -1
View File
@@ -1 +1 @@
3.3.126
3.3.127
betterdesk-docker.sh
+2 -2
View File
@@ -1,7 +1,7 @@
#!/bin/bash
#===============================================================================
#
# BetterDesk Console Manager v3.3.126
# BetterDesk Console Manager v3.3.127
# All-in-One Interactive Tool for Docker
#
# Features:
@@ -28,7 +28,7 @@
set -e
# Version
VERSION="3.3.126"
VERSION="3.3.127"
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# Default paths (can be overridden by environment variables)
betterdesk-server/VERSION
+1 -1
View File
@@ -1 +1 @@
3.3.126
3.3.127
betterdesk-server/internal/productversion/VERSION
+1 -1
View File
@@ -1 +1 @@
3.3.126
3.3.127
betterdesk.ps1
+2 -2
View File
@@ -1,7 +1,7 @@
#Requires -RunAsAdministrator
<#
.SYNOPSIS
BetterDesk Console Manager v3.3.126 - All-in-One Interactive Tool for Windows
BetterDesk Console Manager v3.3.127 - All-in-One Interactive Tool for Windows
.DESCRIPTION
Features:
@@ -102,7 +102,7 @@ param(
# Configuration
#===============================================================================
$script:VERSION = "3.3.126"
$script:VERSION = "3.3.127"
$script:ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
# Auto mode flags
docker-compose.quick.macvlan.yml
+3 -3
View File
@@ -34,7 +34,7 @@
services:
server:
image: ghcr.io/unitronix/betterdesk-server:${BETTERDESK_IMAGE_TAG:-3.3.126}
image: ghcr.io/unitronix/betterdesk-server:${BETTERDESK_IMAGE_TAG:-3.3.127}
container_name: betterdesk-server
hostname: betterdesk-server
command: ["/usr/local/bin/betterdesk-server", "-mode", "all", "-api-port", "21114", "-key-file", "/opt/rustdesk/id_ed25519"]
@@ -73,7 +73,7 @@ services:
start_period: 60s
console:
image: ghcr.io/unitronix/betterdesk-console:${BETTERDESK_IMAGE_TAG:-3.3.126}
image: ghcr.io/unitronix/betterdesk-console:${BETTERDESK_IMAGE_TAG:-3.3.127}
container_name: betterdesk-console
# Shares server network stack — panel and RustDesk ports use MACVLAN_IPV4.
network_mode: service:server
@@ -104,7 +104,7 @@ services:
- DOCKER=true
- BETTERDESK_UPDATE_MODE=image
- BETTERDESK_DOCKER_LAYOUT=split
- BETTERDESK_IMAGE_TAG=${BETTERDESK_IMAGE_TAG:-3.3.126}
- BETTERDESK_IMAGE_TAG=${BETTERDESK_IMAGE_TAG:-3.3.127}
- TZ=${TZ:-UTC}
depends_on:
# service_started (not healthy): avoids deadlock with auth.db on first boot (#138, #186).
docker-compose.quick.single.macvlan.yml
+2 -2
View File
@@ -32,7 +32,7 @@
services:
betterdesk:
image: ghcr.io/unitronix/betterdesk:${BETTERDESK_IMAGE_TAG:-3.3.126}
image: ghcr.io/unitronix/betterdesk:${BETTERDESK_IMAGE_TAG:-3.3.127}
container_name: betterdesk
hostname: betterdesk
volumes:
@@ -56,7 +56,7 @@ services:
- DOCKER=true
- BETTERDESK_UPDATE_MODE=image
- BETTERDESK_DOCKER_LAYOUT=single
- BETTERDESK_IMAGE_TAG=${BETTERDESK_IMAGE_TAG:-3.3.126}
- BETTERDESK_IMAGE_TAG=${BETTERDESK_IMAGE_TAG:-3.3.127}
- AUTH_DB_PATH=/app/data/auth.db
- INIT_ADMIN_USER=${ADMIN_USERNAME:-admin}
- INIT_ADMIN_PASS=${ADMIN_PASSWORD:-}
docker-compose.quick.single.yml
+2 -2
View File
@@ -35,7 +35,7 @@
services:
betterdesk:
image: ghcr.io/unitronix/betterdesk:${BETTERDESK_IMAGE_TAG:-3.3.126}
image: ghcr.io/unitronix/betterdesk:${BETTERDESK_IMAGE_TAG:-3.3.127}
container_name: betterdesk
hostname: betterdesk
ports:
@@ -69,7 +69,7 @@ services:
- DOCKER=true
- BETTERDESK_UPDATE_MODE=image
- BETTERDESK_DOCKER_LAYOUT=single
- BETTERDESK_IMAGE_TAG=${BETTERDESK_IMAGE_TAG:-3.3.126}
- BETTERDESK_IMAGE_TAG=${BETTERDESK_IMAGE_TAG:-3.3.127}
- DB_TYPE=${DB_TYPE:-sqlite}
- DATABASE_URL=${DATABASE_URL:-}
- DB_URL=${DATABASE_URL:-}
docker-compose.quick.yml
+3 -3
View File
@@ -34,7 +34,7 @@
services:
# BetterDesk Server (Go) — handles signal, relay, and API
server:
image: ghcr.io/unitronix/betterdesk-server:${BETTERDESK_IMAGE_TAG:-3.3.126}
image: ghcr.io/unitronix/betterdesk-server:${BETTERDESK_IMAGE_TAG:-3.3.127}
container_name: betterdesk-server
hostname: betterdesk-server
command: ["/usr/local/bin/betterdesk-server", "-mode", "all", "-api-port", "21114", "-key-file", "/opt/rustdesk/id_ed25519"]
@@ -89,7 +89,7 @@ services:
# BetterDesk Console — Web Management Interface
console:
image: ghcr.io/unitronix/betterdesk-console:${BETTERDESK_IMAGE_TAG:-3.3.126}
image: ghcr.io/unitronix/betterdesk-console:${BETTERDESK_IMAGE_TAG:-3.3.127}
container_name: betterdesk-console
hostname: betterdesk-console
ports:
@@ -120,7 +120,7 @@ services:
- DOCKER=true
- BETTERDESK_UPDATE_MODE=image
- BETTERDESK_DOCKER_LAYOUT=split
- BETTERDESK_IMAGE_TAG=${BETTERDESK_IMAGE_TAG:-3.3.126}
- BETTERDESK_IMAGE_TAG=${BETTERDESK_IMAGE_TAG:-3.3.127}
networks:
- betterdesk-net
depends_on:
docker-entrypoint.sh
+1 -1
View File
@@ -8,7 +8,7 @@ set -e
echo "========================================"
echo " BetterDesk Console - Container Startup"
echo " Version: ${BETTERDESK_IMAGE_VERSION:-3.3.126} (Node.js)"
echo " Version: ${BETTERDESK_IMAGE_VERSION:-3.3.127} (Node.js)"
echo "========================================"
# Public Docker examples use ADMIN_*; the Node.js console seeds from DEFAULT_ADMIN_*.
docker/entrypoint.sh
+1 -1
View File
@@ -5,7 +5,7 @@ set -e
echo "========================================"
echo " BetterDesk All-in-One Container"
echo " Version: ${BETTERDESK_IMAGE_VERSION:-3.3.126}"
echo " Version: ${BETTERDESK_IMAGE_VERSION:-3.3.127}"
echo "========================================"
echo ""
echo "Components:"
web-nodejs/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "betterdesk-console",
"version": "3.3.126",
"version": "3.3.127",
"description": "BetterDesk Console - Professional Web Management Panel for BetterDesk Server",
"main": "server.js",
"scripts": {