From d3c1128f23a17ebef42526d1df39db41b8b55adb Mon Sep 17 00:00:00 2001
From: Mike Mueller <mike.mueller@cstudio.ch>
Date: Sun, 24 May 2026 23:02:34 +0200
Subject: [PATCH] Fix docker image caching. Add version indicator to admin UI

---
 Cargo.lock            | 2 +-
 Cargo.toml            | 2 +-
 admin_ui/index.html   | 1 +
 admin_ui/login.html   | 1 +
 docker-compose.yml    | 2 --
 docker/Dockerfile.deb | 5 +++--
 src/api/admin/mod.rs  | 8 ++++++--
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e16d1ac..10a0ad3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1097,7 +1097,7 @@ dependencies = [
 
 [[package]]
 name = "hbbs"
-version = "1.1.15"
+version = "1.1.16-pro"
 dependencies = [
  "async-speed-limit",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index c647267..9357f43 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hbbs"
-version = "1.1.15"
+version = "1.1.16-pro"
 authors = ["rustdesk <info@rustdesk.com>"]
 edition = "2021"
 build = "build.rs"
diff --git a/admin_ui/index.html b/admin_ui/index.html
index 4ef29f5..e48119c 100644
--- a/admin_ui/index.html
+++ b/admin_ui/index.html
@@ -63,6 +63,7 @@
             <option value="ro"{{LANG_SEL_RO}}>Română</option>
           </select>
         </div>
+        <p class="text-[10px] text-slate-600 text-center pt-2">v{{APP_VERSION}}</p>
       </div>
     </aside>
 
diff --git a/admin_ui/login.html b/admin_ui/login.html
index f347253..18901ec 100644
--- a/admin_ui/login.html
+++ b/admin_ui/login.html
@@ -99,6 +99,7 @@
         <option value="ro"{{LANG_SEL_RO}}>Română</option>
       </select>
     </div>
+    <p class="mt-4 text-center text-[10px] text-slate-600">v{{APP_VERSION}}</p>
   </main>
 
   <script>
diff --git a/docker-compose.yml b/docker-compose.yml
index 5caa503..1199ac4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,8 +10,6 @@
 #   ARTIFACT_URL=https://gitea.cstudio.ch/mike/rustdesk-server/actions/runs/173/artifacts/rustdesk-server-linux-amd64-1e961cdd929f7af97148b76d9de79998a89402a3 \
 #     docker compose build
 #
-# To pick up a newer artifact, bump the cache buster:
-#   CACHE_BUST=$(date +%s) docker compose build
 
 networks:
   rustdesk-net:
diff --git a/docker/Dockerfile.deb b/docker/Dockerfile.deb
index cbea80a..1264d1a 100644
--- a/docker/Dockerfile.deb
+++ b/docker/Dockerfile.deb
@@ -15,7 +15,7 @@ ARG GITEA_REPO=rustdesk-server
 ARG GITEA_BRANCH=pro-features
 # When set, the script downloads this URL directly and skips API discovery.
 ARG ARTIFACT_URL=
-ARG CACHE_BUST=0
+ARG CACHE_BUST=$(date +%s)
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -27,7 +27,8 @@ RUN apt-get update \
 COPY fetch-artifact.sh /usr/local/sbin/fetch-artifact.sh
 RUN chmod +x /usr/local/sbin/fetch-artifact.sh
 
-RUN GITEA_URL="$GITEA_URL" GITEA_OWNER="$GITEA_OWNER" GITEA_REPO="$GITEA_REPO" \
+RUN echo "cache-bust=$CACHE_BUST" \
+ && GITEA_URL="$GITEA_URL" GITEA_OWNER="$GITEA_OWNER" GITEA_REPO="$GITEA_REPO" \
     GITEA_BRANCH="$GITEA_BRANCH" ARTIFACT_URL="$ARTIFACT_URL" \
     /usr/local/sbin/fetch-artifact.sh
 
diff --git a/src/api/admin/mod.rs b/src/api/admin/mod.rs
index 141179e..49bc051 100644
--- a/src/api/admin/mod.rs
+++ b/src/api/admin/mod.rs
@@ -277,6 +277,8 @@ async fn serve_login(headers: HeaderMap) -> Response {
 }
 
 /// Apply i18n placeholders to the embedded `index.html` template.
+/// `APP_VERSION` is intentionally distinct from the `T_*` translation
+/// tokens — it's a server-side constant, not a localizable string.
 fn render_index(lang: Lang) -> String {
     let body = INDEX_HTML
         .replace("{{LANG_CODE}}", lang.code())
@@ -291,7 +293,8 @@ fn render_index(lang: Lang) -> String {
         .replace("{{T_NAV_PROFILE}}", t(lang, "nav.profile"))
         .replace("{{T_NAV_SIGNOUT}}", t(lang, "nav.signout"))
         .replace("{{T_LANGUAGE}}", t(lang, "common.language"))
-        .replace("{{T_LOADING}}", t(lang, "common.loading"));
+        .replace("{{T_LOADING}}", t(lang, "common.loading"))
+        .replace("{{APP_VERSION}}", crate::version::VERSION);
     apply_lang_selected(body, lang)
 }
 
@@ -310,7 +313,8 @@ fn render_login(lang: Lang) -> String {
         .replace(
             "{{T_SIGNIN_WITH_JSON}}",
             &json_string(t(lang, "login.signin_with")),
-        );
+        )
+        .replace("{{APP_VERSION}}", crate::version::VERSION);
     apply_lang_selected(body, lang)
 }