Merge branch 'master' into 2.0.X

# Conflicts:
#	package-lock.json
This commit is contained in:
Louis Lam
2023-08-30 01:39:16 +08:00
31 changed files with 403 additions and 81 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "uptime-kuma",
"version": "1.23.0",
"version": "1.23.1",
"license": "MIT",
"repository": {
"type": "git",
@@ -39,7 +39,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-test --target pr-test . --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.0 && npm ci --production && npm run download-dist",
"setup": "git checkout 1.23.1 && 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",