WIP

README.md

@@ -148,13 +148,13 @@ Yes, you can. However, you need to move your compose file into the stacks direct
 3. In Dockge, click the " Scan Stacks Folder" button in the top-right corner's dropdown menu
 4. Now you should see your stack in the list
 
-#### Is Dockge a Portainer replacement?
+#### Is Dockge a Portainer replcement?
 
 Yes or no. Portainer provides a lot of Docker features. While Dockge is currently only focusing on docker-compose with a better user interface and better user experience.
 
 If you want to manage your container with docker-compose only, the answer may be yes.
 
-If you still need to manage something like docker networks, single containers, the answer may be no.
+If you still need to manage something like docker networks, signle containers, the answer may be no.
 
 #### Can I install both Dockge and Portainer?
 

backend/check-version.ts

@@ -3,55 +3,69 @@ import compareVersions from "compare-versions";
 import packageJSON from "../package.json";
 import { Settings } from "./settings";
 
+export const obj = {
+    version: packageJSON.version,
+    latestVersion: null,
+};
+export default obj;
+
 // How much time in ms to wait between update checks
 const UPDATE_CHECKER_INTERVAL_MS = 1000 * 60 * 60 * 48;
 const CHECK_URL = "https://dockge.kuma.pet/version";
 
-class CheckVersion {
-    version = packageJSON.version;
-    latestVersion? : string;
-    interval? : NodeJS.Timeout;
+let interval : NodeJS.Timeout;
 
-    async startInterval() {
-        const check = async () => {
-            if (await Settings.get("checkUpdate") === false) {
-                return;
+export function startInterval() {
+    const check = async () => {
+        if (await Settings.get("checkUpdate") === false) {
+            return;
+        }
+
+        log.debug("update-checker", "Retrieving latest versions");
+
+        try {
+            const res = await fetch(CHECK_URL);
+            const data = await res.json();
+
+            // For debug
+            if (process.env.TEST_CHECK_VERSION === "1") {
+                data.slow = "1000.0.0";
             }
 
-            log.debug("update-checker", "Retrieving latest versions");
+            const checkBeta = await Settings.get("checkBeta");
 
-            try {
-                const res = await fetch(CHECK_URL);
-                const data = await res.json();
-
-                // For debug
-                if (process.env.TEST_CHECK_VERSION === "1") {
-                    data.slow = "1000.0.0";
+            if (checkBeta && data.beta) {
+                if (compareVersions.compare(data.beta, data.slow, ">")) {
+                    obj.latestVersion = data.beta;
+                    return;
                 }
-
-                const checkBeta = await Settings.get("checkBeta");
-
-                if (checkBeta && data.beta) {
-                    if (compareVersions.compare(data.beta, data.slow, ">")) {
-                        this.latestVersion = data.beta;
-                        return;
-                    }
-                }
-
-                if (data.slow) {
-                    this.latestVersion = data.slow;
-                }
-
-            } catch (_) {
-                log.info("update-checker", "Failed to check for new versions");
             }
 
-        };
+            if (data.slow) {
+                obj.latestVersion = data.slow;
+            }
 
-        await check();
-        this.interval = setInterval(check, UPDATE_CHECKER_INTERVAL_MS);
-    }
+        } catch (_) {
+            log.info("update-checker", "Failed to check for new versions");
+        }
+
+    };
+
+    check();
+    interval = setInterval(check, UPDATE_CHECKER_INTERVAL_MS);
 }
 
-const checkVersion = new CheckVersion();
-export default checkVersion;
+/**
+ * Enable the check update feature
+ * @param value Should the check update feature be enabled?
+ * @returns
+ */
+export async function enableCheckUpdate(value : boolean) {
+    await Settings.set("checkUpdate", value);
+
+    clearInterval(interval);
+
+    if (value) {
+        startInterval();
+    }
+}

backend/docker.ts

@@ -0,0 +1,3 @@
+export class Docker {
+
+}

backend/dockge-server.ts

@@ -308,7 +308,6 @@ export class DockgeServer {
                 this.sendStackList(true);
             });
 
-            checkVersion.startInterval();
         });
 
         gracefulShutdown(this.httpServer, {

extra/build-windows.ts

@@ -1,92 +0,0 @@
-import fsAsync from "fs/promises";
-import unzipper from "unzipper";
-import stream from "node:stream";
-import { fileExists } from "../backend/util-server";
-
-const version = process.env.VERSION;
-
-if (!version) {
-    console.error("VERSION env not set");
-    process.exit(1);
-}
-
-const output = `./private/build/dockgen-${version}-win-x64.zip`;
-
-if (await fileExists(output)) {
-    console.error(`${output} already exists`);
-    process.exit(1);
-}
-
-console.log(`Building ${output}`);
-
-const nodeVersion = "18.17.1";
-const buildPath = "./private/build/windows";
-const nodePath = `${buildPath}/node`;
-const nodeTempPath = `${buildPath}/node-v${nodeVersion}-win-x64`;
-const corePath = `${buildPath}/core`;
-
-// Clear
-await fsAsync.rm(`${buildPath}/dockge-${version}`, {
-    recursive: true,
-    force: true
-});
-
-await fsAsync.rm(corePath, {
-    recursive: true,
-    force: true
-});
-
-// mkdir
-await fsAsync.mkdir(buildPath, {
-    recursive: true
-});
-
-// Download Node.js if not exists
-// Download,pipe to unzipper and extract to nodePath
-if (!await fileExists(nodePath)) {
-    console.log(`Downloading Node.js ${nodeVersion}`);
-
-    try {
-        await download(`https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}-win-x64.zip`);
-        // Rename folder
-        await fsAsync.rename(nodeTempPath, nodePath);
-    } catch (e) {
-        if (e instanceof Error) {
-            console.error(e.message);
-        }
-        process.exit(1);
-    }
-} else {
-    console.log(`Node.js ${nodeVersion} already exists, skipping download`);
-}
-
-// Download Dockge from GitHub
-console.log(`Downloading Dockge ${version} from GitHub`);
-
-try {
-    await download(`https://github.com/louislam/dockge/archive/refs/tags/${version}.zip`);
-    // Rename folder
-    await fsAsync.rename(`${buildPath}/dockge-${version}`, corePath);
-} catch (e) {
-    if (e instanceof Error) {
-        console.error(e.message);
-    }
-    process.exit(1);
-}
-
-function download(url : string) {
-    return new Promise((resolve, reject) => {
-        fetch(url).then((res) => {
-            if (res.body) {
-                // @ts-ignore
-                stream.Readable.fromWeb(res.body)
-                    .pipe(unzipper.Extract({
-                        path: buildPath,
-                    }))
-                    .on("close", resolve);
-            } else {
-                reject(new Error(`Unable to download ${url}`));
-            }
-        });
-    });
-}

frontend/src/lang/en.json

@@ -98,6 +98,5 @@
     "reconnecting...": "Reconnecting…",
     "connecting...": "Connecting to the socket server…",
     "url": "URL | URLs",
-    "extra": "Extra",
-    "newUpdate": "New Update"
+    "extra": "Extra"
 }

frontend/src/layouts/Layout.vue

@@ -16,8 +16,8 @@
                 <span class="fs-4 title">Dockge</span>
             </router-link>
 
-            <a v-if="hasNewVersion" target="_blank" href="https://github.com/louislam/dockge/releases" class="btn btn-warning me-3">
-                <font-awesome-icon icon="arrow-alt-circle-up" /> {{ $t("newUpdate") }}
+            <a v-if="hasNewVersion" target="_blank" href="https://github.com/louislam/dockge/releases" class="btn btn-info me-3">
+                <font-awesome-icon icon="arrow-alt-circle-up" /> {{ $t("New Update") }}
             </a>
 
             <ul class="nav nav-pills">

frontend/src/pages/Compose.vue

@@ -299,12 +299,12 @@ export default {
     computed: {
 
         urls() {
-            if (!this.envsubstJSONConfig["x-dockge"] || !this.envsubstJSONConfig["x-dockge"].urls || !Array.isArray(this.envsubstJSONConfig["x-dockge"].urls)) {
+            if (!this.jsonConfig["x-dockge"] || !this.jsonConfig["x-dockge"].urls || !Array.isArray(this.jsonConfig["x-dockge"].urls)) {
                 return [];
             }
 
             let urls = [];
-            for (const url of this.envsubstJSONConfig["x-dockge"].urls) {
+            for (const url of this.jsonConfig["x-dockge"].urls) {
                 let display;
                 try {
                     let obj = new URL(url);
@@ -374,17 +374,6 @@ export default {
             },
             deep: true,
         },
-
-        "stack.composeENV": {
-            handler() {
-                if (this.editorFocus) {
-                    console.debug("env code changed");
-                    this.yamlCodeChange();
-                }
-            },
-            deep: true,
-        },
-
         jsonConfig: {
             handler() {
                 if (!this.editorFocus) {

package.json

@@ -10,15 +10,13 @@
         "lint": "eslint \"**/*.{ts,vue}\"",
         "check-ts": "tsc --noEmit",
         "start": "tsx ./backend/index.ts",
-        "dev": "concurrently -k -r \"wait-on tcp:5000 && pnpm run dev:backend \" \"pnpm run dev:frontend\"",
         "dev:backend": "cross-env NODE_ENV=development tsx watch --inspect ./backend/index.ts",
         "dev:frontend": "cross-env NODE_ENV=development vite --host --config ./frontend/vite.config.ts",
-        "release-final": "tsx ./extra/test-docker.ts && tsx extra/update-version.ts && pnpm run build:frontend && pnpm run build:docker",
+        "release-final": "tsx ./extra/test-docker.ts && tsx extra/update-version.ts && pnpm run build:frontend && npm run build:docker",
         "build:frontend": "vite build --config ./frontend/vite.config.ts",
         "build:docker-base": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/dockge:base -f ./docker/Base.Dockerfile . --push",
         "build:docker": "node ./extra/env2arg.js docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/dockge:latest -t louislam/dockge:1 -t louislam/dockge:$VERSION --target release -f ./docker/Dockerfile . --push",
         "build:docker-nightly": "pnpm run build:frontend && docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/dockge:nightly --target nightly -f ./docker/Dockerfile . --push",
-        "build:windows": "tsx ./extra/build-windows.ts",
         "build:healthcheck": "docker buildx build -f docker/BuildHealthCheck.Dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/dockge:build-healthcheck . --push",
         "start-docker": "docker run --rm -p 5001:5001 --name dockge louislam/dockge:latest",
         "mark-as-nightly": "tsx ./extra/mark-as-nightly.ts",
@@ -26,7 +24,7 @@
         "reset-password": "tsx ./extra/reset-password.ts"
     },
     "dependencies": {
-        "@homebridge/node-pty-prebuilt-multiarch": "~0.11.12",
+        "@homebridge/node-pty-prebuilt-multiarch": "~0.11.11",
         "@inventage/envsubst": "^0.16.0",
         "@louislam/sqlite3": "~15.1.6",
         "bcryptjs": "~2.4.3",
@@ -44,8 +42,7 @@
         "jwt-decode": "~3.1.2",
         "knex": "~2.5.1",
         "limiter-es6-compat": "~2.1.2",
-        "mysql2": "~3.6.5",
-        "node-windows": "1.0.0-beta.8",
+        "mysql2": "~3.6.3",
         "promisify-child-process": "~4.1.2",
         "redbean-node": "~0.3.3",
         "socket.io": "~4.7.2",
@@ -58,23 +55,21 @@
     },
     "devDependencies": {
         "@actions/github": "^6.0.0",
-        "@fontsource/jetbrains-mono": "^5.0.18",
+        "@fontsource/jetbrains-mono": "^5.0.17",
         "@fortawesome/fontawesome-svg-core": "6.4.2",
         "@fortawesome/free-regular-svg-icons": "6.4.2",
         "@fortawesome/free-solid-svg-icons": "6.4.2",
         "@fortawesome/vue-fontawesome": "3.0.3",
         "@types/bcryptjs": "^2.4.6",
-        "@types/bootstrap": "~5.2.10",
+        "@types/bootstrap": "~5.2.9",
         "@types/command-exists": "~1.2.3",
         "@types/express": "~4.17.21",
         "@types/jsonwebtoken": "~9.0.5",
-        "@types/unzipper": "^0.10.9",
         "@typescript-eslint/eslint-plugin": "~6.8.0",
         "@typescript-eslint/parser": "~6.8.0",
-        "@vitejs/plugin-vue": "~4.5.2",
+        "@vitejs/plugin-vue": "~4.5.0",
         "bootstrap": "5.3.2",
         "bootstrap-vue-next": "~0.14.10",
-        "concurrently": "^8.2.2",
         "cross-env": "~7.0.3",
         "eslint": "~8.50.0",
         "eslint-plugin-jsdoc": "~46.8.2",
@@ -83,17 +78,15 @@
         "sass": "~1.68.0",
         "typescript": "~5.2.2",
         "unplugin-vue-components": "~0.25.2",
-        "unzipper": "^0.10.14",
-        "vite": "~5.0.7",
+        "vite": "~5.0.0",
         "vite-plugin-compression": "~0.5.1",
-        "vue": "~3.3.11",
+        "vue": "~3.3.8",
         "vue-eslint-parser": "~9.3.2",
         "vue-i18n": "~9.5.0",
         "vue-prism-editor": "2.0.0-alpha.2",
         "vue-qrcode": "~2.2.0",
         "vue-router": "~4.2.5",
         "vue-toastification": "2.0.0-rc.5",
-        "wait-on": "^7.2.0",
         "xterm": "5.4.0-beta.37",
         "xterm-addon-web-links": "~0.9.0"
     }