WIP

README.md

@@ -6,7 +6,7 @@
 
 A fancy, easy-to-use and reactive self-hosted docker compose.yaml stack-oriented manager.
 
-![GitHub Repo stars](https://img.shields.io/github/stars/louislam/dockge?logo=github) ![Docker Pulls](https://img.shields.io/docker/pulls/louislam/dockge?logo=docker) ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/louislam/dockge/latest?label=docker%20image%20ver.) ![GitHub last commit (branch)](https://img.shields.io/github/last-commit/louislam/dockge/master?logo=github)
+![GitHub Repo stars](https://img.shields.io/github/stars/louislam/dockge?logo=github) ![GitHub issues](https://img.shields.io/github/issues/louislam/dockge?logo=github) ![GitHub pull requests](https://img.shields.io/github/issues-pr/louislam/dockge?logo=github) ![Docker Pulls](https://img.shields.io/docker/pulls/louislam/dockge?logo=docker) ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/louislam/dockge/latest?label=docker%20image%20ver.) ![GitHub last commit (branch)](https://img.shields.io/github/last-commit/louislam/dockge/master?logo=github) ![GitHub](https://img.shields.io/github/license/louislam/dockge?logo=github)
 
 <img src="https://github.com/louislam/dockge/assets/1336778/26a583e1-ecb1-4a8d-aedf-76157d714ad7" width="900" alt="" />
 

backend/util-common.ts

@@ -385,11 +385,7 @@ function traverseYAML(pair : Pair, env : DotenvParseOutput) : void {
             if (item instanceof Pair) {
                 traverseYAML(item, env);
             } else if (item instanceof Scalar) {
-                let value = item.value as unknown;
-
-                if (typeof(value) === "string") {
-                    item.value = envsubst(value, env);
-                }
+                item.value = envsubst(item.value, env);
             }
         }
     // @ts-ignore

extra/reformat-changelog.ts

@@ -4,24 +4,16 @@ const input = `
 `;
 
 const template = `
-
-> [!WARNING]
->
-
 ### 🆕 New Features
 
-### ⬆️ Improvements
+### Improvements
 
-### 🐛 Bug Fixes
+### 🐞 Bug Fixes
 
 ### 🦎 Translation Contributions
 
-### ⬆️ Security Fixes
-
 ### Others
 - Other small changes, code refactoring and comment/doc updates in this repo:
-
-Please let me know if your username is missing, if your pull request has been merged in this version, or your commit has been included in one of the pull requests.
 `;
 
 const lines = input.split("\n").filter((line) => line.trim() !== "");
@@ -45,12 +37,6 @@ for (const line of lines) {
     }
 
     message = message.split("* ").pop();
-
-    let thanks = "";
-    if (username != "@louislam") {
-        thanks = `(Thanks ${username})`;
-    }
-
-    console.log(pullRequestID, message, thanks);
+    console.log("-", pullRequestID, message, `(Thanks ${username})`);
 }
 console.log(template);

frontend/src/lang/de.json

@@ -10,7 +10,7 @@
     "home": "Startseite",
     "console": "Konsole",
     "registry": "Container Registry",
-    "compose": "Compose",
+    "compose": "",
     "addFirstStackMsg": "Stelle deinen ersten Stack zusammen!",
     "stackName": "Stack-Name",
     "deployStack": "Deployen",
@@ -72,15 +72,15 @@
     "Check Update On GitHub": "Update auf GitHub überprüfen",
     "Show update if available": "Update anzeigen, wenn verfügbar",
     "Also check beta release": "Auch Beta-Version überprüfen",
-    "Remember me": "Angemeldet bleiben",
+    "Remember me": "Anmeldung beibehalten",
     "Login": "Anmelden",
     "Username": "Benutzername",
     "Password": "Passwort",
     "Settings": "Einstellungen",
     "Logout": "Abmelden",
     "Lowercase only": "Nur Kleinbuchstaben",
-    "Convert to Compose": "In Compose-Syntax umwandeln",
-    "Docker Run": "Docker Run",
+    "Convert to Compose": "In Compose Syntax umwandeln",
+    "Docker Run": "Docker ausführen",
     "active": "aktiv",
     "exited": "beendet",
     "inactive": "inaktiv",

frontend/src/lang/pt-BR.json

@@ -12,7 +12,7 @@
     "registry": "Registro",
     "compose": "Compose",
     "addFirstStackMsg": "Crie sua primeira stack!",
-    "stackName": "Nome da stack",
+    "stackName" : "Nome da stack",
     "deployStack": "Deploy",
     "deleteStack": "Excluir",
     "stopStack": "Parar",
@@ -22,7 +22,7 @@
     "editStack": "Editar",
     "discardStack": "Descartar",
     "saveStackDraft": "Salvar",
-    "notAvailableShort": "N/D",
+    "notAvailableShort" : "N/D",
     "deleteStackMsg": "Tem certeza que deseja excluir esta stack?",
     "stackNotManagedByDockgeMsg": "Esta stack não é gerenciada pelo Dockge.",
     "primaryHostname": "Nome do Host Primário",
@@ -90,13 +90,5 @@
     "Allowed commands:": "Comandos permitidos:",
     "Internal Networks": "Redes internas",
     "External Networks": "Redes externas",
-    "No External Networks": "Sem redes externas",
-    "reverseProxyMsg2": "Veja como configurar para WebSocket",
-    "downStack": "Parar & Encerrar",
-    "reverseProxyMsg1": "Utiliza proxy reverso?",
-    "Cannot connect to the socket server.": "Não é possível conectar ao socket server.",
-    "connecting...": "Conectando ao socket server…",
-    "url": "URL | URLs",
-    "extra": "Extra",
-    "reconnecting...": "Reconectando…"
+    "No External Networks": "Sem redes externas"
 }

