From 90c4c58609b5ab1ff0bf07a144e160eb35de43a6 Mon Sep 17 00:00:00 2001 From: Fennel Kora Date: Wed, 7 Feb 2024 00:52:24 -0500 Subject: [PATCH 01/13] changed image naming for docker builds to fencore/uptime-kuma. removed multiplatform builds in favor of single platform linux/amd64 builds --- package.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 71b0d05c..9eeca0e1 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "license": "MIT", "repository": { "type": "git", - "url": "https://github.com/louislam/uptime-kuma.git" + "url": "https://github.com/fencore/uptime-kuma.git" }, "engines": { "node": "14 || 16 || 18 || >= 20.4.0" @@ -37,18 +37,18 @@ "tsc": "tsc", "vite-preview-dist": "vite preview --host --config ./config/vite.config.js", "build-docker": "npm run build && npm run build-docker-full && npm run build-docker-slim", - "build-docker-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base2 --target base2 . --push", - "build-docker-base-slim": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base2-slim --target base2-slim . --push", - "build-docker-builder-go": "docker buildx build -f docker/builder-go.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:builder-go . --push", - "build-docker-slim": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:2-slim -t louislam/uptime-kuma:$VERSION-slim --target release --build-arg BASE_IMAGE=louislam/uptime-kuma:base2-slim . --push", - "build-docker-full": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:2 -t louislam/uptime-kuma:$VERSION --target release . --push", - "build-docker-nightly": "node ./extra/test-docker.js && npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly2 --target nightly . --push", - "build-docker-slim-rootless": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:2-slim-rootless -t louislam/uptime-kuma:$VERSION-slim-rootless --target rootless --build-arg BASE_IMAGE=louislam/uptime-kuma:base2-slim . --push", - "build-docker-full-rootless": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:2-rootless -t louislam/uptime-kuma:$VERSION-rootless --target rootless . --push", - "build-docker-nightly-rootless": "node ./extra/test-docker.js && npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly2-rootless --target nightly-rootless . --push", - "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", + "build-docker-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64 -t fencore/uptime-kuma:base2 --target base2 . --push", + "build-docker-base-slim": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64 -t fencore/uptime-kuma:base2-slim --target base2-slim . --push", + "build-docker-builder-go": "docker buildx build -f docker/builder-go.dockerfile --platform linux/amd64 -t fencore/uptime-kuma:builder-go . --push", + "build-docker-slim": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-slim -t fencore/uptime-kuma:$VERSION-slim --target release --build-arg BASE_IMAGE=fencore/uptime-kuma:base2-slim . --push", + "build-docker-full": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2 -t fencore/uptime-kuma:$VERSION --target release . --push", + "build-docker-nightly": "node ./extra/test-docker.js && npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t fencore/uptime-kuma:nightly2 --target nightly . --push", + "build-docker-slim-rootless": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-slim-rootless -t fencore/uptime-kuma:$VERSION-slim-rootless --target rootless --build-arg BASE_IMAGE=fencore/uptime-kuma:base2-slim . --push", + "build-docker-full-rootless": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-rootless -t fencore/uptime-kuma:$VERSION-rootless --target rootless . --push", + "build-docker-nightly-rootless": "node ./extra/test-docker.js && npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t fencore/uptime-kuma:nightly2-rootless --target nightly-rootless . --push", + "build-docker-nightly-local": "npm run build && docker build -f docker/dockerfile -t fencore/uptime-kuma:nightly2 --target nightly .", + "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t fencore/uptime-kuma:pr-test2 --target pr-test2 . --push", + "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain", "setup": "git checkout 1.23.11 && npm ci --production && npm run download-dist", "download-dist": "node extra/download-dist.js", "mark-as-nightly": "node extra/mark-as-nightly.js", @@ -61,22 +61,22 @@ "simple-mariadb": "docker run --rm -p 3306:3306 -e MYSQL_ROOT_PASSWORD=mariadb# mariadb", "update-language-files": "cd extra/update-language-files && node index.js && cross-env-shell eslint ../../src/languages/$npm_config_language.js --fix", "release-final": "node ./extra/test-docker.js && node extra/update-version.js && npm run build-docker && node ./extra/press-any-key.js && npm run upload-artifacts && node ./extra/update-wiki-version.js", - "release-beta": "node ./extra/test-docker.js && node extra/beta/update-version.js && npm run build && node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:beta . --target release --push && node ./extra/press-any-key.js && npm run upload-artifacts", + "release-beta": "node ./extra/test-docker.js && node extra/beta/update-version.js && npm run build && node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t fencore/uptime-kuma:$VERSION -t fencore/uptime-kuma:beta . --target release --push && node ./extra/press-any-key.js && npm run upload-artifacts", "git-remove-tag": "git tag -d", "build-dist-and-restart": "npm run build && npm run start-server-dev", "start-pr-test": "node extra/checkout-pr.js && npm install && npm run dev", "build-healthcheck-armv7": "cross-env GOOS=linux GOARCH=arm GOARM=7 go build -x -o ./extra/healthcheck-armv7 ./extra/healthcheck.go", "deploy-demo-server": "node extra/deploy-demo-server.js", "sort-contributors": "node extra/sort-contributors.js", - "quick-run-nightly": "docker run --rm --env NODE_ENV=development -p 3001:3001 louislam/uptime-kuma:nightly2", + "quick-run-nightly": "docker run --rm --env NODE_ENV=development -p 3001:3001 fencore/uptime-kuma:nightly2", "start-dev-container": "cd docker && docker-compose -f docker-compose-dev.yml up --force-recreate", "rebase-pr-to-1.23.X": "node extra/rebase-pr.js 1.23.X", "start-server-node14-win": "private\\node14\\node.exe server/server.js" }, "dependencies": { "@grpc/grpc-js": "~1.7.3", - "@louislam/ping": "~0.4.4-mod.1", - "@louislam/sqlite3": "15.1.6", + "@fencore/ping": "~0.4.4-mod.1", + "@fencore/sqlite3": "15.1.6", "args-parser": "~1.3.0", "axios": "~0.27.0", "axios-ntlm": "1.3.0", -- 2.45.2 From 30fb7874dca1bb5c929593099eca0091c170534d Mon Sep 17 00:00:00 2001 From: Fennel Kora Date: Wed, 7 Feb 2024 00:53:30 -0500 Subject: [PATCH 02/13] added shadow-box class to group titles --- src/components/PublicGroupList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/PublicGroupList.vue b/src/components/PublicGroupList.vue index d1c1f4c5..73d952d1 100644 --- a/src/components/PublicGroupList.vue +++ b/src/components/PublicGroupList.vue @@ -12,7 +12,7 @@

- +

-- 2.45.2 From e4a590e793d3c47d9f64d5cc1a50691c9f646a36 Mon Sep 17 00:00:00 2001 From: Fennel Kora Date: Wed, 7 Feb 2024 00:54:52 -0500 Subject: [PATCH 03/13] removed additional multiplatform builds from build-docker scripts --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 9eeca0e1..eeb3bf33 100644 --- a/package.json +++ b/package.json @@ -42,12 +42,12 @@ "build-docker-builder-go": "docker buildx build -f docker/builder-go.dockerfile --platform linux/amd64 -t fencore/uptime-kuma:builder-go . --push", "build-docker-slim": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-slim -t fencore/uptime-kuma:$VERSION-slim --target release --build-arg BASE_IMAGE=fencore/uptime-kuma:base2-slim . --push", "build-docker-full": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2 -t fencore/uptime-kuma:$VERSION --target release . --push", - "build-docker-nightly": "node ./extra/test-docker.js && npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t fencore/uptime-kuma:nightly2 --target nightly . --push", + "build-docker-nightly": "node ./extra/test-docker.js && npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:nightly2 --target nightly . --push", "build-docker-slim-rootless": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-slim-rootless -t fencore/uptime-kuma:$VERSION-slim-rootless --target rootless --build-arg BASE_IMAGE=fencore/uptime-kuma:base2-slim . --push", "build-docker-full-rootless": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-rootless -t fencore/uptime-kuma:$VERSION-rootless --target rootless . --push", - "build-docker-nightly-rootless": "node ./extra/test-docker.js && npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t fencore/uptime-kuma:nightly2-rootless --target nightly-rootless . --push", + "build-docker-nightly-rootless": "node ./extra/test-docker.js && npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:nightly2-rootless --target nightly-rootless . --push", "build-docker-nightly-local": "npm run build && docker build -f docker/dockerfile -t fencore/uptime-kuma:nightly2 --target nightly .", - "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t fencore/uptime-kuma:pr-test2 --target pr-test2 . --push", + "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:pr-test2 --target pr-test2 . --push", "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain", "setup": "git checkout 1.23.11 && npm ci --production && npm run download-dist", "download-dist": "node extra/download-dist.js", -- 2.45.2 From c364dfdb398685427176457f0a9f0ec1785eb76e Mon Sep 17 00:00:00 2001 From: Fennel Kora Date: Wed, 7 Feb 2024 00:57:21 -0500 Subject: [PATCH 04/13] updated readme.md --- README.md | 192 +----------------------------------------------------- 1 file changed, 1 insertion(+), 191 deletions(-) diff --git a/README.md b/README.md index ebeca525..1a0acb95 100644 --- a/README.md +++ b/README.md @@ -1,191 +1 @@ -
- -
- -# Uptime Kuma - -Uptime Kuma is an easy-to-use self-hosted monitoring tool. - - -[![GitHub Sponsors](https://img.shields.io/github/sponsors/louislam?label=GitHub%20Sponsors)](https://github.com/sponsors/louislam) -Translation status - - - - -## 🥔 Live Demo - -Try it! - -Demo Server (Location: Frankfurt - Germany): https://demo.kuma.pet/start-demo - -It is a temporary live demo, all data will be deleted after 10 minutes. Sponsored by [Uptime Kuma Sponsors](https://github.com/louislam/uptime-kuma#%EF%B8%8F-sponsors). - -## ⭐ Features - -- Monitoring uptime for HTTP(s) / TCP / HTTP(s) Keyword / HTTP(s) Json Query / Ping / DNS Record / Push / Steam Game Server / Docker Containers -- Fancy, Reactive, Fast UI/UX -- Notifications via Telegram, Discord, Gotify, Slack, Pushover, Email (SMTP), and [90+ notification services, click here for the full list](https://github.com/louislam/uptime-kuma/tree/master/src/components/notifications) -- 20-second intervals -- [Multi Languages](https://github.com/louislam/uptime-kuma/tree/master/src/lang) -- Multiple status pages -- Map status pages to specific domains -- Ping chart -- Certificate info -- Proxy support -- 2FA support - -## 🔧 How to Install - -### 🐳 Docker - -```bash -docker run -d --restart=always -p 3001:3001 -v uptime-kuma:/app/data --name uptime-kuma louislam/uptime-kuma:1 -``` - -Uptime Kuma is now running on http://localhost:3001 - -> [!WARNING] -> File Systems like **NFS** (Network File System) are **NOT** supported. Please map to a local directory or volume. - -### 💪🏻 Non-Docker - -Requirements: - -- Platform - - ✅ Major Linux distros such as Debian, Ubuntu, CentOS, Fedora and ArchLinux etc. - - ✅ Windows 10 (x64), Windows Server 2012 R2 (x64) or higher - - ❌ Replit / Heroku -- [Node.js](https://nodejs.org/en/download/) 14 / 16 / 18 / 20.4 -- [npm](https://docs.npmjs.com/cli/) 9 -- [Git](https://git-scm.com/downloads) -- [pm2](https://pm2.keymetrics.io/) - For running Uptime Kuma in the background - -```bash -# Update your npm -npm install npm@9 -g - -git clone https://github.com/louislam/uptime-kuma.git -cd uptime-kuma -npm run setup - -# Option 1. Try it -node server/server.js - -# (Recommended) Option 2. Run in the background using PM2 -# Install PM2 if you don't have it: -npm install pm2 -g && pm2 install pm2-logrotate - -# Start Server -pm2 start server/server.js --name uptime-kuma -``` - -Uptime Kuma is now running on http://localhost:3001 - -More useful PM2 Commands - -```bash -# If you want to see the current console output -pm2 monit - -# If you want to add it to startup -pm2 save && pm2 startup -``` - -### Advanced Installation - -If you need more options or need to browse via a reverse proxy, please read: - -https://github.com/louislam/uptime-kuma/wiki/%F0%9F%94%A7-How-to-Install - -## 🆙 How to Update - -Please read: - -https://github.com/louislam/uptime-kuma/wiki/%F0%9F%86%99-How-to-Update - -## 🆕 What's Next? - -I will assign requests/issues to the next milestone. - -https://github.com/louislam/uptime-kuma/milestones - -## ❤️ Sponsors - -Thank you so much! (GitHub Sponsors will be updated manually. OpenCollective sponsors will be updated automatically, the list will be cached by GitHub though. It may need some time to be updated) - - - -## 🖼 More Screenshots - -Light Mode: - - - -Status Page: - - - -Settings Page: - - - -Telegram Notification Sample: - - - -## Motivation - -- I was looking for a self-hosted monitoring tool like "Uptime Robot", but it is hard to find a suitable one. One of the closest ones is statping. Unfortunately, it is not stable and no longer maintained. -- Wanted to build a fancy UI. -- Learn Vue 3 and vite.js. -- Show the power of Bootstrap 5. -- Try to use WebSocket with SPA instead of a REST API. -- Deploy my first Docker image to Docker Hub. - -If you love this project, please consider giving it a ⭐. - -## 🗣️ Discussion / Ask for Help - -⚠️ For any general or technical questions, please don't send me an email, as I am unable to provide support in that manner. I will not respond if you ask questions there. - -I recommend using Google, GitHub Issues, or Uptime Kuma's subreddit for finding answers to your question. If you cannot find the information you need, feel free to ask: - -- [GitHub Issues](https://github.com/louislam/uptime-kuma/issues) -- [Subreddit (r/UptimeKuma)](https://www.reddit.com/r/UptimeKuma/) - -My Reddit account: [u/louislamlam](https://reddit.com/u/louislamlam) -You can mention me if you ask a question on the subreddit. - -## Contributions - -### Create Pull Requests - -We DO NOT accept all types of pull requests and do not want to waste your time. Please be sure that you have read and follow pull request rules: -[CONTRIBUTING.md#can-i-create-a-pull-request-for-uptime-kuma](https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md#can-i-create-a-pull-request-for-uptime-kuma) - -### Test Pull Requests - -There are a lot of pull requests right now, but I don't have time to test them all. - -If you want to help, you can check this: -https://github.com/louislam/uptime-kuma/wiki/Test-Pull-Requests - -### Test Beta Version - -Check out the latest beta release here: https://github.com/louislam/uptime-kuma/releases - -### Bug Reports / Feature Requests - -If you want to report a bug or request a new feature, feel free to open a [new issue](https://github.com/louislam/uptime-kuma/issues). - -### Translations - -If you want to translate Uptime Kuma into your language, please visit [Weblate Readme](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md). - -### Spelling & Grammar - -Feel free to correct the grammar in the documentation or code. -My mother language is not English and my grammar is not that great. - - +A fork of Uptime Kuma that makes minor styling changes to status pages in order to improve accessibility. \ No newline at end of file -- 2.45.2 From f8640019b352f2a622cd64816967bd32f9c1ebda Mon Sep 17 00:00:00 2001 From: Fennel Kora Date: Wed, 7 Feb 2024 01:01:44 -0500 Subject: [PATCH 05/13] commented out line 113 executing upload-github-release-asset.sh --- docker/dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/dockerfile b/docker/dockerfile index 572c732e..4f1f63ca 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -110,5 +110,5 @@ RUN chmod +x /app/extra/upload-github-release-asset.sh # Dist only RUN cd /app && tar -zcvf $DIST dist -RUN /app/extra/upload-github-release-asset.sh github_api_token=$GITHUB_TOKEN owner=louislam repo=uptime-kuma tag=$VERSION filename=/app/$DIST +#RUN /app/extra/upload-github-release-asset.sh github_api_token=$GITHUB_TOKEN owner=louislam repo=uptime-kuma tag=$VERSION filename=/app/$DIST -- 2.45.2 From 2cf46dc6b5f10ea63a401eda08962936f82e3e43 Mon Sep 17 00:00:00 2001 From: Fennel Kora Date: Wed, 7 Feb 2024 01:05:45 -0500 Subject: [PATCH 06/13] corrected overwritten dependencies --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index eeb3bf33..b3ef7748 100644 --- a/package.json +++ b/package.json @@ -75,8 +75,8 @@ }, "dependencies": { "@grpc/grpc-js": "~1.7.3", - "@fencore/ping": "~0.4.4-mod.1", - "@fencore/sqlite3": "15.1.6", + "@louislam/ping": "~0.4.4-mod.1", + "@louislam/sqlite3": "15.1.6", "args-parser": "~1.3.0", "axios": "~0.27.0", "axios-ntlm": "1.3.0", -- 2.45.2 From 2563f5d3ba61643144a0db82157789c618606649 Mon Sep 17 00:00:00 2001 From: Fennel Kora Date: Wed, 7 Feb 2024 01:28:18 -0500 Subject: [PATCH 07/13] updated dependencies --- package-lock.json | 71 +++++++++++++++++++++++------------------------ package.json | 6 ++-- 2 files changed, 37 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index cdf262f3..00d0e36b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,8 +13,8 @@ "@louislam/ping": "~0.4.4-mod.1", "@louislam/sqlite3": "15.1.6", "args-parser": "~1.3.0", - "axios": "~0.27.0", - "axios-ntlm": "1.3.0", + "axios": "^1.6.7", + "axios-ntlm": "^1.4.2", "badge-maker": "~3.3.1", "bcryptjs": "~2.4.3", "chardet": "~1.4.0", @@ -55,7 +55,7 @@ "nanoid": "~3.3.4", "node-cloudflared-tunnel": "~1.0.9", "node-radius-client": "~1.0.0", - "nodemailer": "~6.6.5", + "nodemailer": "^6.9.9", "nostr-tools": "^1.13.1", "notp": "~2.0.3", "openid-client": "^5.4.2", @@ -4365,29 +4365,24 @@ "integrity": "sha512-aDczADvlvTGajTDjcjpJMqRkOF6Qdz3YbPZm/PyW6tKPkx2hlYBzxMhEywM/tU72HrVZjgl5VCdRuMlA7pZ8Gw==" }, "node_modules/axios": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", + "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", "dependencies": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" + "follow-redirects": "^1.15.4", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "node_modules/axios-ntlm": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/axios-ntlm/-/axios-ntlm-1.3.0.tgz", - "integrity": "sha512-NPNsIMO1SGX5scs3ZWJqsV7iRLvET+DlRl94aZ7Sx14zA8RTQh9EDxsJmxB9cKjardKfp2Vge444uYYLfvWC0Q==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/axios-ntlm/-/axios-ntlm-1.4.2.tgz", + "integrity": "sha512-8mS/uhmSWiRBiFKQvysPbX1eDBp6e+eXskmasuAXRHrn1Zjgji3O/oGXzXLw7tOhyD9nho1vGjZ2OYOD3cCvHg==", "dependencies": { - "axios": "^0.21.3", - "dev-null": "^0.1.1" - } - }, - "node_modules/axios-ntlm/node_modules/axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "dependencies": { - "follow-redirects": "^1.14.0" + "axios": "^1.6.1", + "des.js": "^1.1.0", + "dev-null": "^0.1.1", + "js-md4": "^0.3.2" } }, "node_modules/babel-plugin-add-module-exports": { @@ -5697,6 +5692,15 @@ "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==", "dev": true }, + "node_modules/des.js": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz", + "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==", + "dependencies": { + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" + } + }, "node_modules/destroy": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", @@ -8799,6 +8803,11 @@ "node": ">=4" } }, + "node_modules/minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" + }, "node_modules/minimatch": { "version": "9.0.3", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", @@ -9355,9 +9364,9 @@ } }, "node_modules/nodemailer": { - "version": "6.6.5", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.6.5.tgz", - "integrity": "sha512-C/v856DBijUzHcHIgGpQoTrfsH3suKIRAGliIzCstatM2cAa+MYX3LuyCrABiO/cdJTxgBBHXxV1ztiqUwst5A==", + "version": "6.9.9", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.9.tgz", + "integrity": "sha512-dexTll8zqQoVJEZPwQAKzxxtFn0qTnjdQTchoU6Re9BUUGBJiOy3YMn/0ShTW6J5M0dfQ1NeDeRTTl4oIWgQMA==", "engines": { "node": ">=6.0.0" } @@ -10263,8 +10272,7 @@ "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, "node_modules/psl": { "version": "1.9.0", @@ -12949,17 +12957,6 @@ "node": ">=12.0.0" } }, - "node_modules/wait-on/node_modules/axios": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", - "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", - "dev": true, - "dependencies": { - "follow-redirects": "^1.15.4", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "node_modules/wait-on/node_modules/joi": { "version": "17.12.1", "resolved": "https://registry.npmjs.org/joi/-/joi-17.12.1.tgz", diff --git a/package.json b/package.json index b3ef7748..7faf8bf7 100644 --- a/package.json +++ b/package.json @@ -78,8 +78,8 @@ "@louislam/ping": "~0.4.4-mod.1", "@louislam/sqlite3": "15.1.6", "args-parser": "~1.3.0", - "axios": "~0.27.0", - "axios-ntlm": "1.3.0", + "axios": "^1.6.7", + "axios-ntlm": "^1.4.2", "badge-maker": "~3.3.1", "bcryptjs": "~2.4.3", "chardet": "~1.4.0", @@ -120,7 +120,7 @@ "nanoid": "~3.3.4", "node-cloudflared-tunnel": "~1.0.9", "node-radius-client": "~1.0.0", - "nodemailer": "~6.6.5", + "nodemailer": "^6.9.9", "nostr-tools": "^1.13.1", "notp": "~2.0.3", "openid-client": "^5.4.2", -- 2.45.2 From bb0f8889ad1c78d91ebc0831981600f2b1a3a1a2 Mon Sep 17 00:00:00 2001 From: Fennel Kora Date: Wed, 7 Feb 2024 01:30:38 -0500 Subject: [PATCH 08/13] removed push flag from docker-build-slim and docker-build-full --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7faf8bf7..52d51752 100644 --- a/package.json +++ b/package.json @@ -40,8 +40,8 @@ "build-docker-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64 -t fencore/uptime-kuma:base2 --target base2 . --push", "build-docker-base-slim": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64 -t fencore/uptime-kuma:base2-slim --target base2-slim . --push", "build-docker-builder-go": "docker buildx build -f docker/builder-go.dockerfile --platform linux/amd64 -t fencore/uptime-kuma:builder-go . --push", - "build-docker-slim": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-slim -t fencore/uptime-kuma:$VERSION-slim --target release --build-arg BASE_IMAGE=fencore/uptime-kuma:base2-slim . --push", - "build-docker-full": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2 -t fencore/uptime-kuma:$VERSION --target release . --push", + "build-docker-slim": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-slim -t fencore/uptime-kuma:$VERSION-slim --target release --build-arg BASE_IMAGE=fencore/uptime-kuma:base2-slim .", + "build-docker-full": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2 -t fencore/uptime-kuma:$VERSION --target release .", "build-docker-nightly": "node ./extra/test-docker.js && npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:nightly2 --target nightly . --push", "build-docker-slim-rootless": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-slim-rootless -t fencore/uptime-kuma:$VERSION-slim-rootless --target rootless --build-arg BASE_IMAGE=fencore/uptime-kuma:base2-slim . --push", "build-docker-full-rootless": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-rootless -t fencore/uptime-kuma:$VERSION-rootless --target rootless . --push", -- 2.45.2 From 8cc72ab6d2e05927c5b249605bf4322e96207a0f Mon Sep 17 00:00:00 2001 From: Fennel Kora Date: Wed, 7 Feb 2024 01:55:31 -0500 Subject: [PATCH 09/13] updated docker image --- compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yaml b/compose.yaml index 004705a6..c3f93ed1 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,6 @@ services: uptime-kuma: - image: louislam/uptime-kuma:1 + image: fencore/uptime-kuma:2 volumes: - ./data:/app/data ports: -- 2.45.2 From 884495b63cfcb27ce4834b0624a9699a73aa881d Mon Sep 17 00:00:00 2001 From: Fennel Kora Date: Wed, 7 Feb 2024 01:56:03 -0500 Subject: [PATCH 10/13] removed push flag from remainder of build-docker scripts --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 52d51752..a3abcdbe 100644 --- a/package.json +++ b/package.json @@ -37,11 +37,11 @@ "tsc": "tsc", "vite-preview-dist": "vite preview --host --config ./config/vite.config.js", "build-docker": "npm run build && npm run build-docker-full && npm run build-docker-slim", - "build-docker-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64 -t fencore/uptime-kuma:base2 --target base2 . --push", - "build-docker-base-slim": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64 -t fencore/uptime-kuma:base2-slim --target base2-slim . --push", - "build-docker-builder-go": "docker buildx build -f docker/builder-go.dockerfile --platform linux/amd64 -t fencore/uptime-kuma:builder-go . --push", - "build-docker-slim": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-slim -t fencore/uptime-kuma:$VERSION-slim --target release --build-arg BASE_IMAGE=fencore/uptime-kuma:base2-slim .", - "build-docker-full": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2 -t fencore/uptime-kuma:$VERSION --target release .", + "build-docker-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64 -t fencore/uptime-kuma:base2 --target base2 .", + "build-docker-base-slim": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64 -t fencore/uptime-kuma:base2-slim --target base2-slim .", + "build-docker-builder-go": "docker buildx build -f docker/builder-go.dockerfile --platform linux/amd64 -t fencore/uptime-kuma:builder-go .", + "build-docker-slim": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-slim --target release --build-arg BASE_IMAGE=fencore/uptime-kuma:base2-slim .", + "build-docker-full": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2 --target release .", "build-docker-nightly": "node ./extra/test-docker.js && npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:nightly2 --target nightly . --push", "build-docker-slim-rootless": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-slim-rootless -t fencore/uptime-kuma:$VERSION-slim-rootless --target rootless --build-arg BASE_IMAGE=fencore/uptime-kuma:base2-slim . --push", "build-docker-full-rootless": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-rootless -t fencore/uptime-kuma:$VERSION-rootless --target rootless . --push", -- 2.45.2 From 960ef85ff5cd5fa7bec4ddff55d49b3403761f36 Mon Sep 17 00:00:00 2001 From: Fennel Kora Date: Wed, 7 Feb 2024 01:56:15 -0500 Subject: [PATCH 11/13] updates for project scope --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a0acb95..279910db 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -A fork of Uptime Kuma that makes minor styling changes to status pages in order to improve accessibility. \ No newline at end of file +A fork of Uptime Kuma that makes minor styling changes to status pages in order to improve accessibility when using background images or light mode. \ No newline at end of file -- 2.45.2 From 98dc56ba64bde53cd05bc8900bf21ced429ebe51 Mon Sep 17 00:00:00 2001 From: Fennel Kora Date: Wed, 7 Feb 2024 10:48:40 -0500 Subject: [PATCH 12/13] restored base image for build-docker-slim script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a3abcdbe..b1663ef4 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "build-docker-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64 -t fencore/uptime-kuma:base2 --target base2 .", "build-docker-base-slim": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64 -t fencore/uptime-kuma:base2-slim --target base2-slim .", "build-docker-builder-go": "docker buildx build -f docker/builder-go.dockerfile --platform linux/amd64 -t fencore/uptime-kuma:builder-go .", - "build-docker-slim": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-slim --target release --build-arg BASE_IMAGE=fencore/uptime-kuma:base2-slim .", + "build-docker-slim": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-slim --target release --build-arg BASE_IMAGE=louislam/uptime-kuma:base2-slim .", "build-docker-full": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2 --target release .", "build-docker-nightly": "node ./extra/test-docker.js && npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:nightly2 --target nightly . --push", "build-docker-slim-rootless": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64 -t fencore/uptime-kuma:2-slim-rootless -t fencore/uptime-kuma:$VERSION-slim-rootless --target rootless --build-arg BASE_IMAGE=fencore/uptime-kuma:base2-slim . --push", -- 2.45.2 From 704b264f44e2efb6a53ad11236cdc25198f2eb1f Mon Sep 17 00:00:00 2001 From: Fennel Kora Date: Wed, 7 Feb 2024 10:49:04 -0500 Subject: [PATCH 13/13] added compose.yaml to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b11a7935..26c586c8 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ extra/exe-builder/obj .vs .vscode +compose.yaml -- 2.45.2