7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-09-30 11:39:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X

Browse Source 
# Conflicts:
#	server/database.js
This commit is contained in:
Louis Lam
2023-11-18 01:37:30 +08:00
parent 188fdcb6ad 6d4a45f18c
commit 2aa15ea635
7 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "uptime-kuma",
"version": "1.23.4",
"version": "1.23.5",
"license": "MIT",
"repository": {
"type": "git",
@@ -41,7 +41,7 @@
"build-docker-nightly-local": "npm run build && docker build -f docker/dockerfile -t louislam/uptime-kuma:nightly2 --target nightly .",
"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": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
"setup": "git checkout 1.23.4 && npm ci --production && npm run download-dist",
"setup": "git checkout 1.23.5 && npm ci --production && 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",