Merge pull request #772 from Dokploy/canary

v0.13.0

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,6 @@
 name: Bug Report
 description: Create a bug report
-labels: ['bug']
+labels: ["bug"]
 body:
   - type: markdown
     attributes:
@@ -11,18 +11,27 @@ body:
   - type: textarea
     attributes:
       label: To Reproduce
-      description: A step-by-step description of how to reproduce the issue, or a link to the reproducible repository.
+      description: |
+        A detailed, step-by-step description of how to reproduce the issue is required. 
+        Please ensure your report includes clear instructions using numbered lists. 
+
+        If possible, provide a link to a repository or project where the issue can be reproduced.
       placeholder: |
         1. Create a application
         2. Click X
         3. Y will happen
+
+        Make sure to:
+        - Use numbered lists to outline steps clearly.
+        - Include all relevant commands and configurations.
+        - Provide a link to a reproducible repository if applicable.
     validations:
       required: true
   - type: textarea
     attributes:
       label: Current vs. Expected behavior
       description: A clear and concise description of what the bug is, and what you expected to happen.
-      placeholder: 'Following the steps from the previous section, I expected A to happen, but I observed B instead'
+      placeholder: "Following the steps from the previous section, I expected A to happen, but I observed B instead"
     validations:
       required: true
   - type: textarea
@@ -45,12 +54,23 @@ body:
       label: Which area(s) are affected? (Select all that apply)
       multiple: true
       options:
-        - 'Installation'
-        - 'Application'
-        - 'Databases'
-        - 'Docker Compose'
-        - 'Traefik'
-        - 'Docker'
+        - "Installation"
+        - "Application"
+        - "Databases"
+        - "Docker Compose"
+        - "Traefik"
+        - "Docker"
+        - "Remote server"
+        - "Local Development"
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Are you deploying the applications where Dokploy is installed or on a remote server?
+      options:
+        - "Same server where Dokploy is installed"
+        - "Remote server"
+        - "Both"
     validations:
       required: true
   - type: textarea
@@ -59,4 +79,16 @@ body:
       description: |
         Any extra information that might help us investigate.
       placeholder: |
-        I tested on a DigitalOcean VPS with Ubuntu 20.04 and Docker version 20.10.12.
+        I tested on a DigitalOcean VPS with Ubuntu 20.04 and Docker version 20.10.12.
+
+  - type: dropdown
+    attributes:
+      label: Will you send a PR to fix it?
+      description: Let us know if you are planning to submit a pull request to address this issue.
+
+      options:
+        - "Yes"
+        - "No"
+        - "Maybe, need help"
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,6 +1,6 @@
 name: Feature Request
 description: Suggest a new feature or improvement to the project
-labels: ['enhancement']
+labels: ["enhancement"]
 body:
   - type: textarea
     attributes:
@@ -30,4 +30,15 @@ body:
       label: Additional context
       description: Add any other context or screenshots about the feature request here.
     validations:
-      required: false
+      required: false
+
+  - type: dropdown
+    attributes:
+      label: Will you send a PR to implement it?
+      description: Let us know if you are planning to submit a pull request to implement this feature.
+      options:
+        - "Yes"
+        - "No"
+        - "Maybe, need help"
+    validations:
+      required: true

README.md