frontend/src/lang/ru.json

@@ -5,12 +5,12 @@
     "PasswordsDoNotMatch": "Пароль не совпадает.",
     "Repeat Password": "Повторите пароль",
     "Create": "Создать",
-    "signedInDisp": "Авторизован как {0}",
+    "signedInDisp": "Авторизован как",
     "signedInDispDisabled": "Авторизация выключена.",
     "home": "Главная",
     "console": "Консоль",
-    "registry": "Реестр (Registry)",
-    "compose": "Составить (Compose)",
+    "registry": "Registry",
+    "compose": "Compose",
     "addFirstStackMsg": "Создайте свой первый стек!",
     "stackName": "Имя стека",
     "deployStack": "Развернуть",
@@ -90,13 +90,5 @@
     "Allowed commands:": "Разрешенные команды:",
     "Internal Networks": "Внутренние сети",
     "External Networks": "Внешние сети",
-    "No External Networks": "Нет внешних сетей",
-    "downStack": "Остановить и выключить",
-    "reverseProxyMsg1": "Использовать Реверс Прокси?",
-    "reconnecting...": "Переподключение…",
-    "Cannot connect to the socket server.": "Не удается подключиться к серверу сокетов.",
-    "url": "URL адрес(а)",
-    "extra": "Дополнительно",
-    "reverseProxyMsg2": "Проверьте, как настроить его для WebSocket",
-    "connecting...": "Подключение к серверу сокетов…"
+    "No External Networks": "Нет внешних сетей"
 }

frontend/src/lang/sv-SE.json

