Update

docker/Base.Dockerfile

@@ -2,6 +2,14 @@
 FROM node:18.17.1-bookworm-slim
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
+
+
+# TARGETPLATFORM: linux/amd64, linux/arm64, linux/arm/v7
+ARG TARGETPLATFORM
+
+# TARGETARCH: amd64, arm64, arm/v7
+ARG TARGETARCH
+
 RUN apt update && apt install --yes --no-install-recommends \
     curl \
     ca-certificates \
@@ -18,7 +26,12 @@ RUN apt update && apt install --yes --no-install-recommends \
     && apt update \
     && apt --yes --no-install-recommends install \
          docker-ce-cli \
-         docker-compose-plugin \
     && rm -rf /var/lib/apt/lists/* \
     && npm install pnpm -g \
     && pnpm install -g tsx
+
+# Download docker-compose, as the repo's docker-compose is not up-to-date.
+COPY ./extra/download-docker-compose.ts ./extra/download-docker-compose.ts
+ARG DOCKER_COMPOSE_VERSION="2.23.3"
+RUN tsx ./extra/download-docker-compose.ts ${TARGETPLATFORM} ${DOCKER_COMPOSE_VERSION} \
+    && docker compose version

extra/download-docker-compose.ts

@@ -0,0 +1,39 @@
+import fs from "fs";
+
+async function main() {
+    // TARGETPLATFORM
+    const targetPlatform = process.argv[2];
+
+    // Docker Compose version
+    const dockerComposeVersion = process.argv[3];
+
+    // Arch
+    let arch = "";
+
+    if (targetPlatform === "linux/amd64") {
+        arch = "x86_64";
+    } else if (targetPlatform === "linux/arm64") {
+        arch = "aarch64";
+    } else if (targetPlatform === "linux/arm/v7") {
+        arch = "armv7";
+    } else {
+        throw new Error(`Unknown target platform: ${targetPlatform}`);
+    }
+
+    // mkdir -p /root/.docker/cli-plugins
+    fs.mkdirSync("/root/.docker/cli-plugins", { recursive: true });
+
+    // Download URL
+    const url = `https://github.com/docker/compose/releases/download/v${dockerComposeVersion}/docker-compose-linux-${arch}`;
+
+    console.log(url);
+
+    // Download docker-compose using fetch api, to "/root/.docker/cli-plugins/docker-compose"
+    const buffer = await (await fetch(url)).arrayBuffer();
+    fs.writeFileSync("/root/.docker/cli-plugins/docker-compose", Buffer.from(buffer));
+
+    // chmod +x /root/.docker/cli-plugins/docker-compose
+    fs.chmodSync("/root/.docker/cli-plugins/docker-compose", 0o111);
+}
+
+main();

extra/reformat-changelog.ts

@@ -1,10 +1,6 @@
 // Generate on GitHub
 const input = `
-* Fixed envsubst issue by @louislam in https://github.com/louislam/dockge/pull/301
-* Fix: Only adding folders to stack with a compose file. by @Ozy-Viking in https://github.com/louislam/dockge/pull/299
-* Terminal text cols adjusts to terminal container.  by @Ozy-Viking in https://github.com/louislam/dockge/pull/285
-* Update Docker Dompose plugin to 2.23.3 by @louislam in https://github.com/louislam/dockge/pull/303
-* Translations update from Kuma Weblate by @UptimeKumaBot in https://github.com/louislam/dockge/pull/302
+* Add Korean translation by @Alanimdeo in https://github.com/louislam/dockge/pull/86
 `;
 
 const template = `
@@ -29,7 +25,7 @@ const template = `
 
 ### 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.
 `;

frontend/src/lang/bg-BG.json

@@ -12,7 +12,7 @@
     "registry": "Регистър",
     "compose": "Compose",
     "addFirstStackMsg": "Създайте вашия първи стак!",
-    "stackName": "Име на стак",
+    "stackName" : "Име на стак",
     "deployStack": "Разположи",
     "deleteStack": "Изтрий",
     "stopStack": "Спри",
@@ -22,7 +22,7 @@
     "editStack": "Редактирай",
     "discardStack": "Отхвърли",
     "saveStackDraft": "Запази",
-    "notAvailableShort": "N/A",
+    "notAvailableShort" : "N/A",
     "deleteStackMsg": "Сигурни ли сте, че желаете да изтриете този стак?",
     "stackNotManagedByDockgeMsg": "Този стак не се управлява от Dockge.",
     "primaryHostname": "Основно име на хост",
@@ -90,13 +90,5 @@
     "Allowed commands:": "Позволени команди:",
     "Internal Networks": "Вътрешни мрежи",
     "External Networks": "Външни мрежи",
-    "No External Networks": "Не са налични външни мрежи",
-    "reverseProxyMsg2": "Проверете как да го конфигурирате за WebSocket",
-    "downStack": "Спри и изключи",
-    "reverseProxyMsg1": "Използвате ревърс прокси?",
-    "Cannot connect to the socket server.": "Не може да се свърже със сокет сървъра.",
-    "url": "URL адрес | URL адреси",
-    "extra": "Допълнително",
-    "reconnecting...": "Повторно свързване…",
-    "connecting...": "Свързване със сокет сървъра…"
+    "No External Networks": "Не са налични външни мрежи"
 }

frontend/src/lang/cs-CZ.json

@@ -3,39 +3,39 @@
     "Create your admin account": "Vytvořit účet administrátora",
     "authIncorrectCreds": "Nesprávné uživatelské jméno nebo heslo.",
     "PasswordsDoNotMatch": "Hesla se neshodují.",
-    "Repeat Password": "Napište Heslo Znovu",
+    "Repeat Password": "Opakujte heslo",
     "Create": "Vytvořit",
     "signedInDisp": "Přihlášen jako {0}",
-    "signedInDispDisabled": "Ověření Zakázáno.",
+    "signedInDispDisabled": "Ověření zakázáno.",
     "home": "Domů",
     "console": "Konzole",
     "registry": "Registry",
-    "compose": "Komponovat",
-    "addFirstStackMsg": "Vytvořte svůj první zásobník!",
-    "stackName": "Název Zásobníku",
+    "compose": "Compose",
+    "addFirstStackMsg": "Vytvořte svůj první stack!",
+    "stackName": "Název stacku",
     "deployStack": "Nainstalovat",
     "deleteStack": "Smazat",
     "stopStack": "Zastavit",
     "restartStack": "Restartovat",
     "updateStack": "Aktualizovat",
     "startStack": "Spustit",
-    "downStack": "Zastavit & Vypnout",
+    "downStack": "Zastavit a vypnout",
     "editStack": "Upravit",
     "discardStack": "Zahodit",
     "saveStackDraft": "Uložit",
     "notAvailableShort": "N/A",
-    "deleteStackMsg": "Opravdu chcete smazat tento zásobník?",
+    "deleteStackMsg": "Opravdu chcete smazat tento stack?",
     "stackNotManagedByDockgeMsg": "Tento stack není spravován systémem Dockge.",
     "primaryHostname": "Primární název hostitele",
     "general": "Obecné",
     "container": "Kontejner | Kontejnery",
-    "scanFolder": "Prohledat složku se zásobníky",
+    "scanFolder": "Prohledat složku se stacky",
     "dockerImage": "Obrázek",
     "restartPolicyUnlessStopped": "Pokud není zastaveno",
     "restartPolicyAlways": "Vždy",
-    "restartPolicyOnFailure": "Při Selhání",
+    "restartPolicyOnFailure": "Při selhání",
     "restartPolicyNo": "Ne",
-    "environmentVariable": "Proměnná Prostředí | Proměnné Prostředí",
+    "environmentVariable": "Proměnná prostředí | Proměnné prostředí",
     "restartPolicy": "Politika restartu",
     "containerName": "Název kontejneru",
     "port": "Port | Porty",
@@ -91,11 +91,5 @@
     "Allowed commands:": "Povolené příkazy:",
     "Internal Networks": "Interní sítě",
     "External Networks": "Externí sítě",
-    "No External Networks": "Žádné externí sítě",
-    "reconnecting...": "Opětovné připojení…",
-    "url": "Adresa URL | Adresy URL",
-    "extra": "Extra",
-    "reverseProxyMsg1": "Používáte Reverzní proxy server?",
-    "reverseProxyMsg2": "Podívat se jak to nastavit pro WebSocket",
-    "Cannot connect to the socket server.": "Nelze se připojit k serveru ."
+    "No External Networks": "Žádné externí sítě"
 }

frontend/src/lang/fr.json

@@ -98,6 +98,5 @@
     "downStack": "Arrêter et désactiver",
     "reverseProxyMsg1": "Utilisez vous un proxy inverse ?",
     "Cannot connect to the socket server.": "Impossible de se connecter au serveur socket.",
-    "reconnecting...": "Reconnexion…",
-    "newUpdate": "Nouvelle mise à jour"
+    "reconnecting...": "Reconnexion…"
 }

frontend/src/lang/it-IT.json

@@ -10,10 +10,10 @@
     "home": "Home",
     "console": "Console",
     "registry": "Registro",
-    "compose": "Componi",
+    "compose": "Compose",
     "addFirstStackMsg": "Componi il tuo primo stack!",
     "stackName": "Nome dello stack",
-    "deployStack": "Rilascia",
+    "deployStack": "Deploy",
     "deleteStack": "Cancella",
     "stopStack": "Stop",
     "restartStack": "Riavvia",
@@ -75,7 +75,7 @@
     "Also check beta release": "Controlla anche le release in beta",
     "Remember me": "Ricordami",
     "Login": "Login",
-    "Username": "Nome Utente",
+    "Username": "Username",
     "Password": "Password",
     "Settings": "Impostazioni",
     "Logout": "Logout",
@@ -97,6 +97,5 @@
     "Cannot connect to the socket server.": "Impossibile connettersi al server socket.",
     "connecting...": "Connessione al server socket…",
     "extra": "Extra",
-    "reconnecting...": "Riconnessione…",
-    "url": "Indirizzo | Indirizzi"
+    "reconnecting...": "Riconnessione…"
 }

frontend/src/lang/sl.json

@@ -90,10 +90,5 @@
     "Allowed commands:": "Dovoljeni ukazi:",
     "Internal Networks": "Notranja omrežja",
     "External Networks": "Zunanja omrežja",
-    "No External Networks": "Ni zunanjih omrežij",
-    "downStack": "Ustavi & Odstrani",
-    "connecting...": "Povezovanje s strežnikom…",
-    "reverseProxyMsg1": "Uporabljate obratni proxy?",
-    "extra": "Dodatno",
-    "reconnecting...": "Ponovna povezava …"
+    "No External Networks": "Ni zunanjih omrežij"
 }

frontend/src/lang/th.json

@@ -91,12 +91,5 @@
     "Allowed commands:": "คำสั่งที่อนุญาต:",
     "Internal Networks": "เครือข่ายภายใน",
     "External Networks": "เครือข่ายภายนอก",
-    "No External Networks": "ไม่มีเครือข่ายภายนอก",
-    "reverseProxyMsg2": "ตรวจสอบวิธีกำหนดค่าสำหรับ WebSocket",
-    "Cannot connect to the socket server.": "ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ socket ได้",
-    "reverseProxyMsg1": "ใช้ Reverse Proxy หรือไม่?",
-    "connecting...": "กำลังเชื่อมต่อกับเซิร์ฟเวอร์ socket…",
-    "url": "URL | URLs",
-    "extra": "พิเศษ",
-    "reconnecting...": "กำลังเชื่อมต่อใหม่…"
-}
+    "No External Networks": "ไม่มีเครือข่ายภายนอก"
+}

frontend/src/lang/uk-UA.json

@@ -92,7 +92,7 @@
     "External Networks": "Зовнішні мережі",
     "No External Networks": "Немає зовнішніх мереж",
     "downStack": "Зупинити і вимкнути",
-    "reverseProxyMsg1": "Використовуєте зворотній проксі?",
+    "reverseProxyMsg1": "Використовувати зворотній проксі?",
     "Cannot connect to the socket server.": "Не вдається підключитися до сервера сокетів.",
     "reconnecting...": "Повторне підключення…",
     "connecting...": "Підключення до сервера сокетів…",

frontend/src/lang/zh-TW.json

@@ -51,7 +51,7 @@
     "autoGet": "自動取得",
     "add": "新增",
     "Edit": "編輯",
-    "applyToYAML": "套用到 YAML",
+    "applyToYAML": "應用到YAML",
     "createExternalNetwork": "建立",
     "addInternalNetwork": "新增",
     "Save": "儲存",
@@ -71,7 +71,7 @@
     "Frontend Version": "前端版本",
     "Check Update On GitHub": "在 GitHub 上檢查更新",
     "Show update if available": "有更新時提醒我",
-    "Also check beta release": "同時檢查 Beta 版更新",
+    "Also check beta release": "同時檢查 Beta 渠道更新",
     "Remember me": "記住我",
     "Login": "登入",
     "Username": "使用者名稱",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "dockge",
-    "version": "1.3.5",
+    "version": "1.3.3",
     "type": "module",
     "engines": {
         "node": ">= 18.0.0 && <= 18.17.1"