@@ -87,7 +87,8 @@ For detailed documentation, visit [docs.dokploy.com](https://docs.dokploy.com).
 
 <div style="display: flex; gap: 30px; flex-wrap: wrap;">
 <a href="https://lightspeed.run/?ref=dokploy"><img src="https://github.com/lightspeedrun.png" width="60px" alt="Lightspeed.run"/></a>
-<a href="https://cloudblast.io/?ref=dokploy "><img src="https://cloudblast.io/img/logo-icon.193cf13e.svg" width="250px" alt="Lightspeed.run"/></a>
+<a href="https://cloudblast.io/?ref=dokploy "><img src="https://cloudblast.io/img/logo-icon.193cf13e.svg" width="250px" alt="Cloudblast.io"/></a>
+<a href="https://startupfa.me/?ref=dokploy "><img src=".github/sponsors/startupfame.png" width="65px" alt="Startupfame"/></a>
 </div>
 
 ### Community Backers 🤝
@@ -116,7 +117,7 @@ For detailed documentation, visit [docs.dokploy.com](https://docs.dokploy.com).
 ## Video Tutorial
 
 <a href="https://youtu.be/mznYKPvhcfw">
-  <img src="https://dokploy.com/banner.webp" alt="Watch the video" width="400" style="border-radius:20px;"/>
+  <img src="https://dokploy.com/banner.png" alt="Watch the video" width="400" style="border-radius:20px;"/>
 </a>
 
 <!-- ## Supported OS

apps/dokploy/components/dashboard/settings/appearance-form.tsx

@@ -37,7 +37,7 @@ const appearanceFormSchema = z.object({
 	theme: z.enum(["light", "dark", "system"], {
 		required_error: "Please select a theme.",
 	}),
-	language: z.enum(["en", "pl", "zh-Hans"], {
+	language: z.enum(["en", "pl", "ru", "de", "zh-Hant", "zh-Hans"], {
 		required_error: "Please select a language.",
 	}),
 });
@@ -175,6 +175,9 @@ export function AppearanceForm() {
 												{[
 													{ label: "English", value: "en" },
 													{ label: "Polski", value: "pl" },
+													{ label: "Русский", value: "ru" },
+													{ label: "Deutsch", value: "de" },
+													{ label: "繁體中文", value: "zh-Hant" },
 													{ label: "简体中文", value: "zh-Hans" },
 												].map((preset) => (
 													<SelectItem key={preset.label} value={preset.value}>

apps/dokploy/components/dashboard/settings/profile/profile-form.tsx

@@ -16,10 +16,11 @@ import {
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
+import { generateSHA256Hash } from "@/lib/utils";
 import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useTranslation } from "next-i18next";
-import { useEffect } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
@@ -53,6 +54,14 @@ export const ProfileForm = () => {
 	const { data, refetch } = api.auth.get.useQuery();
 	const { mutateAsync, isLoading } = api.auth.update.useMutation();
 	const { t } = useTranslation("settings");
+	const [gravatarHash, setGravatarHash] = useState<string | null>(null);
+
+	const availableAvatars = useMemo(() => {
+		if (gravatarHash === null) return randomImages;
+		return randomImages.concat([
+			`https://www.gravatar.com/avatar/${gravatarHash}`,
+		]);
+	}, [gravatarHash]);
 
 	const form = useForm<Profile>({
 		defaultValues: {
@@ -70,6 +79,12 @@ export const ProfileForm = () => {
 				password: "",
 				image: data?.image || "",
 			});
+
+			if (data.email) {
+				generateSHA256Hash(data.email).then((hash) => {
+					setGravatarHash(hash);
+				});
+			}
 		}
 		form.reset();
 	}, [form, form.reset, data]);
@@ -154,7 +169,7 @@ export const ProfileForm = () => {
 												value={field.value}
 												className="flex flex-row flex-wrap gap-2 max-xl:justify-center"
 											>
-												{randomImages.map((image) => (
+												{availableAvatars.map((image) => (
 													<FormItem key={image}>
 														<FormLabel className="[&:has([data-state=checked])>img]:border-primary [&:has([data-state=checked])>img]:border-1 [&:has([data-state=checked])>img]:p-px cursor-pointer">
 															<FormControl>

apps/dokploy/components/dashboard/settings/web-server/update-server.tsx

@@ -48,8 +48,8 @@ export const UpdateServer = () => {
 						<li>Some bug that is blocking to use some features</li>
 					</ul>
 					<AlertBlock type="info">
-						Please we recommend to see the latest version to see if there are
-						any breaking changes before updating. Go to{" "}
+						We recommend checking the latest version for any breaking changes
+						before updating. Go to{" "}
 						<Link
 							href="https://github.com/Dokploy/dokploy/releases"
 							target="_blank"

apps/dokploy/lib/utils.ts

@@ -4,3 +4,11 @@ import { twMerge } from "tailwind-merge";
 export function cn(...inputs: ClassValue[]) {
 	return twMerge(clsx(inputs));
 }
+
+export async function generateSHA256Hash(text: string) {
+	const encoder = new TextEncoder();
+	const data = encoder.encode(text);
+	const hashBuffer = await crypto.subtle.digest("SHA-256", data);
+	const hashArray = Array.from(new Uint8Array(hashBuffer));
+	return hashArray.map((b) => b.toString(16).padStart(2, "0")).join("");
+}

apps/dokploy/next-i18next.config.cjs

@@ -2,7 +2,7 @@
 module.exports = {
 	i18n: {
 		defaultLocale: "en",
-		locales: ["en", "pl", "zh-Hans"],
+		locales: ["en", "pl", "ru", "de", "zh-Hant", "zh-Hans"],
 		localeDetection: false,
 	},
 	fallbackLng: "en",

apps/dokploy/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dokploy",
-	"version": "v0.12.0",
+	"version": "v0.13.0",
 	"private": true,
 	"license": "Apache-2.0",
 	"type": "module",

apps/dokploy/pages/_app.tsx

@@ -71,7 +71,7 @@ export default api.withTRPC(
 		{
 			i18n: {
 				defaultLocale: "en",
-				locales: ["en", "pl", "zh-Hans"],
+				locales: ["en", "pl", "ru", "de", "zh-Hant", "zh-Hans"],
 				localeDetection: false,
 			},
 			fallbackLng: "en",

apps/dokploy/pages/dashboard/settings/appearance.tsx

@@ -8,7 +8,6 @@ import { createServerSideHelpers } from "@trpc/react-query/server";
 import type { GetServerSidePropsContext } from "next";
 import React, { type ReactElement } from "react";
 import superjson from "superjson";
-import nextI18NextConfig from "../../../next-i18next.config.cjs";
 
 const Page = () => {
 	return (

apps/dokploy/public/locales/de/common.json

@@ -0,0 +1 @@
+{}

apps/dokploy/public/locales/de/settings.json

@@ -0,0 +1,44 @@
+{
+	"settings.common.save": "Speichern",
+	"settings.server.domain.title": "Server-Domain",
+	"settings.server.domain.description": "Füg eine Domain zu deiner Server-Anwendung hinzu.",
+	"settings.server.domain.form.domain": "Domain",
+	"settings.server.domain.form.letsEncryptEmail": "Let's Encrypt E-Mail",
+	"settings.server.domain.form.certificate.label": "Zertifikat",
+	"settings.server.domain.form.certificate.placeholder": "Wähl ein Zertifikat aus",
+	"settings.server.domain.form.certificateOptions.none": "Keins",
+	"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt (Standard)",
+
+	"settings.server.webServer.title": "Web-Server",
+	"settings.server.webServer.description": "Lade den Web-Server neu oder reinige ihn.",
+	"settings.server.webServer.actions": "Aktionen",
+	"settings.server.webServer.reload": "Neu laden",
+	"settings.server.webServer.watchLogs": "Logs anschauen",
+	"settings.server.webServer.updateServerIp": "Server-IP Aktualisieren",
+	"settings.server.webServer.server.label": "Server",
+	"settings.server.webServer.traefik.label": "Traefik",
+	"settings.server.webServer.traefik.modifyEnv": "Umgebungsvariablen ändern",
+	"settings.server.webServer.storage.label": "Speicherplatz",
+	"settings.server.webServer.storage.cleanUnusedImages": "Nicht genutzte Bilder löschen",
+	"settings.server.webServer.storage.cleanUnusedVolumes": "Nicht genutzte Volumes löschen",
+	"settings.server.webServer.storage.cleanStoppedContainers": "Gestoppte Container löschen",
+	"settings.server.webServer.storage.cleanDockerBuilder": "Docker Builder & System bereinigen",
+	"settings.server.webServer.storage.cleanMonitoring": "Monitoring bereinigen",
+	"settings.server.webServer.storage.cleanAll": "Alles bereinigen",
+
+	"settings.profile.title": "Konto",
+	"settings.profile.description": "Ändere die Details deines Profiles hier.",
+	"settings.profile.email": "E-Mail",
+	"settings.profile.password": "Passwort",
+	"settings.profile.avatar": "Avatar",
+
+	"settings.appearance.title": "Aussehen",
+	"settings.appearance.description": "Pass das Design deines Dashboards an.",
+	"settings.appearance.theme": "Theme",
+	"settings.appearance.themeDescription": "Wähl ein Theme für dein Dashboard aus",
+	"settings.appearance.themes.light": "Hell",
+	"settings.appearance.themes.dark": "Dunkel",
+	"settings.appearance.themes.system": "System",
+	"settings.appearance.language": "Sprache",
+	"settings.appearance.languageDescription": "Wähl eine Sprache für dein Dashboard aus"
+}

apps/dokploy/public/locales/ru/common.json

@@ -0,0 +1 @@
+{}

apps/dokploy/public/locales/ru/settings.json

@@ -0,0 +1,44 @@
+{
+	"settings.common.save": "Сохранить",
+	"settings.server.domain.title": "Домен сервера",
+	"settings.server.domain.description": "Установите домен для вашего серверного приложения Dokploy.",
+	"settings.server.domain.form.domain": "Домен",
+	"settings.server.domain.form.letsEncryptEmail": "Email для Let's Encrypt",
+	"settings.server.domain.form.certificate.label": "Сертификат",
+	"settings.server.domain.form.certificate.placeholder": "Выберите сертификат",
+	"settings.server.domain.form.certificateOptions.none": "Нет",
+	"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt (По умолчанию)",
+
+	"settings.server.webServer.title": "Веб-сервер",
+	"settings.server.webServer.description": "Перезагрузка или очистка веб-сервера.",
+	"settings.server.webServer.server.label": "Сервер",
+	"settings.server.webServer.traefik.label": "Traefik",
+	"settings.server.webServer.storage.label": "Дисковое пространство",
+	"settings.server.webServer.actions": "Действия",
+	"settings.server.webServer.reload": "Перезагрузить",
+	"settings.server.webServer.watchLogs": "Просмотр логов",
+	"settings.server.webServer.updateServerIp": "Изменить IP адрес",
+	"settings.server.webServer.traefik.modifyEnv": "Изменить переменные окружения",
+	"settings.server.webServer.storage.cleanUnusedImages": "Очистить неиспользуемые образы",
+	"settings.server.webServer.storage.cleanUnusedVolumes": "Очистить неиспользуемые тома",
+	"settings.server.webServer.storage.cleanStoppedContainers": "Очистить остановленные контейнеры",
+	"settings.server.webServer.storage.cleanDockerBuilder": "Очистить Docker Builder и систему",
+	"settings.server.webServer.storage.cleanMonitoring": "Очистить мониторинг",
+	"settings.server.webServer.storage.cleanAll": "Очистить все",
+
+	"settings.profile.title": "Аккаунт",
+	"settings.profile.description": "Измените данные вашего профиля.",
+	"settings.profile.email": "Email",
+	"settings.profile.password": "Пароль",
+	"settings.profile.avatar": "Аватар",
+
+	"settings.appearance.title": "Внешний вид",
+	"settings.appearance.description": "Настройте тему Dokploy.",
+	"settings.appearance.theme": "Тема",
+	"settings.appearance.themeDescription": "Выберите тему системной панели",
+	"settings.appearance.themes.light": "Светлая",
+	"settings.appearance.themes.dark": "Темная",
+	"settings.appearance.themes.system": "Системная",
+	"settings.appearance.language": "Язык",
+	"settings.appearance.languageDescription": "Select a language for your dashboard"
+}

apps/dokploy/public/locales/zh-Hant/common.json

@@ -0,0 +1 @@
+{}

apps/dokploy/public/locales/zh-Hant/settings.json

@@ -0,0 +1,40 @@
+{
+	"settings.common.save": "儲存",
+	"settings.server.domain.title": "伺服器網域",
+	"settings.server.domain.description": "將一個網域加入到您的伺服器。",
+	"settings.server.domain.form.domain": "網域",
+	"settings.server.domain.form.letsEncryptEmail": "Let's Encrypt 郵箱",
+	"settings.server.domain.form.certificate.label": "憑證",
+	"settings.server.domain.form.certificate.placeholder": "選擇一個憑證",
+	"settings.server.domain.form.certificateOptions.none": "無",
+	"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt (預設)",
+	"settings.server.webServer.title": "Web 伺服器",
+	"settings.server.webServer.description": "管理 Web 伺服器。",
+	"settings.server.webServer.actions": "操作",
+	"settings.server.webServer.reload": "重新載入",
+	"settings.server.webServer.watchLogs": "查看日誌",
+	"settings.server.webServer.server.label": "伺服器",
+	"settings.server.webServer.traefik.label": "Traefik",
+	"settings.server.webServer.traefik.modifyEnv": "修改環境變數",
+	"settings.server.webServer.storage.label": "磁碟空間",
+	"settings.server.webServer.storage.cleanUnusedImages": "清理未使用的映像檔",
+	"settings.server.webServer.storage.cleanUnusedVolumes": "清理未使用的磁碟區",
+	"settings.server.webServer.storage.cleanStoppedContainers": "清理已停止的容器",
+	"settings.server.webServer.storage.cleanDockerBuilder": "清理 Docker Builder 和系統快取",
+	"settings.server.webServer.storage.cleanMonitoring": "清理監控",
+	"settings.server.webServer.storage.cleanAll": "清理所有",
+	"settings.profile.title": "帳戶偏好",
+	"settings.profile.description": "更改您的個人資料詳情。",
+	"settings.profile.email": "電子郵件",
+	"settings.profile.password": "密碼",
+	"settings.profile.avatar": "頭像",
+	"settings.appearance.title": "外觀",
+	"settings.appearance.description": "自訂儀表板主題。",
+	"settings.appearance.theme": "主題",
+	"settings.appearance.themeDescription": "選擇儀表板主題",
+	"settings.appearance.themes.light": "亮",
+	"settings.appearance.themes.dark": "暗",
+	"settings.appearance.themes.system": "系統",
+	"settings.appearance.language": "語言",
+	"settings.appearance.languageDescription": "選擇儀表板語言"
+}