Merge 92170540c6 into a65a9f5549

.dockerignore

@@ -9,9 +9,9 @@ tmp
 
 # Docker extra
 docker
-frontend
 .editorconfig
 .eslintrc.cjs
 .git
 .gitignore
-README.md
+.github
+*.md

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
+ * Attempts to preserve comments by matching content rather than just array indices
- * 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.
  */
 // 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 (!srcItem) {
+        if (srcIndex !== -1) {
-            continue;
+            // 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) {
+            if (item.key && srcItem.key) {
-            item.key.comment = srcItem.key.comment;
+                item.key.comment = srcItem.key.comment;
-            item.key.commentBefore = srcItem.key.commentBefore;
+                item.key.commentBefore = srcItem.key.commentBefore;
-        }
+            }
 
-        if (srcItem.comment) {
+            if (srcItem.comment) {
-            item.comment = srcItem.comment;
+                item.comment = srcItem.comment;
-        }
+            }
 
-        if (item.value && srcItem.value) {
+            // Handle comments between array items
-            if (typeof item.value === "object" && typeof srcItem.value === "object") {
+            if (nextSrcItem && nextSrcItem.commentBefore) {
-                item.value.comment = srcItem.value.comment;
+                if (items[i + 1]) {
-                item.value.commentBefore = srcItem.value.commentBefore;
+                    items[i + 1].commentBefore = nextSrcItem.commentBefore;
+                }
+            }
 
-                if (item.value.items && srcItem.value.items) {
+            // Handle trailing comments after array items
-                    copyYAMLCommentsItems(item.value.items, srcItem.value.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.items && srcItem.value.items) {
+                        copyYAMLCommentsItems(item.value.items, srcItem.value.items);
+                    }
                 }
             }
         }

compose.yaml

@@ -1,6 +1,9 @@
 services:
   dockge:
     image: louislam/dockge:1
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
     restart: unless-stopped
     ports:
       # Host Port : Container Port

docker/Dockerfile

@@ -4,9 +4,19 @@
 FROM louislam/dockge:build-healthcheck AS build_healthcheck
 
 ############################################
-# Build
+# Build frontend
 ############################################
-FROM louislam/dockge:base AS build
+FROM louislam/dockge:base AS build_frontend
+WORKDIR /app
+COPY --chown=node:node . .
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
+    pnpm install && \
+    pnpm run build:frontend
+
+############################################
+# Install node modules
+############################################
+FROM louislam/dockge:base AS build_nodemodules
 WORKDIR /app
 COPY --chown=node:node  ./package.json ./package.json
 COPY --chown=node:node  ./pnpm-lock.yaml ./pnpm-lock.yaml
@@ -18,8 +28,9 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-l
 FROM louislam/dockge:base AS release
 WORKDIR /app
 COPY --chown=node:node --from=build_healthcheck /app/extra/healthcheck /app/extra/healthcheck
-COPY --from=build /app/node_modules /app/node_modules
+COPY --from=build_frontend /app/frontend-dist /app/frontend-dist
-COPY --chown=node:node  . .
+COPY --from=build_nodemodules /app/node_modules /app/node_modules
+COPY --chown=node:node . .
 RUN mkdir ./data
 
 

frontend/src/components/Terminal.vue

@@ -247,7 +247,6 @@ export default {
 <style scoped lang="scss">
 .main-terminal {
     height: 100%;
-    overflow-x: scroll;
 }
 </style>