From dcd3358b15965f923343756a8453cb1c7aa675ed Mon Sep 17 00:00:00 2001
From: zihluwang <real@zihluwang.me>
Date: Mon, 3 Aug 2026 10:11:50 +0800
Subject: [PATCH 1/3] feat: add vocechat server

---
 compose/vocechat/docker-compose.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 compose/vocechat/docker-compose.yaml

diff --git a/compose/vocechat/docker-compose.yaml b/compose/vocechat/docker-compose.yaml
new file mode 100644
index 0000000..3084bd9
--- /dev/null
+++ b/compose/vocechat/docker-compose.yaml
@@ -0,0 +1,9 @@
+services:
+  vocechat:
+    image: privoce/vocechat-server:latest
+    container_name: vocechat
+    ports:
+      - "3000:3000"
+    volumes:
+      - /var/lib/vocechat/data:/home/vocechat-server/data
+    restart: always
\ No newline at end of file

From bf8dd29c47630ed85db2ef0524ce59bec49fd5c0 Mon Sep 17 00:00:00 2001
From: gitea-actions-bot <actions@onixbyte.dev>
Date: Thu, 13 Aug 2026 02:00:33 +0000
Subject: [PATCH 2/3] chore: synchronise get-docker.sh with upstream

---
 get-docker.sh | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/get-docker.sh b/get-docker.sh
index 11ebc7c..84733e4 100755
--- a/get-docker.sh
+++ b/get-docker.sh
@@ -94,12 +94,19 @@ set -e
 #
 # Note: Starting the service requires appropriate privileges to manage system services.
 #
+# Installing docker-sbx
+#
+# Set the SBX environment variable to "1" to also install the docker-sbx
+# package alongside the regular Docker Engine packages:
+#
+#   $ curl -fsSL https://get.docker.com | sudo SBX=1 sh
+#
 # ==============================================================================
 
 
 # Git commit from https://github.com/docker/docker-install when
 # the script was uploaded (Should only be modified by upload job):
-SCRIPT_COMMIT_SHA="5ce20f2eef3615d08fea941eda5a109e949e8ebf"
+SCRIPT_COMMIT_SHA="a23123f03978989e95d257beb9de0c5ad9da6e70"
 
 # strip "v" prefix if present
 VERSION="${VERSION#v}"
@@ -131,6 +138,7 @@ mirror=''
 DRY_RUN=${DRY_RUN:-}
 REPO_ONLY=${REPO_ONLY:-0}
 NO_AUTOSTART=${NO_AUTOSTART:-0}
+SBX=${SBX:-0}
 while [ $# -gt 0 ]; do
 	case "$1" in
 		--channel)
@@ -549,7 +557,7 @@ do_install() {
 		ubuntu.focal|ubuntu.bionic|ubuntu.xenial|ubuntu.trusty)
 			deprecation_notice "$lsb_dist" "$dist_version"
 			;;
-		ubuntu.oracular|ubuntu.mantic|ubuntu.lunar|ubuntu.kinetic|ubuntu.impish|ubuntu.hirsute|ubuntu.groovy|ubuntu.eoan|ubuntu.disco|ubuntu.cosmic)
+		ubuntu.questing|ubuntu.oracular|ubuntu.mantic|ubuntu.lunar|ubuntu.kinetic|ubuntu.impish|ubuntu.hirsute|ubuntu.groovy|ubuntu.eoan|ubuntu.disco|ubuntu.cosmic)
 			deprecation_notice "$lsb_dist" "$dist_version"
 			;;
 		fedora.*)
@@ -631,6 +639,9 @@ do_install() {
 				if version_gte "28.2"; then
 					pkgs="$pkgs docker-model-plugin"
 				fi
+				if [ "$SBX" = "1" ]; then
+					pkgs="$pkgs docker-sbx"
+				fi
 				if ! is_dry_run; then
 					set -x
 				fi
@@ -743,6 +754,9 @@ do_install() {
 				if version_gte "23.0"; then
 						pkgs="$pkgs docker-buildx-plugin docker-model-plugin"
 				fi
+				if [ "$SBX" = "1" ]; then
+					pkgs="$pkgs docker-sbx"
+				fi
 				if ! is_dry_run; then
 					set -x
 				fi

From 5743bf47419cb16779704b5df180ac6368b6950a Mon Sep 17 00:00:00 2001
From: gitea-actions-bot <actions@onixbyte.dev>
Date: Thu, 27 Aug 2026 02:00:07 +0000
Subject: [PATCH 3/3] chore: synchronise get-docker.sh with upstream

---
 get-docker.sh | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/get-docker.sh b/get-docker.sh
index 84733e4..f7ca8a9 100755
--- a/get-docker.sh
+++ b/get-docker.sh
@@ -106,7 +106,7 @@ set -e
 
 # Git commit from https://github.com/docker/docker-install when
 # the script was uploaded (Should only be modified by upload job):
-SCRIPT_COMMIT_SHA="a23123f03978989e95d257beb9de0c5ad9da6e70"
+SCRIPT_COMMIT_SHA="42dcae692436f34526524ed46d3b32885c9355f5"
 
 # strip "v" prefix if present
 VERSION="${VERSION#v}"
@@ -139,6 +139,17 @@ DRY_RUN=${DRY_RUN:-}
 REPO_ONLY=${REPO_ONLY:-0}
 NO_AUTOSTART=${NO_AUTOSTART:-0}
 SBX=${SBX:-0}
+
+# Provide a helpful usage statement when --help or any invalid argument is passed
+# to the script. Exit code deliberately not included here as error depends on
+# argument provided.
+usage() {
+	echo
+	echo "USAGE: "
+	echo "    ${0} [--channel <stable|test>] [--mirror <Aliyun|AzureChinaCloud>] [--version <VERSION>] [--setup-repo] [--no-autostart] [--dry-run] [--help]"
+	echo
+}
+
 while [ $# -gt 0 ]; do
 	case "$1" in
 		--channel)
@@ -163,8 +174,14 @@ while [ $# -gt 0 ]; do
 		--no-autostart)
 			NO_AUTOSTART=1
 			;;
+		--help)
+			usage
+			exit 0
+			;;
 		--*)
 			echo "Illegal option $1"
+			usage
+			exit 1
 			;;
 	esac
 	shift $(( $# > 0 ? 1 : 0 ))