Global/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-12-05 21:10:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

2.0.X to master (#6226)

Browse Source
This commit is contained in:
Louis Lam
2025-10-25 05:22:13 +08:00
committed by GitHub
parent cd49700d3f
commit 83c3cfc8c0
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docker/builder-go.dockerfile
View File

@@ -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 && \

4
package-lock.json generated
View File

@@ -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",

4
package.json
View File

@@ -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",

9
server/utils/simple-migration-server.js
View File

@@ -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>
`);
});