Admin password

.github/workflows/ci.yml

@@ -14,8 +14,8 @@ jobs:
   ci:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest, ARM64]
-        node: [18.17.1] # Can be changed
+        os: [ubuntu-latest, windows-latest, macos-latest, ARM, ARM64]
+        node: [22] # Can be changed
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Code

.github/workflows/json-yaml-validate.yml

@@ -17,11 +17,11 @@ jobs:
   json-yaml-validate:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: json-yaml-validate
         id: json-yaml-validate
-        uses: GrantBirki/json-yaml-validate@v1.3.0
+        uses: GrantBirki/json-yaml-validate@v2.6.1
         with:
           comment: "false" # enable comment mode
           exclude_file: ".github/config/exclude.txt" # gitignore style file for exclusions

backend/agent-manager.ts

@@ -98,6 +98,8 @@ export class AgentManager {
         if (bean) {
             await R.trash(bean);
             let endpoint = bean.endpoint;
+            this.disconnect(endpoint);
+            this.sendAgentList();
             delete this.agentSocketList[endpoint];
         } else {
             throw new Error("Agent not found");

backend/agent-socket-handlers/docker-socket-handler.ts

@@ -17,6 +17,7 @@ export class DockerSocketHandler extends AgentSocketHandler {
                 callbackResult({
                     ok: true,
                     msg: "Deployed",
+                    msgi18n: true,
                 }, callback);
                 stack.joinCombinedTerminal(socket);
             } catch (e) {
@@ -30,7 +31,8 @@ export class DockerSocketHandler extends AgentSocketHandler {
                 await this.saveStack(server, name, composeYAML, composeENV, isAdd);
                 callbackResult({
                     ok: true,
-                    "msg": "Saved"
+                    msg: "Saved",
+                    msgi18n: true,
                 }, callback);
                 server.sendStackList();
             } catch (e) {
@@ -56,7 +58,8 @@ export class DockerSocketHandler extends AgentSocketHandler {
                 server.sendStackList();
                 callbackResult({
                     ok: true,
-                    msg: "Deleted"
+                    msg: "Deleted",
+                    msgi18n: true,
                 }, callback);
 
             } catch (e) {
@@ -94,7 +97,8 @@ export class DockerSocketHandler extends AgentSocketHandler {
                 server.sendStackList();
                 callbackResult({
                     ok: true,
-                    msg: "Updated"
+                    msg: "Updated",
+                    msgi18n: true,
                 }, callback);
             } catch (e) {
                 callbackError(e, callback);
@@ -114,7 +118,8 @@ export class DockerSocketHandler extends AgentSocketHandler {
                 await stack.start(socket);
                 callbackResult({
                     ok: true,
-                    msg: "Started"
+                    msg: "Started",
+                    msgi18n: true,
                 }, callback);
                 server.sendStackList();
 
@@ -138,7 +143,8 @@ export class DockerSocketHandler extends AgentSocketHandler {
                 await stack.stop(socket);
                 callbackResult({
                     ok: true,
-                    msg: "Stopped"
+                    msg: "Stopped",
+                    msgi18n: true,
                 }, callback);
                 server.sendStackList();
             } catch (e) {
@@ -159,7 +165,8 @@ export class DockerSocketHandler extends AgentSocketHandler {
                 await stack.restart(socket);
                 callbackResult({
                     ok: true,
-                    msg: "Restarted"
+                    msg: "Restarted",
+                    msgi18n: true,
                 }, callback);
                 server.sendStackList();
             } catch (e) {
@@ -180,7 +187,8 @@ export class DockerSocketHandler extends AgentSocketHandler {
                 await stack.update(socket);
                 callbackResult({
                     ok: true,
-                    msg: "Updated"
+                    msg: "Updated",
+                    msgi18n: true,
                 }, callback);
                 server.sendStackList();
             } catch (e) {
@@ -201,7 +209,8 @@ export class DockerSocketHandler extends AgentSocketHandler {
                 await stack.down(socket);
                 callbackResult({
                     ok: true,
-                    msg: "Downed"
+                    msg: "Downed",
+                    msgi18n: true,
                 }, callback);
                 server.sendStackList();
             } catch (e) {

common/util-common.ts

@@ -236,42 +236,63 @@ export function copyYAMLComments(doc : Document, src : Document) {
 
 /**
  * Copy yaml comments from srcItems to items
- * Typescript is super annoying here, so I have to use any here
- * TODO: Since comments are belong to the array index, the comments will be lost if the order of the items is changed or removed or added.
+ * Attempts to preserve comments by matching content rather than just array indices
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function copyYAMLCommentsItems(items : any, srcItems : any) {
+function copyYAMLCommentsItems(items: any, srcItems: any) {
     if (!items || !srcItems) {
         return;
     }
 
+    // First pass - try to match items by their content
     for (let i = 0; i < items.length; i++) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const item : any = items[i];
+        const item: any = items[i];
 
+        // Try to find matching source item by content
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const srcItem : any = srcItems[i];
+        const srcIndex = srcItems.findIndex((srcItem: any) =>
+            JSON.stringify(srcItem.value) === JSON.stringify(item.value) &&
+            JSON.stringify(srcItem.key) === JSON.stringify(item.key)
+        );
+
+        if (srcIndex !== -1) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const srcItem: any = srcItems[srcIndex];
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const nextSrcItem: any = srcItems[srcIndex + 1];
+
+            if (item.key && srcItem.key) {
+                item.key.comment = srcItem.key.comment;
+                item.key.commentBefore = srcItem.key.commentBefore;
+            }
 
-        if (!srcItem) {
-            continue;
-        }
+            if (srcItem.comment) {
+                item.comment = srcItem.comment;
+            }
 
-        if (item.key && srcItem.key) {
-            item.key.comment = srcItem.key.comment;
-            item.key.commentBefore = srcItem.key.commentBefore;
-        }
+            // Handle comments between array items
+            if (nextSrcItem && nextSrcItem.commentBefore) {
+                if (items[i + 1]) {
+                    items[i + 1].commentBefore = nextSrcItem.commentBefore;
+                }
+            }
 
-        if (srcItem.comment) {
-            item.comment = srcItem.comment;
-        }
+            // Handle trailing comments after array items
+            if (srcItem.value && srcItem.value.comment) {
+                if (item.value) {
+                    item.value.comment = srcItem.value.comment;
+                }
+            }
 
-        if (item.value && srcItem.value) {
-            if (typeof item.value === "object" && typeof srcItem.value === "object") {
-                item.value.comment = srcItem.value.comment;
-                item.value.commentBefore = srcItem.value.commentBefore;
+            if (item.value && srcItem.value) {
+                if (typeof item.value === "object" && typeof srcItem.value === "object") {
+                    item.value.comment = srcItem.value.comment;
+                    item.value.commentBefore = srcItem.value.commentBefore;
 
-                if (item.value.items && srcItem.value.items) {
-                    copyYAMLCommentsItems(item.value.items, srcItem.value.items);
+                    if (item.value.items && srcItem.value.items) {
+                        copyYAMLCommentsItems(item.value.items, srcItem.value.items);
+                    }
                 }
             }
         }

compose.yaml

@@ -1,4 +1,3 @@
-version: "3.8"
 services:
   dockge:
     image: louislam/dockge:1
@@ -21,3 +20,6 @@ services:
     environment:
       # Tell Dockge where is your stacks directory
       - DOCKGE_STACKS_DIR=/opt/stacks
+    # Usefull for interactive action within the container
+    stdin_open: true # docker run -i
+    tty: true        # docker run -t

docker/Base.Dockerfile

@@ -1,5 +1,4 @@
-# Due to the bug of #145, Node.js's version cannot be changed, unless upstream is fixed.
-FROM node:18.17.1-bookworm-slim
+FROM node:22-bookworm-slim
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN apt update && apt install --yes --no-install-recommends \

docker/Dockerfile

@@ -22,11 +22,18 @@ COPY --from=build /app/node_modules /app/node_modules
 COPY --chown=node:node  . .
 RUN mkdir ./data
 
+
+# It is just for safe, as by default, it is disabled in the latest Node.js now.
+# Read more:
+# - https://github.com/sagemathinc/cocalc/issues/6963
+# - https://github.com/microsoft/node-pty/issues/630#issuecomment-1987212447
+ENV UV_USE_IO_URING=0
+
 VOLUME /app/data
 EXPOSE 5001
 HEALTHCHECK --interval=60s --timeout=30s --start-period=60s --retries=5 CMD extra/healthcheck
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
-CMD ["bash", "-c", "node ./extra/clean-tsx-tmp.js && tsx ./backend/index.ts"]
+CMD ["tsx", "./backend/index.ts"]
 
 ############################################
 # Mark as Nightly

extra/reset-password.ts

@@ -6,6 +6,7 @@ import { DockgeServer } from "../backend/dockge-server";
 import { log } from "../backend/log";
 import { io } from "socket.io-client";
 import { BaseRes } from "../common/util-common";
+import { generatePasswordHash } from "../backend/password-hash";
 
 console.log("== Dockge Reset Password Tool ==");
 
@@ -29,35 +30,67 @@ export const main = async () => {
     }
 
     try {
+        let user ;
         // No need to actually reset the password for testing, just make sure no connection problem. It is ok for now.
+
         if (!process.env.TEST_BACKEND) {
-            const user = await R.findOne("user");
-            if (! user) {
-                throw new Error("user not found, have you installed?");
+            user = await R.findOne("user");
+
+            if (! user ) {
+                if ( !process.env.USER ) {
+                    throw new Error("user not found or provided, have you installed? Try to set USER and PASSWORD variables ...");
+                } else {
+                    console.log("Trying to initialise user : " + process.env.USER);
+                    user = R.dispense("user");
+                    user.username = process.env.USER;
+                    user.password = generatePasswordHash(process.env.PASSWORD);
+                    await R.store(user);
+                    console.log("User/Password set successfully");
+
+                    // Reset all sessions by reset jwt secret
+                    await server.initJWTSecret();
+                    console.log("JWT reset successfully.");
+
+                    // Disconnect all other socket clients of the user
+                    await disconnectAllSocketClients(user.username, user.password);
+                    console.log("You may have to restart");
+                    exit;
+                }
             }
+        }
 
-            console.log("Found user: " + user.username);
+        let password = "";
+        let confirmPassword = " ";
 
-            while (true) {
-                let password = await question("New Password: ");
-                let confirmPassword = await question("Confirm New Password: ");
+        while (true) {
 
-                if (password === confirmPassword) {
-                    await User.resetPassword(user.id, password);
+            if (process.env.PASSWORD) {
+                console.log("Found password : " + process.env.PASSWORD) ;
+                password = process.env.PASSWORD ;
+                confirmPassword = process.env.PASSWORD ;
+            } else {
+                console.log("No found password: " ) ;
+                password = await question("New Password: ");
+                confirmPassword = await question("Confirm New Password: ");
+            }
 
-                    // Reset all sessions by reset jwt secret
-                    await server.initJWTSecret();
+            if (password === confirmPassword) {
+                await User.resetPassword(user.id, password);
+                console.log("Password reset successfully.");
 
-                    console.log("Password reset successfully.");
+                // Reset all sessions by reset jwt secret
+                await server.initJWTSecret();
 
-                    // Disconnect all other socket clients of the user
-                    await disconnectAllSocketClients(user.username, password);
+                console.log("JWT reset successfully.");
 
-                    break;
-                } else {
-                    console.log("Passwords do not match, please try again.");
-                }
+                // Disconnect all other socket clients of the user
+                await disconnectAllSocketClients(user.username, password);
+
+            } else {
+                console.log("Passwords do not match, please try again.");
+                break;
             }
+            break;
         }
     } catch (e) {
         if (e instanceof Error) {
@@ -127,3 +160,4 @@ function disconnectAllSocketClients(username : string, password : string) : Prom
 if (!process.env.TEST_BACKEND) {
     main();
 }
+

extra/templates/mariadb/compose.yaml

@@ -1,4 +1,3 @@
-version: "3.8"
 services:
   mariadb:
     image: mariadb:latest

extra/templates/nginx-proxy-manager/compose.yaml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   nginx-proxy-manager:
     image: 'jc21/nginx-proxy-manager:latest'

extra/templates/uptime-kuma/compose.yaml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   uptime-kuma:
     image: louislam/uptime-kuma:1

frontend/src/components/ArraySelect.vue

@@ -4,7 +4,7 @@
             <ul v-if="isArrayInited" class="list-group">
                 <li v-for="(value, index) in array" :key="index" class="list-group-item">
                     <select v-model="array[index]" class="no-bg domain-input">
-                        <option value="">Select a network...</option>
+                        <option value="">{{ $t(`Select a network...`) }}</option>
                         <option v-for="option in options" :key="option" :value="option">{{ option }}</option>
                     </select>