Fix docker image caching. Add version indicator to admin UI
build / build-linux-amd64 (push) Successful in 1m57s

This commit is contained in:
2026-05-24 23:02:34 +02:00
parent b044ab4de9
commit d3c1128f23
7 changed files with 13 additions and 8 deletions
Generated
+1 -1
View File
@@ -1097,7 +1097,7 @@ dependencies = [
[[package]] [[package]]
name = "hbbs" name = "hbbs"
version = "1.1.15" version = "1.1.16-pro"
dependencies = [ dependencies = [
"async-speed-limit", "async-speed-limit",
"async-trait", "async-trait",
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "hbbs" name = "hbbs"
version = "1.1.15" version = "1.1.16-pro"
authors = ["rustdesk <info@rustdesk.com>"] authors = ["rustdesk <info@rustdesk.com>"]
edition = "2021" edition = "2021"
build = "build.rs" build = "build.rs"
+1
View File
@@ -63,6 +63,7 @@
<option value="ro"{{LANG_SEL_RO}}>Română</option> <option value="ro"{{LANG_SEL_RO}}>Română</option>
</select> </select>
</div> </div>
<p class="text-[10px] text-slate-600 text-center pt-2">v{{APP_VERSION}}</p>
</div> </div>
</aside> </aside>
+1
View File
@@ -99,6 +99,7 @@
<option value="ro"{{LANG_SEL_RO}}>Română</option> <option value="ro"{{LANG_SEL_RO}}>Română</option>
</select> </select>
</div> </div>
<p class="mt-4 text-center text-[10px] text-slate-600">v{{APP_VERSION}}</p>
</main> </main>
<script> <script>
-2
View File
@@ -10,8 +10,6 @@
# ARTIFACT_URL=https://gitea.cstudio.ch/mike/rustdesk-server/actions/runs/173/artifacts/rustdesk-server-linux-amd64-1e961cdd929f7af97148b76d9de79998a89402a3 \ # ARTIFACT_URL=https://gitea.cstudio.ch/mike/rustdesk-server/actions/runs/173/artifacts/rustdesk-server-linux-amd64-1e961cdd929f7af97148b76d9de79998a89402a3 \
# docker compose build # docker compose build
# #
# To pick up a newer artifact, bump the cache buster:
# CACHE_BUST=$(date +%s) docker compose build
networks: networks:
rustdesk-net: rustdesk-net:
+3 -2
View File
@@ -15,7 +15,7 @@ ARG GITEA_REPO=rustdesk-server
ARG GITEA_BRANCH=pro-features ARG GITEA_BRANCH=pro-features
# When set, the script downloads this URL directly and skips API discovery. # When set, the script downloads this URL directly and skips API discovery.
ARG ARTIFACT_URL= ARG ARTIFACT_URL=
ARG CACHE_BUST=0 ARG CACHE_BUST=$(date +%s)
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
@@ -27,7 +27,8 @@ RUN apt-get update \
COPY fetch-artifact.sh /usr/local/sbin/fetch-artifact.sh COPY fetch-artifact.sh /usr/local/sbin/fetch-artifact.sh
RUN chmod +x /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" \ GITEA_BRANCH="$GITEA_BRANCH" ARTIFACT_URL="$ARTIFACT_URL" \
/usr/local/sbin/fetch-artifact.sh /usr/local/sbin/fetch-artifact.sh
+6 -2
View File
@@ -277,6 +277,8 @@ async fn serve_login(headers: HeaderMap) -> Response {
} }
/// Apply i18n placeholders to the embedded `index.html` template. /// 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 { fn render_index(lang: Lang) -> String {
let body = INDEX_HTML let body = INDEX_HTML
.replace("{{LANG_CODE}}", lang.code()) .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_PROFILE}}", t(lang, "nav.profile"))
.replace("{{T_NAV_SIGNOUT}}", t(lang, "nav.signout")) .replace("{{T_NAV_SIGNOUT}}", t(lang, "nav.signout"))
.replace("{{T_LANGUAGE}}", t(lang, "common.language")) .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) apply_lang_selected(body, lang)
} }
@@ -310,7 +313,8 @@ fn render_login(lang: Lang) -> String {
.replace( .replace(
"{{T_SIGNIN_WITH_JSON}}", "{{T_SIGNIN_WITH_JSON}}",
&json_string(t(lang, "login.signin_with")), &json_string(t(lang, "login.signin_with")),
); )
.replace("{{APP_VERSION}}", crate::version::VERSION);
apply_lang_selected(body, lang) apply_lang_selected(body, lang)
} }