2.0.X to master (#6226)

6 months ago · 83c3cfc8c0
parent cd49700d3f
commit 83c3cfc8c0
4 changed files with 17 additions and 8 deletions
--- 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 && \
--- 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",
--- 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",
--- 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(`
                <html lang="en">
-                <head><meta http-equiv="refresh" content="0; URL=/migrate-status" /></head>
-                <body>Migration server is running.</body>
+                <head><title>Uptime Kuma Migration</title></head>
+                <body>
+                    Migration is in progress, it may take some time. You can check the progress in the console, or
+                    <a href="/migrate-status" target="_blank">click here to check</a>.
+                </body>
                </html>
            `);
        });