Merge pull request #1182 from Dokploy/fix/disable-turn-off-cleanup

fix: turnoff cleanup cache

apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx

@@ -17,8 +17,15 @@ interface Props {
 	open: boolean;
 	onClose: () => void;
 	serverId?: string;
+	errorMessage?: string;
 }
-export const ShowDeployment = ({ logPath, open, onClose, serverId }: Props) => {
+export const ShowDeployment = ({
+	logPath,
+	open,
+	onClose,
+	serverId,
+	errorMessage,
+}: Props) => {
 	const [data, setData] = useState("");
 	const [showExtraLogs, setShowExtraLogs] = useState(false);
 	const [filteredLogs, setFilteredLogs] = useState<LogLine[]>([]);
@@ -99,6 +106,8 @@ export const ShowDeployment = ({ logPath, open, onClose, serverId }: Props) => {
 		}
 	}, [filteredLogs, autoScroll]);
 
+	const optionalErrors = parseLogs(errorMessage || "");
+
 	return (
 		<Dialog
 			open={open}
@@ -157,9 +166,17 @@ export const ShowDeployment = ({ logPath, open, onClose, serverId }: Props) => {
 							<TerminalLine key={index} log={log} noTimestamp />
 						))
 					) : (
-						<div className="flex justify-center items-center h-full text-muted-foreground">
-							<Loader2 className="h-6 w-6 animate-spin" />
-						</div>
+						<>
+							{optionalErrors.length > 0 ? (
+								optionalErrors.map((log: LogLine, index: number) => (
+									<TerminalLine key={`extra-${index}`} log={log} noTimestamp />
+								))
+							) : (
+								<div className="flex justify-center items-center h-full text-muted-foreground">
+									<Loader2 className="h-6 w-6 animate-spin" />
+								</div>
+							)}
+						</>
 					)}
 				</div>
 			</DialogContent>

apps/dokploy/components/dashboard/application/deployments/show-deployments.tsx

@@ -8,7 +8,7 @@ import {
 	CardHeader,
 	CardTitle,
 } from "@/components/ui/card";
-import { api } from "@/utils/api";
+import { type RouterOutputs, api } from "@/utils/api";
 import { RocketIcon } from "lucide-react";
 import React, { useEffect, useState } from "react";
 import { CancelQueues } from "./cancel-queues";
@@ -18,8 +18,11 @@ import { ShowDeployment } from "./show-deployment";
 interface Props {
 	applicationId: string;
 }