@@ -1,6 +1,6 @@
 {
     "languageName": "Svenska",
-    "Create your admin account": "Skapa ditt Admin-konto",
+    "Create your admin account": "Skapa ditt Admin-konto.",
     "authIncorrectCreds": "Fel användarnamn eller lösenord.",
     "PasswordsDoNotMatch": "Lösenorden matchar inte.",
     "Repeat Password": "Repetera lösenord",
@@ -12,28 +12,28 @@
     "registry": "Register",
     "compose": "Komponera",
     "addFirstStackMsg": "Komponera din första stack!",
-    "stackName": "Stacknamn",
+    "stackName" : "Stacknamn",
     "deployStack": "Distribuera",
     "deleteStack": "Radera",
-    "stopStack": "Stoppa",
+    "stopStack": "Stop",
     "restartStack": "Starta om",
     "updateStack": "Uppdatera",
     "startStack": "Starta",
-    "downStack": "Stoppa & Ner",
+    "downStack": "Stop & Ner",
     "editStack": "Redigera",
     "discardStack": "Kasta",
     "saveStackDraft": "Spara",
-    "notAvailableShort": "N/A",
+    "notAvailableShort" : "N/A",
     "deleteStackMsg": "Är du säker på att du vill radera stacken?",
     "stackNotManagedByDockgeMsg": "Denna stacken hanteras inte av Dockge.",
     "primaryHostname": "Primärt värdnamn",
     "general": "Allmän",
     "container": "Container | Containrar",
-    "scanFolder": "Skanna Stackmapp",
-    "dockerImage": "Avbild",
-    "restartPolicyUnlessStopped": "Om inte stoppad",
+    "scanFolder": "Scanna Stackfolder",
+    "dockerImage": "Bild",
+    "restartPolicyUnlessStopped": "Om inte stoppas",
     "restartPolicyAlways": "Alltid",
-    "restartPolicyOnFailure": "Vid misslyckande",
+    "restartPolicyOnFailure": "Vid Misslyckande",
     "restartPolicyNo": "Nej",
     "environmentVariable": "Miljövariabel | Miljövariabler",
     "restartPolicy": "Omstartspolicy",
@@ -44,12 +44,12 @@
     "dependsOn": "Containerberoende | Containerberoenden",
     "addListItem": "Lägg till {0}",
     "deleteContainer": "Radera",
-    "addContainer": "Lägg till container",
-    "addNetwork": "Lägg till nätverk",
+    "addContainer": "Lägg till Container",
+    "addNetwork": "Lägg till Nätverk",
     "disableauth.message1": "Är du säker på att du vill <strong>inaktivera autentisering</strong>?",
-    "disableauth.message2": "Det är designat för scenarion <strong>där du ska implementera tredjepartsautentisering</strong> framför Dockge som Cloudflare Access, Authelia eller andra autentiseringsmekanismer.",
-    "passwordNotMatchMsg": "Det upprepade lösenordet matchar inte.",
-    "autoGet": "Auto-hämta",
+    "disableauth.message2": "Det är designat för senarion <stong>när du ska implementera tredjeparts autentisering</strong> framör Dockge som Cloudflare Access, Authelia eller andra autentiseringsmekanismer.",
+    "passwordNotMatchMsg": "Det upprepade lösenordet matchar inte",
+    "autoGet": "Auto Hämta",
     "add": "Lägg till",
     "Edit": "Redigera",
     "applyToYAML": "Lägg till i YAML",
@@ -57,8 +57,8 @@
     "addInternalNetwork": "Lägg till",
     "Save": "Spara",
     "Language": "Språk",
-    "Current User": "Nuvarande användare",
-    "Change Password": "Ändra lösenord",
+    "Current User": "Nuvarande användaren",
+    "Change Password": "Byt lösenord",
     "Current Password": "Nuvarande lösenord",
     "New Password": "Nytt lösenord",
     "Repeat New Password": "Upprepa nytt lösenord",
@@ -70,9 +70,9 @@
     "I understand, please disable": "Jag förstår, vänligen inaktivera",
     "Leave": "Lämna",
     "Frontend Version": "Frontendversion",
-    "Check Update On GitHub": "Kontrollera uppdatering på GitHub",
+    "Check Update On GitHub": "Kontrollera Uppdatering på GitHub",
     "Show update if available": "Visa uppdatering om tillgänglig",
-    "Also check beta release": "Kontrollera även betaversioner",
+    "Also check beta release": "Kontrollera även betaversionen",
     "Remember me": "Kom ihåg mig",
     "Login": "Logga in",
     "Username": "Användarnamn",
@@ -80,8 +80,8 @@
     "Settings": "Inställningar",
     "Logout": "Logga ut",
     "Lowercase only": "Endast små tecken",
-    "Convert to Compose": "Omvandla till compose",
-    "Docker Run": "Docker kör",
+    "Convert to Compose": "Omvandla till Compose",
+    "Docker Run": "Docker Run",
     "active": "aktiv",
     "exited": "avslutad",
     "inactive": "inaktiv",
@@ -89,14 +89,7 @@
     "Security": "Säkerhet",
     "About": "Om",
     "Allowed commands:": "Tillåtna kommandon:",
-    "Internal Networks": "Interna nätverk",
-    "External Networks": "Externa nätverk",
-    "No External Networks": "Inga externa nätverk",
-    "reverseProxyMsg1": "Används omvänd proxy?",
-    "connecting...": "Ansluter till socketserver…",
-    "Cannot connect to the socket server.": "Kan inte ansluta till socketservern.",
-    "reverseProxyMsg2": "Kontrollera hur man konfigurerar webbsocket",
-    "url": "URL | URLer",
-    "extra": "Extra",
-    "reconnecting...": "Återansluter…"
+    "Internal Networks": "Interna Nätverk",
+    "External Networks": "Externa Nätverk",
+    "No External Networks": "Inga Externa Nätverk"
 }

frontend/src/lang/zh-TW.json

@@ -92,7 +92,7 @@
     "External Networks": "外部網路",
     "No External Networks": "無外部網路",
     "downStack": "停止",
-    "reverseProxyMsg1": "在使用反向代理嗎？",
+    "reverseProxyMsg1": "在使用反向代理吗？",
     "reverseProxyMsg2": "點擊這裡了解如何為 WebSocket 配置反向代理",
     "Cannot connect to the socket server.": "無法連接到 Socket 伺服器。",
     "reconnecting...": "重新連線中…",

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);

package.json

@@ -1,6 +1,6 @@
 {
     "name": "dockge",
-    "version": "1.3.3",
+    "version": "1.3.2",
     "type": "module",
     "engines": {
         "node": ">= 18.0.0 && <= 18.17.1"
@@ -10,7 +10,6 @@
         "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 && npm run build:docker",
@@ -25,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",
@@ -43,7 +42,7 @@
         "jwt-decode": "~3.1.2",
         "knex": "~2.5.1",
         "limiter-es6-compat": "~2.1.2",
-        "mysql2": "~3.6.5",
+        "mysql2": "~3.6.3",
         "promisify-child-process": "~4.1.2",
         "redbean-node": "~0.3.3",
         "socket.io": "~4.7.2",
@@ -55,22 +54,20 @@
         "yaml": "~2.3.4"
     },
     "devDependencies": {
-        "concurrently": "^8.2.2",
-        "wait-on": "^7.2.0",
         "@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",
         "@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",
         "cross-env": "~7.0.3",
@@ -81,9 +78,9 @@
         "sass": "~1.68.0",
         "typescript": "~5.2.2",
         "unplugin-vue-components": "~0.25.2",
-        "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",