From 83c3cfc8c0f6bf6b04316cbe3fa1896268255694 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sat, 25 Oct 2025 05:22:13 +0800 Subject: [PATCH] 2.0.X to master (#6226) --- docker/builder-go.dockerfile | 8 +++++++- package-lock.json | 4 ++-- package.json | 4 ++-- server/utils/simple-migration-server.js | 9 ++++++--- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/docker/builder-go.dockerfile b/docker/builder-go.dockerfile index 7c25641b4..3a9d78248 100644 --- a/docker/builder-go.dockerfile +++ b/docker/builder-go.dockerfile @@ -2,11 +2,17 @@ # Build in Golang # Run npm run build-healthcheck-armv7 in the host first, another it will be super slow where it is building the armv7 healthcheck ############################################ -FROM golang:1-bookworm +FROM golang:1-buster WORKDIR /app ARG TARGETPLATFORM COPY ./extra/ ./extra/ +## Switch to archive.debian.org +RUN sed -i '/^deb/s/^/#/' /etc/apt/sources.list \ + && echo "deb http://archive.debian.org/debian buster main contrib non-free" | tee -a /etc/apt/sources.list \ + && echo "deb http://archive.debian.org/debian-security buster/updates main contrib non-free" | tee -a /etc/apt/sources.list \ + && echo "deb http://archive.debian.org/debian buster-updates main contrib non-free" | tee -a /etc/apt/sources.list + # Compile healthcheck.go RUN apt update && \ apt --yes --no-install-recommends install curl && \ diff --git a/package-lock.json b/package-lock.json index dee7bc228..b063d8877 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "uptime-kuma", - "version": "2.0.0-beta.4", + "version": "2.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "uptime-kuma", - "version": "2.0.0-beta.4", + "version": "2.0.1", "license": "MIT", "dependencies": { "@grpc/grpc-js": "~1.8.22", diff --git a/package.json b/package.json index 541b71e11..576068492 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uptime-kuma", - "version": "2.0.1", + "version": "2.0.2", "license": "MIT", "repository": { "type": "git", @@ -41,7 +41,7 @@ "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test2 --target pr-test2 . --push", "upload-artifacts": "node extra/release/upload-artifacts.mjs", "upload-artifacts-beta": "node extra/release/upload-artifacts-beta.mjs", - "setup": "git checkout 2.0.1 && npm ci --omit dev && npm run download-dist", + "setup": "git checkout 2.0.2 && npm ci --omit dev && npm run download-dist", "download-dist": "node extra/download-dist.js", "mark-as-nightly": "node extra/mark-as-nightly.js", "reset-password": "node extra/reset-password.js", diff --git a/server/utils/simple-migration-server.js b/server/utils/simple-migration-server.js index 895298560..1bc3b9475 100644 --- a/server/utils/simple-migration-server.js +++ b/server/utils/simple-migration-server.js @@ -39,11 +39,14 @@ class SimpleMigrationServer { this.app.get("/", (req, res) => { res.set("Content-Type", "text/html"); - // HTML meta tag redirect to /status + // Don't use meta tag redirect, it may cause issues in Chrome (#6223) res.end(` - - Migration server is running. + Uptime Kuma Migration + + Migration is in progress, it may take some time. You can check the progress in the console, or + click here to check. + `); });