update to 1.6.3

(cherry picked from commit b0e9c5bcb4)

dockerfile

@@ -1,26 +1,33 @@
-FROM node:14-bullseye-slim AS release
+# DON'T UPDATE TO node:14-bullseye-slim, see #372.
+# If the image changed, the second stage image should be changed too
+FROM node:14-buster-slim AS build
 WORKDIR /app
 
-# install dependencies
-RUN apt update && apt --yes install python3 python3-pip python3-dev git g++ make iputils-ping
-RUN ln -s /usr/bin/python3 /usr/bin/python
-
 # split the sqlite install here, so that it can caches the arm prebuilt
-RUN npm install mapbox/node-sqlite3#593c9d
-
-# Install apprise
-RUN apt --yes install python3-cryptography python3-six python3-yaml python3-click python3-markdown python3-requests python3-requests-oauthlib
-RUN pip3 --no-cache-dir install apprise && \
-    rm -rf /root/.cache
-
-# additional package should be added here, since we don't want to re-compile the arm prebuilt again
-
-# add sqlite3 cli for debugging in the future
-RUN apt --yes install sqlite3
-
+# do not modify it, since we don't want to re-compile the arm prebuilt again
+RUN apt update && \
+            apt --yes install python3 python3-pip python3-dev git g++ make && \
+            ln -s /usr/bin/python3 /usr/bin/python && \
+            npm install mapbox/node-sqlite3#593c9d  --build-from-source
 
 COPY . .
-RUN npm install --legacy-peer-deps && npm run build && npm prune
+RUN npm install --legacy-peer-deps && npm run build && npm prune --production
+
+FROM node:14-buster-slim AS release
+WORKDIR /app
+
+# Install Apprise,
+# add sqlite3 cli for debugging in the future
+# iputils-ping for ping
+RUN apt update && \
+            apt --yes install python3 python3-pip python3-cryptography python3-six python3-yaml python3-click python3-markdown python3-requests python3-requests-oauthlib \
+                sqlite3 \
+                iputils-ping && \
+            pip3 --no-cache-dir install apprise && \
+            rm -rf /var/lib/apt/lists/*
+
+# Copy app files from build layer
+COPY  --from=build /app /app
 
 EXPOSE 3001
 VOLUME ["/app/data"]

dockerfile-alpine

@@ -1,5 +1,5 @@
 # DON'T UPDATE TO alpine3.13, 1.14, see #41.
-FROM node:14-alpine3.12 AS release
+FROM node:14-alpine3.12 AS build
 WORKDIR /app
 
 # split the sqlite install here, so that it can caches the arm prebuilt
@@ -9,13 +9,20 @@ RUN apk add --no-cache --virtual .build-deps make g++ python3 python3-dev git &&
             apk del .build-deps && \
             rm -f /usr/bin/python
 
+COPY . .
+RUN npm install --legacy-peer-deps && npm run build && npm prune --production
+
+
+FROM node:14-alpine3.12 AS release
+WORKDIR /app
+
 # Install apprise
-RUN apk add --no-cache python3 py3-cryptography py3-pip py3-six py3-yaml py3-click py3-markdown py3-requests py3-requests-oauthlib
-RUN pip3 --no-cache-dir install apprise && \
+RUN apk add --no-cache python3 py3-cryptography py3-pip py3-six py3-yaml py3-click py3-markdown py3-requests py3-requests-oauthlib && \
+            pip3 --no-cache-dir install apprise && \
             rm -rf /root/.cache
 
-COPY . .
-RUN npm install --legacy-peer-deps && npm run build && npm prune
+# Copy app files from build layer
+COPY  --from=build /app /app
 
 EXPOSE 3001
 VOLUME ["/app/data"]

extra/healthcheck.js

@@ -1,3 +1,6 @@
+/*
+ * This script should be run after a period of time (180s), because the server may need some time to prepare.
+ */
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
 
 let client;

extra/reset-password.js

@@ -6,12 +6,14 @@ const Database = require("../server/database");
 const { R } = require("redbean-node");
 const readline = require("readline");
 const { initJWTSecret } = require("../server/util-server");
+const args = require("args-parser")(process.argv);
 const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout
 });
 
 (async () => {
+    Database.init(args);
     await Database.connect();
 
     try {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "uptime-kuma",
-    "version": "1.6.0",
+    "version": "1.6.3",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -18,12 +18,12 @@
         "start-server": "node server/server.js",
         "build": "vite build",
         "vite-preview-dist": "vite preview --host",
-        "build-docker": "npm run build-docker-alpine && npm run build-docker-debian",
-        "build-docker-alpine": "docker buildx build -f dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:1.6.0-alpine --target release . --push",
-        "build-docker-debian": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.6.0 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.6.0-debian --target release . --push",
+        "build-docker": "npm run build-docker-debian && npm run build-docker-alpine",
+        "build-docker-alpine": "docker buildx build -f dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:1.6.3-alpine --target release . --push",
+        "build-docker-debian": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.6.3 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.6.3-debian --target release . --push",
         "build-docker-nightly": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push",
         "build-docker-nightly-amd64": "docker buildx build --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
-        "setup": "git checkout 1.6.0 && npm install --legacy-peer-deps && node node_modules/esbuild/install.js && npm run build && npm prune",
+        "setup": "git checkout 1.6.3 && npm install --legacy-peer-deps && node node_modules/esbuild/install.js && npm run build && npm prune",
         "update-version": "node extra/update-version.js",
         "mark-as-nightly": "node extra/mark-as-nightly.js",
         "reset-password": "node extra/reset-password.js",

server/database.js

@@ -40,6 +40,16 @@ class Database {
 
     static noReject = true;
 
+    static init(args) {
+        // Data Directory (must be end with "/")
+        Database.dataDir = process.env.DATA_DIR || args["data-dir"] || "./data/";
+        Database.path = Database.dataDir + "kuma.db";
+        if (! fs.existsSync(Database.dataDir)) {
+            fs.mkdirSync(Database.dataDir, { recursive: true });
+        }
+        console.log(`Data Dir: ${Database.dataDir}`);
+    }
+
     static async connect() {
         const acquireConnectionTimeout = 120 * 1000;
 

server/server.js

@@ -60,14 +60,6 @@ if (demoMode) {
     console.log("==== Demo Mode ====");
 }
 
-// Data Directory (must be end with "/")
-Database.dataDir = process.env.DATA_DIR || args["data-dir"] || "./data/";
-Database.path = Database.dataDir + "kuma.db";
-if (! fs.existsSync(Database.dataDir)) {
-    fs.mkdirSync(Database.dataDir, { recursive: true });
-}
-console.log(`Data Dir: ${Database.dataDir}`);
-
 console.log("Creating express and socket.io instance")
 const app = express();
 
@@ -123,6 +115,7 @@ let needSetup = false;
 let indexHTML = fs.readFileSync("./dist/index.html").toString();
 
 (async () => {
+    Database.init(args);
     await initDatabase();
 
     console.log("Adding route")