diff --git a/.github/workflows/version-bump-main.yml b/.github/workflows/version-bump-main.yml index 2b02a795..3cc45236 100644 --- a/.github/workflows/version-bump-main.yml +++ b/.github/workflows/version-bump-main.yml @@ -48,6 +48,7 @@ jobs: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git add $(node scripts/bump-version.js --list-paths) BRANCH="release/v${NEW_VERSION}" + git push origin --delete "$BRANCH" 2>/dev/null || true git checkout -b "$BRANCH" git commit -m "chore: release version ${NEW_VERSION} [version-bump]" git push -u origin "$BRANCH" diff --git a/CHANGELOG.md b/CHANGELOG.md index 2818557c..2ee7af38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,23 +5,9 @@ --- -## [3.2.20] — 2026-06-12 +## [3.3.0] — 2026-06-12 -### Changed -- _(none yet)_ - ---- - -## [3.2.19] — 2026-06-12 - -### Changed -- _(none yet)_ - ---- - -## [3.2.18] — 2026-06-12 - -Production release **3.3.0** (stable `main`, after merge from `dev`). Ships via **Settings → Updates** on the **Stable** channel, or `betterdesk.sh` / `betterdesk.ps1` option 2 / `docker compose pull` for GHCR. Panel update creates a pre-update backup by default. No database migration or manual SQL step is required. +Stable production release on `main` (merged from `dev`). Ships via **Settings → Updates** on the **Stable** channel, or `betterdesk.sh` / `betterdesk.ps1` option 2 / `docker compose pull` for GHCR. Panel update creates a pre-update backup by default. No database migration or manual SQL step is required. ### Added @@ -52,6 +38,27 @@ Production release **3.3.0** (stable `main`, after merge from `dev`). Ships via --- +## [3.2.20] — 2026-06-12 + +### Changed +- _(none yet)_ + +--- + +## [3.2.19] — 2026-06-12 + +### Changed +- _(none yet)_ + +--- + +## [3.2.18] — 2026-06-12 + +### Changed +- _(none yet)_ + +--- + ## [3.2.17] — 2026-06-12 ### Fixed @@ -608,3 +615,4 @@ Format based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). [3.2.18]: https://github.com/UNITRONIX/BetterDesk/compare/v3.2.17...v3.2.18 [3.2.19]: https://github.com/UNITRONIX/BetterDesk/compare/v3.2.18...v3.2.19 [3.2.20]: https://github.com/UNITRONIX/BetterDesk/compare/v3.2.19...v3.2.20 +[3.3.0]: https://github.com/UNITRONIX/BetterDesk/compare/v3.2.20...v3.3.0 diff --git a/Dockerfile b/Dockerfile index 051f1fd5..f79ad475 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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.2.20" +LABEL version="3.3.0" # Install runtime packages (retry for transient DNS failures) RUN apk add --no-cache \ diff --git a/Dockerfile.console b/Dockerfile.console index 80d44c7e..5bd411a5 100644 --- a/Dockerfile.console +++ b/Dockerfile.console @@ -25,7 +25,7 @@ FROM node:20-alpine LABEL maintainer="UNITRONIX" LABEL description="BetterDesk Console - Web Management Panel" -LABEL version="3.2.20" +LABEL version="3.3.0" WORKDIR /app diff --git a/Dockerfile.server b/Dockerfile.server index fce4714a..2a4525af 100644 --- a/Dockerfile.server +++ b/Dockerfile.server @@ -34,7 +34,7 @@ FROM alpine:3.20 LABEL maintainer="UNITRONIX" LABEL description="BetterDesk Server - RustDesk-compatible signal + relay" -LABEL version="3.2.20" +LABEL version="3.3.0" RUN apk add --no-cache \ ca-certificates \ diff --git a/README.md b/README.md index 8ff28fa1..1e9973ab 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ![License](https://img.shields.io/badge/license-Apache--2.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.2.20-brightgreen.svg) +![Version](https://img.shields.io/badge/version-3.3.0-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) diff --git a/VERSION b/VERSION index 476df44f..15a27998 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.20 +3.3.0 diff --git a/betterdesk-docker.sh b/betterdesk-docker.sh index 2ad3c4f5..654dd83b 100644 --- a/betterdesk-docker.sh +++ b/betterdesk-docker.sh @@ -1,7 +1,7 @@ #!/bin/bash #=============================================================================== # -# BetterDesk Console Manager v3.2.20 +# BetterDesk Console Manager v3.3.0 # All-in-One Interactive Tool for Docker # # Features: @@ -25,7 +25,7 @@ set -e # Version -VERSION="3.2.20" +VERSION="3.3.0" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # Default paths (can be overridden by environment variables) diff --git a/betterdesk-server/VERSION b/betterdesk-server/VERSION index 476df44f..15a27998 100644 --- a/betterdesk-server/VERSION +++ b/betterdesk-server/VERSION @@ -1 +1 @@ -3.2.20 +3.3.0 diff --git a/betterdesk-server/internal/productversion/VERSION b/betterdesk-server/internal/productversion/VERSION index 476df44f..15a27998 100644 --- a/betterdesk-server/internal/productversion/VERSION +++ b/betterdesk-server/internal/productversion/VERSION @@ -1 +1 @@ -3.2.20 +3.3.0 diff --git a/betterdesk.ps1 b/betterdesk.ps1 index 2d591737..3d4f358d 100644 --- a/betterdesk.ps1 +++ b/betterdesk.ps1 @@ -1,7 +1,7 @@ #Requires -RunAsAdministrator <# .SYNOPSIS - BetterDesk Console Manager v3.2.20 - All-in-One Interactive Tool for Windows + BetterDesk Console Manager v3.3.0 - All-in-One Interactive Tool for Windows .DESCRIPTION Features: @@ -102,7 +102,7 @@ param( # Configuration #=============================================================================== -$script:VERSION = "3.2.20" +$script:VERSION = "3.3.0" $script:ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path # Auto mode flags diff --git a/betterdesk.sh b/betterdesk.sh index 91653eb6..46f2b068 100755 --- a/betterdesk.sh +++ b/betterdesk.sh @@ -1,7 +1,7 @@ #!/bin/bash #=============================================================================== # -# BetterDesk Console Manager v3.2.20 +# BetterDesk Console Manager v3.3.0 # All-in-One Interactive Tool for Linux # # Features: @@ -36,7 +36,7 @@ set -e # Version -VERSION="3.2.20" +VERSION="3.3.0" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # Auto mode flag diff --git a/docker-compose.quick.macvlan.yml b/docker-compose.quick.macvlan.yml index 2e2ff7e0..c9f87cd9 100644 --- a/docker-compose.quick.macvlan.yml +++ b/docker-compose.quick.macvlan.yml @@ -34,7 +34,7 @@ services: server: - image: ghcr.io/unitronix/betterdesk-server:${BETTERDESK_IMAGE_TAG:-3.2.20} + image: ghcr.io/unitronix/betterdesk-server:${BETTERDESK_IMAGE_TAG:-3.3.0} container_name: betterdesk-server hostname: betterdesk-server command: ["/usr/local/bin/betterdesk-server", "-mode", "all", "-api-port", "21114", "-key-file", "/opt/rustdesk/id_ed25519"] @@ -70,7 +70,7 @@ services: start_period: 60s console: - image: ghcr.io/unitronix/betterdesk-console:${BETTERDESK_IMAGE_TAG:-3.2.20} + image: ghcr.io/unitronix/betterdesk-console:${BETTERDESK_IMAGE_TAG:-3.3.0} container_name: betterdesk-console # Shares server network stack — panel and RustDesk ports use MACVLAN_IPV4. network_mode: service:server @@ -97,7 +97,7 @@ services: - WS_HBBR_PORT=21117 - DOCKER=true - BETTERDESK_UPDATE_MODE=image - - BETTERDESK_IMAGE_TAG=${BETTERDESK_IMAGE_TAG:-3.2.20} + - BETTERDESK_IMAGE_TAG=${BETTERDESK_IMAGE_TAG:-3.3.0} - TZ=${TZ:-UTC} depends_on: # service_started (not healthy): avoids deadlock with auth.db on first boot (#138, #186). diff --git a/docker-compose.quick.yml b/docker-compose.quick.yml index af3a46f7..018a938d 100644 --- a/docker-compose.quick.yml +++ b/docker-compose.quick.yml @@ -34,7 +34,7 @@ services: # BetterDesk Server (Go) — handles signal, relay, and API server: - image: ghcr.io/unitronix/betterdesk-server:${BETTERDESK_IMAGE_TAG:-3.2.20} + image: ghcr.io/unitronix/betterdesk-server:${BETTERDESK_IMAGE_TAG:-3.3.0} container_name: betterdesk-server hostname: betterdesk-server command: ["/usr/local/bin/betterdesk-server", "-mode", "all", "-api-port", "21114", "-key-file", "/opt/rustdesk/id_ed25519"] @@ -86,7 +86,7 @@ services: # BetterDesk Console — Web Management Interface console: - image: ghcr.io/unitronix/betterdesk-console:${BETTERDESK_IMAGE_TAG:-3.2.20} + image: ghcr.io/unitronix/betterdesk-console:${BETTERDESK_IMAGE_TAG:-3.3.0} container_name: betterdesk-console hostname: betterdesk-console ports: @@ -113,7 +113,7 @@ services: - WS_HBBR_PORT=21117 - DOCKER=true - BETTERDESK_UPDATE_MODE=image - - BETTERDESK_IMAGE_TAG=${BETTERDESK_IMAGE_TAG:-3.2.20} + - BETTERDESK_IMAGE_TAG=${BETTERDESK_IMAGE_TAG:-3.3.0} networks: - betterdesk-net depends_on: diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index adad1c18..eb8b26f6 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -8,7 +8,7 @@ set -e echo "========================================" echo " BetterDesk Console - Container Startup" -echo " Version: ${BETTERDESK_IMAGE_VERSION:-3.2.20} (Node.js)" +echo " Version: ${BETTERDESK_IMAGE_VERSION:-3.3.0} (Node.js)" echo "========================================" # Log configuration diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index fbdd46e8..adc0c66f 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -5,7 +5,7 @@ set -e echo "========================================" echo " BetterDesk All-in-One Container" -echo " Version: ${BETTERDESK_IMAGE_VERSION:-3.2.20}" +echo " Version: ${BETTERDESK_IMAGE_VERSION:-3.3.0}" echo "========================================" echo "" echo "Components:" diff --git a/web-nodejs/package.json b/web-nodejs/package.json index bc62588e..fc8f69ed 100644 --- a/web-nodejs/package.json +++ b/web-nodejs/package.json @@ -1,6 +1,6 @@ { "name": "betterdesk-console", - "version": "3.2.20", + "version": "3.3.0", "description": "BetterDesk Console - Professional Web Management Panel for BetterDesk Server", "main": "server.js", "scripts": {