Compare commits

..

13 Commits

Author SHA1 Message Date
80e885e85d Update to 1.3.5 2023-12-17 06:21:24 +08:00
e54ede3f1c Revert "Update Docker Dompose plugin to 2.23.3" (#307) 2023-12-17 06:14:15 +08:00
ac2a62abb1 Update to 1.3.4 2023-12-16 23:22:27 +08:00
e77ff3622d Translations update from Kuma Weblate (#302) 2023-12-16 23:19:50 +08:00
b5bd9a711a Translated using Weblate (French)
Currently translated at 100.0% (101 of 101 strings)

Translation: Dockge/dockge
Translate-URL: https://weblate.kuma.pet/projects/dockge/dockge/fr/
2023-12-16 15:18:03 +00:00
442c7fce67 Translated using Weblate (Thai)
Currently translated at 100.0% (100 of 100 strings)

Translation: Dockge/dockge
Translate-URL: https://weblate.kuma.pet/projects/dockge/dockge/th/
2023-12-16 15:18:03 +00:00
7d55a84aa2 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (100 of 100 strings)

Translation: Dockge/dockge
Translate-URL: https://weblate.kuma.pet/projects/dockge/dockge/zh_Hant/
2023-12-16 15:18:03 +00:00
22bbba9652 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (100 of 100 strings)

Translation: Dockge/dockge
Translate-URL: https://weblate.kuma.pet/projects/dockge/dockge/uk/
2023-12-16 15:18:03 +00:00
3bc6779af4 Translated using Weblate (Slovenian)
Currently translated at 97.0% (97 of 100 strings)

Translation: Dockge/dockge
Translate-URL: https://weblate.kuma.pet/projects/dockge/dockge/sl/
2023-12-16 15:18:03 +00:00
3ef2be1c11 Translated using Weblate (Italian)
Currently translated at 100.0% (100 of 100 strings)

Translation: Dockge/dockge
Translate-URL: https://weblate.kuma.pet/projects/dockge/dockge/it/
2023-12-16 15:18:03 +00:00
f6f7283f09 Translated using Weblate (Czech)
Currently translated at 99.0% (99 of 100 strings)

Translation: Dockge/dockge
Translate-URL: https://weblate.kuma.pet/projects/dockge/dockge/cs/
2023-12-16 15:18:03 +00:00
69e237a676 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (100 of 100 strings)

Translation: Dockge/dockge
Translate-URL: https://weblate.kuma.pet/projects/dockge/dockge/bg/
2023-12-16 15:18:03 +00:00
6a3eebfd57 Update Docker Dompose plugin to 2.23.3 (#303) 2023-12-16 20:51:24 +08:00
12 changed files with 61 additions and 81 deletions

View File

@ -2,14 +2,6 @@
FROM node:18.17.1-bookworm-slim FROM node:18.17.1-bookworm-slim
ENV PNPM_HOME="/pnpm" ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH" 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 \ RUN apt update && apt install --yes --no-install-recommends \
curl \ curl \
ca-certificates \ ca-certificates \
@ -26,12 +18,7 @@ RUN apt update && apt install --yes --no-install-recommends \
&& apt update \ && apt update \
&& apt --yes --no-install-recommends install \ && apt --yes --no-install-recommends install \
docker-ce-cli \ docker-ce-cli \
docker-compose-plugin \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& npm install pnpm -g \ && npm install pnpm -g \
&& pnpm install -g tsx && 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

View File

@ -1,39 +0,0 @@
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();

View File

@ -1,6 +1,10 @@
// Generate on GitHub // Generate on GitHub
const input = ` const input = `
* Add Korean translation by @Alanimdeo in https://github.com/louislam/dockge/pull/86 * 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
`; `;
const template = ` const template = `
@ -25,7 +29,7 @@ const template = `
### Others ### Others
- Other small changes, code refactoring and comment/doc updates in this repo: - 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. 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.
`; `;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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