+
 export const ShowDeployments = ({ applicationId }: Props) => {
-	const [activeLog, setActiveLog] = useState<string | null>(null);
+	const [activeLog, setActiveLog] = useState<
+		RouterOutputs["deployment"]["all"][number] | null
+	>(null);
 	const { data } = api.application.one.useQuery({ applicationId });
 	const { data: deployments } = api.deployment.all.useQuery(
 		{ applicationId },
@@ -100,7 +103,7 @@ export const ShowDeployments = ({ applicationId }: Props) => {
 
 									<Button
 										onClick={() => {
-											setActiveLog(deployment.logPath);
+											setActiveLog(deployment);
 										}}
 									>
 										View
@@ -112,9 +115,10 @@ export const ShowDeployments = ({ applicationId }: Props) => {
 				)}
 				<ShowDeployment
 					serverId={data?.serverId || ""}
-					open={activeLog !== null}
+					open={Boolean(activeLog && activeLog.logPath !== null)}
 					onClose={() => setActiveLog(null)}
-					logPath={activeLog}
+					logPath={activeLog?.logPath || ""}
+					errorMessage={activeLog?.errorMessage || ""}
 				/>
 			</CardContent>
 		</Card>

apps/dokploy/components/dashboard/application/preview-deployments/show-preview-builds.tsx

@@ -26,7 +26,9 @@ export const ShowPreviewBuilds = ({
 	serverId,
 	trigger,
 }: Props) => {
-	const [activeLog, setActiveLog] = useState<string | null>(null);
+	const [activeLog, setActiveLog] = useState<
+		RouterOutputs["deployment"]["all"][number] | null
+	>(null);
 	const [isOpen, setIsOpen] = useState(false);
 	return (
 		<Dialog open={isOpen} onOpenChange={setIsOpen}>
@@ -77,7 +79,7 @@ export const ShowPreviewBuilds = ({
 
 								<Button
 									onClick={() => {
-										setActiveLog(deployment.logPath);
+										setActiveLog(deployment);
 									}}
 								>
 									View
@@ -89,9 +91,10 @@ export const ShowPreviewBuilds = ({
 			</DialogContent>
 			<ShowDeployment
 				serverId={serverId || ""}
-				open={activeLog !== null}
+				open={Boolean(activeLog && activeLog.logPath !== null)}
 				onClose={() => setActiveLog(null)}
-				logPath={activeLog}
+				logPath={activeLog?.logPath || ""}
+				errorMessage={activeLog?.errorMessage || ""}
 			/>
 		</Dialog>
 	);

apps/dokploy/components/dashboard/compose/deployments/show-deployment-compose.tsx

@@ -17,12 +17,14 @@ interface Props {
 	serverId?: string;
 	open: boolean;
 	onClose: () => void;
+	errorMessage?: string;
 }
 export const ShowDeploymentCompose = ({
 	logPath,
 	open,
 	onClose,
 	serverId,
+	errorMessage,
 }: Props) => {
 	const [data, setData] = useState("");
 	const [filteredLogs, setFilteredLogs] = useState<LogLine[]>([]);
@@ -105,6 +107,8 @@ export const ShowDeploymentCompose = ({
 		}
 	}, [filteredLogs, autoScroll]);
 
+	const optionalErrors = parseLogs(errorMessage || "");
+
 	return (
 		<Dialog
 			open={open}
@@ -161,9 +165,17 @@ export const ShowDeploymentCompose = ({
 							<TerminalLine key={index} log={log} noTimestamp />
 						))
 					) : (
-						<div className="flex justify-center items-center h-full text-muted-foreground">
-							<Loader2 className="h-6 w-6 animate-spin" />
-						</div>
+						<>
+							{optionalErrors.length > 0 ? (
+								optionalErrors.map((log: LogLine, index: number) => (
+									<TerminalLine key={`extra-${index}`} log={log} noTimestamp />
+								))
+							) : (
+								<div className="flex justify-center items-center h-full text-muted-foreground">
+									<Loader2 className="h-6 w-6 animate-spin" />
+								</div>
+							)}
+						</>
 					)}
 				</div>
 			</DialogContent>

apps/dokploy/components/dashboard/compose/deployments/show-deployments-compose.tsx

@@ -8,7 +8,7 @@ import {
 	CardHeader,
 	CardTitle,
 } from "@/components/ui/card";
-import { api } from "@/utils/api";
+import { type RouterOutputs, api } from "@/utils/api";
 import { RocketIcon } from "lucide-react";
 import React, { useEffect, useState } from "react";
 import { CancelQueuesCompose } from "./cancel-queues-compose";
@@ -19,7 +19,9 @@ interface Props {
 	composeId: string;
 }
 export const ShowDeploymentsCompose = ({ composeId }: Props) => {
-	const [activeLog, setActiveLog] = useState<string | null>(null);
+	const [activeLog, setActiveLog] = useState<
+		RouterOutputs["deployment"]["all"][number] | null
+	>(null);
 	const { data } = api.compose.one.useQuery({ composeId });
 	const { data: deployments } = api.deployment.allByCompose.useQuery(
 		{ composeId },
@@ -100,7 +102,7 @@ export const ShowDeploymentsCompose = ({ composeId }: Props) => {
 
 									<Button
 										onClick={() => {
-											setActiveLog(deployment.logPath);
+											setActiveLog(deployment);
 										}}
 									>
 										View
@@ -112,9 +114,10 @@ export const ShowDeploymentsCompose = ({ composeId }: Props) => {
 				)}
 				<ShowDeploymentCompose
 					serverId={data?.serverId || ""}
-					open={activeLog !== null}
+					open={Boolean(activeLog && activeLog.logPath !== null)}
 					onClose={() => setActiveLog(null)}
-					logPath={activeLog}
+					logPath={activeLog?.logPath || ""}
+					errorMessage={activeLog?.errorMessage || ""}
 				/>
 			</CardContent>
 		</Card>

apps/dokploy/components/dashboard/project/add-template.tsx

@@ -226,7 +226,11 @@ export const AddTemplate = ({ projectId }: Props) => {
 
 				<ScrollArea className="h-[calc(98vh-8rem)]">
 					<div className="p-6">
-						{isError && <AlertBlock type="error">{error?.message}</AlertBlock>}
+						{isError && (
+							<AlertBlock type="error" className="mb-4">
+								{error?.message}
+							</AlertBlock>
+						)}
 
 						{templates.length === 0 ? (
 							<div className="flex justify-center items-center w-full gap-2 min-h-[50vh]">

apps/dokploy/drizzle/0058_brown_sharon_carter.sql

@@ -0,0 +1 @@
+ALTER TABLE "deployment" ADD COLUMN "errorMessage" text;

apps/dokploy/drizzle/0059_striped_bill_hollister.sql

@@ -0,0 +1 @@
+ALTER TABLE "admin" ALTER COLUMN "cleanupCacheApplications" SET DEFAULT false;

apps/dokploy/drizzle/meta/_journal.json

@@ -407,6 +407,20 @@
       "when": 1737306063563,
       "tag": "0057_tricky_living_tribunal",
       "breakpoints": true
+    },
+    {
+      "idx": 58,
+      "version": "6",
+      "when": 1737612903012,
+      "tag": "0058_brown_sharon_carter",
+      "breakpoints": true
+    },
+    {
+      "idx": 59,
+      "version": "6",
+      "when": 1737615160768,
+      "tag": "0059_striped_bill_hollister",
+      "breakpoints": true
     }
   ]
 }

apps/dokploy/lib/languages.ts

@@ -18,6 +18,7 @@ export const Languages = {
 	norwegian: { code: "no", name: "Norsk" },
 	azerbaijani: { code: "az", name: "Azərbaycan" },
 	indonesian: { code: "id", name: "Bahasa Indonesia" },
+	malayalam: { code: "ml", name: "മലയാളം" },
 };
 
 export type Language = keyof typeof Languages;

apps/dokploy/package.json

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

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

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

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

@@ -0,0 +1,58 @@
+{
+	"settings.common.save": "സേവ് ചെയ്യുക",
+	"settings.common.enterTerminal": "ടർമിനലിൽ പ്രവേശിക്കുക",
+	"settings.server.domain.title": "സർവർ ഡോമെയ്ൻ",
+	"settings.server.domain.description": "നിങ്ങളുടെ സർവർ അപ്ലിക്കേഷനിൽ ഒരു ഡോമെയ്ൻ ചേർക്കുക.",
+	"settings.server.domain.form.domain": "ഡോമെയ്ൻ",
+	"settings.server.domain.form.letsEncryptEmail": "ലെറ്റ്സ് എൻക്രിപ്റ്റ് ഇമെയിൽ",
+	"settings.server.domain.form.certificate.label": "സർട്ടിഫിക്കറ്റ് പ്രൊവൈഡർ",
+	"settings.server.domain.form.certificate.placeholder": "ഒരു സർട്ടിഫിക്കറ്റ് തിരഞ്ഞെടുക്കുക",
+	"settings.server.domain.form.certificateOptions.none": "ഒന്നുമില്ല",
+	"settings.server.domain.form.certificateOptions.letsencrypt": "ലെറ്റ്സ് എൻക്രിപ്റ്റ്",
+
+	"settings.server.webServer.title": "വെബ് സർവർ",
+	"settings.server.webServer.description": "വെബ് സർവർ റീലോഡ് ചെയ്യുക അല്ലെങ്കിൽ ശുചീകരിക്കുക.",
+	"settings.server.webServer.actions": "നടപടികൾ",
+	"settings.server.webServer.reload": "റീലോഡ് ചെയ്യുക",
+	"settings.server.webServer.watchLogs": "ലോഗുകൾ കാണുക",
+	"settings.server.webServer.updateServerIp": "സർവർ IP അപ്ഡേറ്റ് ചെയ്യുക",
+	"settings.server.webServer.server.label": "സർവർ",
+	"settings.server.webServer.traefik.label": "ട്രാഫിക്",
+	"settings.server.webServer.traefik.modifyEnv": "ചുറ്റുപാടുകൾ മാറ്റുക",
+	"settings.server.webServer.traefik.managePorts": "അധിക പോർട്ട് മാപ്പിംഗ്",
+	"settings.server.webServer.traefik.managePortsDescription": "ട്രാഫിക്കിനായി അധിക പോർട്ടുകൾ ചേർക്കുക അല്ലെങ്കിൽ നീക്കം ചെയ്യുക",
+	"settings.server.webServer.traefik.targetPort": "ടാർഗറ്റ് പോർട്ട്",
+	"settings.server.webServer.traefik.publishedPort": "പ്രസിദ്ധീകരിച്ച പോർട്ട്",
+	"settings.server.webServer.traefik.addPort": "പോർട്ട് ചേർക്കുക",
+	"settings.server.webServer.traefik.portsUpdated": "പോർട്ടുകൾ വിജയകരമായി അപ്ഡേറ്റ് ചെയ്തു",
+	"settings.server.webServer.traefik.portsUpdateError": "പോർട്ടുകൾ അപ്ഡേറ്റ് ചെയ്യാൻ പരാജയപ്പെട്ടു",
+	"settings.server.webServer.traefik.publishMode": "പ്രസിദ്ധീകരണ മോഡ്",
+	"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": "ഡോക്കർ ബിൽഡറും സിസ്റ്റവും ശുചീകരിക്കുക",
+	"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": "നിങ്ങളുടെ ഡാഷ്ബോർഡിന് ഒരു ഭാഷ തിരഞ്ഞെടുക്കുക",
+
+	"settings.terminal.connectionSettings": "കണക്ഷൻ ക്രമീകരണങ്ങൾ",
+	"settings.terminal.ipAddress": "IP വിലാസം",
+	"settings.terminal.port": "പോർട്ട്",
+	"settings.terminal.username": "ഉപയോക്തൃനാമം"
+}

apps/dokploy/public/templates/twenty.svg

@@ -1,6 +1,12 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 40 40">
-  <g id="ss11151339769_1">
-    <path d="M 0 40 L 0 0 L 40 0 L 40 40 Z" fill="transparent"></path>
-    <path d="M 34.95 0 L 5.05 0 C 2.262 0 0 2.262 0 5.05 L 0 34.95 C 0 37.738 2.262 40 5.05 40 L 34.95 40 C 37.738 40 40 37.738 40 34.95 L 40 5.05 C 40 2.262 37.738 0 34.95 0 Z M 8.021 14.894 C 8.021 12.709 9.794 10.935 11.979 10.935 L 19.6 10.935 C 19.712 10.935 19.815 11.003 19.862 11.106 C 19.909 11.209 19.888 11.329 19.812 11.415 L 18.141 13.229 C 17.85 13.544 17.441 13.726 17.012 13.726 L 12 13.726 C 11.344 13.726 10.812 14.259 10.812 14.915 L 10.812 17.909 C 10.812 18.294 10.5 18.606 10.115 18.606 L 8.721 18.606 C 8.335 18.606 8.024 18.294 8.024 17.909 L 8.024 14.894 Z M 31.729 25.106 C 31.729 27.291 29.956 29.065 27.771 29.065 L 24.532 29.065 C 22.347 29.065 20.574 27.291 20.574 25.106 L 20.574 19.438 C 20.574 19.053 20.718 18.682 20.979 18.397 L 22.868 16.347 C 22.947 16.262 23.071 16.232 23.182 16.274 C 23.291 16.318 23.365 16.421 23.365 16.538 L 23.365 25.088 C 23.365 25.744 23.897 26.276 24.553 26.276 L 27.753 26.276 C 28.409 26.276 28.941 25.744 28.941 25.088 L 28.941 14.915 C 28.941 14.259 28.409 13.726 27.753 13.726 L 24.032 13.726 C 23.606 13.726 23.2 13.906 22.909 14.218 L 11.812 26.276 L 18.479 26.276 C 18.865 26.276 19.176 26.588 19.176 26.974 L 19.176 28.368 C 19.176 28.753 18.865 29.065 18.479 29.065 L 9.494 29.065 C 8.679 29.065 8.018 28.403 8.018 27.588 L 8.018 26.85 C 8.018 26.479 8.156 26.124 8.409 25.85 L 20.85 12.335 C 21.674 11.441 22.829 10.935 24.044 10.935 L 27.768 10.935 C 29.953 10.935 31.726 12.709 31.726 14.894 L 31.726 25.106 Z" fill="rgb(0,0,0)"></path>
-  </g>
+<svg width="136" height="136" viewBox="0 0 136 136" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2343_96406)">
+<path d="M136 2.28882e-05H0L0.000144482 136H136V2.28882e-05ZM27.27 50.6401C27.27 43.2101 33.3 37.1801 40.73 37.1801H66.64C67.02 37.1801 67.37 37.4101 67.53 37.7601C67.69 38.1101 67.62 38.5201 67.36 38.8101L61.68 44.9801C60.69 46.0501 59.3 46.6701 57.84 46.6701H40.8C38.57 46.6701 36.76 48.4801 36.76 50.7101V60.8901C36.76 62.2001 35.7 63.2601 34.39 63.2601H29.65C28.34 63.2601 27.28 62.2001 27.28 60.8901V50.6401H27.27ZM107.88 85.3601C107.88 92.7901 101.85 98.82 94.42 98.82H83.41C75.98 98.82 69.95 92.7901 69.95 85.3601V66.0901C69.95 64.7801 70.44 63.5201 71.33 62.5501L77.75 55.5801C78.02 55.2901 78.44 55.1901 78.82 55.3301C79.19 55.4801 79.44 55.83 79.44 56.23V85.3001C79.44 87.5301 81.25 89.3401 83.48 89.3401H94.36C96.59 89.3401 98.4 87.5301 98.4 85.3001V50.7101C98.4 48.4801 96.59 46.6701 94.36 46.6701H81.71C80.26 46.6701 78.88 47.2801 77.89 48.3401L40.16 89.3401H62.83C64.14 89.3401 65.2 90.4001 65.2 91.7101V96.4501C65.2 97.7601 64.14 98.82 62.83 98.82H32.28C29.51 98.82 27.26 96.5701 27.26 93.8001V91.29C27.26 90.03 27.73 88.8201 28.59 87.8901L70.89 41.9401C73.69 38.9001 77.62 37.1801 81.75 37.1801H94.41C101.84 37.1801 107.87 43.2101 107.87 50.6401V85.3601H107.88Z" fill="black"/>
+<path d="M27.27 50.6401C27.27 43.2101 33.3 37.1801 40.73 37.1801H66.64C67.02 37.1801 67.37 37.4101 67.53 37.7601C67.69 38.1101 67.62 38.5201 67.36 38.8101L61.68 44.9801C60.69 46.0501 59.3 46.6701 57.84 46.6701H40.8C38.57 46.6701 36.76 48.4801 36.76 50.7101V60.8901C36.76 62.2001 35.7 63.2601 34.39 63.2601H29.65C28.34 63.2601 27.28 62.2001 27.28 60.8901V50.6401H27.27Z" fill="white"/>
+<path d="M107.88 85.3601C107.88 92.7901 101.85 98.82 94.42 98.82H83.41C75.98 98.82 69.95 92.7901 69.95 85.3601V66.0901C69.95 64.7801 70.44 63.5201 71.33 62.5501L77.75 55.5801C78.02 55.2901 78.44 55.1901 78.82 55.3301C79.19 55.4801 79.44 55.83 79.44 56.23V85.3001C79.44 87.5301 81.25 89.3401 83.48 89.3401H94.36C96.59 89.3401 98.4 87.5301 98.4 85.3001V50.7101C98.4 48.4801 96.59 46.6701 94.36 46.6701H81.71C80.26 46.6701 78.88 47.2801 77.89 48.3401L40.16 89.3401H62.83C64.14 89.3401 65.2 90.4001 65.2 91.7101V96.4501C65.2 97.7601 64.14 98.82 62.83 98.82H32.28C29.51 98.82 27.26 96.5701 27.26 93.8001V91.29C27.26 90.03 27.73 88.8201 28.59 87.8901L70.89 41.9401C73.69 38.9001 77.62 37.1801 81.75 37.1801H94.41C101.84 37.1801 107.87 43.2101 107.87 50.6401V85.3601H107.88Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2343_96406">
+<rect width="136" height="136" rx="16" fill="white"/>
+</clipPath>
+</defs>
 </svg>

apps/dokploy/templates/glance/docker-compose.yml

@@ -0,0 +1,8 @@
+services:
+  glance:
+    image: glanceapp/glance
+    volumes:
+      - ../files/app/glance.yml:/app/glance.yml
+    ports:
+      - 8080
+    restart: unless-stopped

apps/dokploy/templates/glance/index.ts

@@ -0,0 +1,108 @@
+import {
+	type DomainSchema,
+	type Schema,
+	type Template,
+	generateRandomDomain,
+} from "../utils";
+
+export function generate(schema: Schema): Template {
+	const mainDomain = generateRandomDomain(schema);
+	const domains: DomainSchema[] = [
+		{
+			host: mainDomain,
+			port: 8080,
+			serviceName: "glance",
+		},
+	];
+
+	const mounts: Template["mounts"] = [
+		{
+			filePath: "/app/glance.yml",
+			content: `
+branding:
+  hide-footer: true
+  logo-text: P
+
+pages:
+  - name: Home
+    columns:
+      - size: small
+        widgets:
+          - type: calendar
+
+          - type: releases
+            show-source-icon: true
+            repositories:
+              - Dokploy/dokploy
+              - n8n-io/n8n
+              - Budibase/budibase
+              - home-assistant/core
+              - tidbyt/pixlet
+
+          - type: twitch-channels
+            channels:
+              - nmplol
+              - extraemily
+              - qtcinderella
+              - ludwig
+              - timthetatman
+              - mizkif
+
+      - size: full
+        widgets:
+          - type: hacker-news
+
+          - type: videos
+            style: grid-cards
+            channels:
+              - UC3GzdWYwUYI1ACxuP9Nm-eg
+              - UCGbg3DjQdcqWwqOLHpYHXIg
+              - UC24RSoLcjiNZbQcT54j5l7Q
+            limit: 3
+
+          - type: rss
+            limit: 10
+            collapse-after: 3
+            cache: 3h
+            feeds:
+              - url: https://daringfireball.net/feeds/main
+                title: Daring Fireball
+        
+      - size: small
+        widgets:
+          - type: weather
+            location: Gansevoort, New York, United States
+            show-area-name: false
+            units: imperial
+            hour-format: 12h
+
+          - type: markets
+            markets:
+              - symbol: SPY
+                name: S&P 500
+              - symbol: VOO
+                name: Vanguard
+              - symbol: BTC-USD
+                name: Bitcoin
+              - symbol: ETH-USD
+                name: Etherium
+              - symbol: NVDA
+                name: NVIDIA
+              - symbol: AAPL
+                name: Apple
+              - symbol: MSFT
+                name: Microsoft
+              - symbol: GOOGL
+                name: Google
+              - symbol: AMD
+                name: AMD
+              - symbol: TSLA
+                name: Tesla`,
+		},
+	];
+
+	return {
+		domains,
+		mounts,
+	};
+}

apps/dokploy/templates/homarr/docker-compose.yml

@@ -0,0 +1,11 @@
+services:
+  homarr:
+    image: ghcr.io/homarr-labs/homarr:latest
+    restart: unless-stopped
+    volumes:
+      # - /var/run/docker.sock:/var/run/docker.sock # Optional, only if you want docker integration
+      - ../homarr/appdata:/appdata
+    environment:
+      - SECRET_ENCRYPTION_KEY=${SECRET_ENCRYPTION_KEY}
+    ports:
+      - 7575

apps/dokploy/templates/homarr/index.ts

@@ -0,0 +1,27 @@
+import {
+	type DomainSchema,
+	type Schema,
+	type Template,
+	generatePassword,
+	generateRandomDomain,
+} from "../utils";
+
+export function generate(schema: Schema): Template {
+	const mainDomain = generateRandomDomain(schema);
+	const secretKey = generatePassword(64);
+
+	const domains: DomainSchema[] = [
+		{
+			host: mainDomain,
+			port: 7575,
+			serviceName: "homarr",
+		},
+	];
+
+	const envs = [`SECRET_ENCRYPTION_KEY=${secretKey}`];
+
+	return {
+		domains,
+		envs,
+	};
+}

apps/dokploy/templates/templates.ts

@@ -1074,7 +1074,7 @@ export const templates: TemplateData[] = [
 			website: "https://penpot.app/",
 			docs: "https://docs.penpot.app/",
 		},
-		tags: ["desing", "collaboration"],
+		tags: ["design", "collaboration"],
 		load: () => import("./penpot/index").then((m) => m.generate),
 	},
 	{
@@ -1097,7 +1097,7 @@ export const templates: TemplateData[] = [
 		name: "Unsend",
 		version: "v1.2.4",
 		description: "Open source alternative to Resend,Sendgrid, Postmark etc. ",
-		logo: "unsend.png", // we defined the name and the extension of the logo
+		logo: "unsend.png",
 		links: {
 			github: "https://github.com/unsend-dev/unsend",
 			website: "https://unsend.dev/",
@@ -1276,11 +1276,11 @@ export const templates: TemplateData[] = [
 		version: "latest",
 		description:
 			"CouchDB is a document-oriented NoSQL database that excels at replication and horizontal scaling.",
-		logo: "couchdb.png", // we defined the name and the extension of the logo
+		logo: "couchdb.png",
 		links: {
-			github: "lorem",
-			website: "lorem",
-			docs: "lorem",
+			github: "https://github.com/apache/couchdb",
+			website: "https://couchdb.apache.org/",
+			docs: "https://docs.couchdb.org/en/stable/",
 		},
 		tags: ["database", "storage"],
 		load: () => import("./couchdb/index").then((m) => m.generate),
@@ -1312,4 +1312,33 @@ export const templates: TemplateData[] = [
 		tags: ["analytics", "bi", "dashboard", "database", "sql"],
 		load: () => import("./superset/index").then((m) => m.generate),
 	},
+	{
+		id: "glance",
+		name: "Glance",
+		version: "latest",
+		description:
+			"A self-hosted dashboard that puts all your feeds in one place. Features RSS feeds, weather, bookmarks, site monitoring, and more in a minimal, fast interface.",
+		logo: "glance.png",
+		links: {
+			github: "https://github.com/glanceapp/glance",
+			docs: "https://github.com/glanceapp/glance/blob/main/docs/configuration.md",
+		},
+		tags: ["dashboard", "monitoring", "widgets", "rss"],
+		load: () => import("./glance/index").then((m) => m.generate),
+	},
+	{
+		id: "homarr",
+		name: "Homarr",
+		version: "latest",
+		description:
+			"A sleek, modern dashboard that puts all your apps and services in one place with Docker integration.",
+		logo: "homarr.png",
+		links: {
+			github: "https://github.com/homarr-labs/homarr",
+			docs: "https://homarr.dev/docs/getting-started/installation/docker",
+			website: "https://homarr.dev/",
+		},
+		tags: ["dashboard", "monitoring"],
+		load: () => import("./homarr/index").then((m) => m.generate),
+	},
 ];

packages/server/src/db/schema/admin.ts

@@ -33,7 +33,7 @@ export const admins = pgTable("admin", {
 	serversQuantity: integer("serversQuantity").notNull().default(0),
 	cleanupCacheApplications: boolean("cleanupCacheApplications")
 		.notNull()
-		.default(true),
+		.default(false),
 	cleanupCacheOnPreviews: boolean("cleanupCacheOnPreviews")
 		.notNull()
 		.default(false),

packages/server/src/db/schema/deployment.ts

@@ -47,6 +47,7 @@ export const deployments = pgTable("deployment", {
 	createdAt: text("createdAt")
 		.notNull()
 		.$defaultFn(() => new Date().toISOString()),
+	errorMessage: text("errorMessage"),
 });
 
 export const deploymentsRelations = relations(deployments, ({ one }) => ({

packages/server/src/services/application.ts

@@ -577,6 +577,8 @@ export const deployRemotePreviewApplication = async ({
 			if (application.sourceType === "github") {
 				command += await getGithubCloneCommand({
 					...application,
+					appName: previewDeployment.appName,
+					branch: previewDeployment.branch,
 					serverId: application.serverId,
 					logPath: deployment.logPath,
 				});

packages/server/src/services/deployment.ts

@@ -98,6 +98,17 @@ export const createDeployment = async (
 		}
 		return deploymentCreate[0];
 	} catch (error) {
+		await db
+			.insert(deployments)
+			.values({
+				applicationId: deployment.applicationId,
+				title: deployment.title || "Deployment",
+				status: "error",
+				logPath: "",
+				description: deployment.description || "",
+				errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`,
+			})
+			.returning();
 		await updateApplicationStatus(application.applicationId, "error");
 		console.log(error);
 		throw new TRPCError({
@@ -164,6 +175,17 @@ export const createDeploymentPreview = async (
 		}
 		return deploymentCreate[0];
 	} catch (error) {
+		await db
+			.insert(deployments)
+			.values({
+				previewDeploymentId: deployment.previewDeploymentId,
+				title: deployment.title || "Deployment",
+				status: "error",
+				logPath: "",
+				description: deployment.description || "",
+				errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`,
+			})
+			.returning();
 		await updatePreviewDeployment(deployment.previewDeploymentId, {
 			previewStatus: "error",
 		});
@@ -226,6 +248,17 @@ echo "Initializing deployment" >> ${logFilePath};
 		}
 		return deploymentCreate[0];
 	} catch (error) {
+		await db
+			.insert(deployments)
+			.values({
+				composeId: deployment.composeId,
+				title: deployment.title || "Deployment",
+				status: "error",
+				logPath: "",
+				description: deployment.description || "",
+				errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`,
+			})
+			.returning();
 		await updateCompose(compose.composeId, {
 			composeStatus: "error",
 		});

packages/server/src/services/mount.ts

@@ -64,7 +64,7 @@ export const createMount = async (input: typeof apiCreateMount._type) => {
 		console.log(error);
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error creating the mount",
+			message: `Error ${error instanceof Error ? error.message : error}`,
 			cause: error,
 		});
 	}
@@ -91,7 +91,7 @@ export const createFileMount = async (mountId: string) => {
 		console.log(`Error creating the file mount: ${error}`);
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error creating the mount",
+			message: `Error creating the mount ${error instanceof Error ? error.message : error}`,
 			cause: error,
 		});
 	}