Optimize ubuntu image pull to only happen when image is missing

Co-authored-by: Siumauricio <47042324+Siumauricio@users.noreply.github.com>

apps/dokploy/__test__/cluster/upload.test.ts

@@ -206,38 +206,4 @@ describe("getRegistryTag", () => {
 			expect(result).toBe("docker.io/myuser/repo");
 		});
 	});
-
-	describe("special characters in username", () => {
-		it("should handle Harbor robot account username with $ (e.g. robot$library+dokploy)", () => {
-			const registry = createMockRegistry({
-				username: "robot$library+dokploy",
-			});
-			const result = getRegistryTag(registry, "nginx");
-			expect(result).toBe("docker.io/robot$library+dokploy/nginx");
-		});
-
-		it("should handle username with $ and other special characters", () => {
-			const registry = createMockRegistry({
-				username: "robot$test+app",
-			});
-			const result = getRegistryTag(registry, "myapp:latest");
-			expect(result).toBe("docker.io/robot$test+app/myapp:latest");
-		});
-
-		it("should handle username with multiple $ symbols", () => {
-			const registry = createMockRegistry({
-				username: "user$name$test",
-			});
-			const result = getRegistryTag(registry, "app");
-			expect(result).toBe("docker.io/user$name$test/app");
-		});
-
-		it("should handle username with + and - symbols", () => {
-			const registry = createMockRegistry({
-				username: "robot+test-user",
-			});
-			const result = getRegistryTag(registry, "nginx:latest");
-			expect(result).toBe("docker.io/robot+test-user/nginx:latest");
-		});
-	});
 });

apps/dokploy/__test__/compose/domain/host-rule-format.test.ts

@@ -1,7 +1,7 @@
 import type { Domain } from "@dokploy/server";
 import { createDomainLabels } from "@dokploy/server";
-import { describe, expect, it } from "vitest";
 import { parse, stringify } from "yaml";
+import { describe, expect, it } from "vitest";
 
 /**
  * Regression tests for Traefik Host rule label format.

apps/dokploy/__test__/traefik/server/update-server-config.test.ts

@@ -5,27 +5,21 @@ vi.mock("node:fs", () => ({
 	default: fs,
 }));
 
-import type { FileConfig } from "@dokploy/server";
+import type { FileConfig, User } from "@dokploy/server";
 import {
 	createDefaultServerTraefikConfig,
 	loadOrCreateConfig,
 	updateServerTraefik,
 } from "@dokploy/server";
-import type { webServerSettings } from "@dokploy/server/db/schema";
 import { beforeEach, expect, test, vi } from "vitest";
 
-type WebServerSettings = typeof webServerSettings.$inferSelect;
-
-const baseSettings: WebServerSettings = {
-	id: "",
+const baseAdmin: User = {
 	https: false,
-	certificateType: "none",
-	host: null,
-	serverIp: null,
-	letsEncryptEmail: null,
-	sshPrivateKey: null,
-	enableDockerCleanup: false,
-	logCleanupCron: null,
+	enablePaidFeatures: false,
+	allowImpersonation: false,
+	role: "user",
+	firstName: "",
+	lastName: "",
 	metricsConfig: {
 		containers: {
 			refreshRate: 20,
@@ -51,8 +45,29 @@ const baseSettings: WebServerSettings = {
 	cleanupCacheApplications: false,
 	cleanupCacheOnCompose: false,
 	cleanupCacheOnPreviews: false,
-	createdAt: null,
+	createdAt: new Date(),
+	serverIp: null,
+	certificateType: "none",
+	host: null,
+	letsEncryptEmail: null,
+	sshPrivateKey: null,
+	enableDockerCleanup: false,
+	logCleanupCron: null,
+	serversQuantity: 0,
+	stripeCustomerId: "",
+	stripeSubscriptionId: "",
+	banExpires: new Date(),
+	banned: true,
+	banReason: "",
+	email: "",
+	expirationDate: "",
+	id: "",
+	isRegistered: false,
+	createdAt2: new Date().toISOString(),
+	emailVerified: false,
+	image: "",
 	updatedAt: new Date(),
+	twoFactorEnabled: false,
 };
 
 beforeEach(() => {
@@ -70,7 +85,7 @@ test("Should read the configuration file", () => {
 test("Should apply redirect-to-https", () => {
 	updateServerTraefik(
 		{
-			...baseSettings,
+			...baseAdmin,
 			https: true,
 			certificateType: "letsencrypt",
 		},
@@ -85,7 +100,7 @@ test("Should apply redirect-to-https", () => {
 });
 
 test("Should change only host when no certificate", () => {
-	updateServerTraefik(baseSettings, "example.com");
+	updateServerTraefik(baseAdmin, "example.com");
 
 	const config: FileConfig = loadOrCreateConfig("dokploy");
 
@@ -95,7 +110,7 @@ test("Should change only host when no certificate", () => {
 test("Should not touch config without host", () => {
 	const originalConfig: FileConfig = loadOrCreateConfig("dokploy");
 
-	updateServerTraefik(baseSettings, null);
+	updateServerTraefik(baseAdmin, null);
 
 	const config: FileConfig = loadOrCreateConfig("dokploy");
 
@@ -104,14 +119,11 @@ test("Should not touch config without host", () => {
 
 test("Should remove websecure if https rollback to http", () => {
 	updateServerTraefik(
-		{ ...baseSettings, certificateType: "letsencrypt" },
+		{ ...baseAdmin, certificateType: "letsencrypt" },
 		"example.com",
 	);
 
-	updateServerTraefik(
-		{ ...baseSettings, certificateType: "none" },
-		"example.com",
-	);
+	updateServerTraefik({ ...baseAdmin, certificateType: "none" }, "example.com");
 
 	const config: FileConfig = loadOrCreateConfig("dokploy");
 

apps/dokploy/components/dashboard/application/advanced/show-resources.tsx

@@ -21,10 +21,7 @@ import {
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
-import {
-	createConverter,
-	NumberInputWithSteps,
-} from "@/components/ui/number-input";
+import { Input } from "@/components/ui/input";
 import {
 	Tooltip,
 	TooltipContent,
@@ -33,23 +30,6 @@ import {
 } from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
 
-const CPU_STEP = 0.25;
-const MEMORY_STEP_MB = 256;
-
-const formatNumber = (value: number, decimals = 2): string =>
-	Number.isInteger(value) ? String(value) : value.toFixed(decimals);
-
-const cpuConverter = createConverter(1_000_000_000, (cpu) =>
-	cpu <= 0 ? "" : `${formatNumber(cpu)} CPU`,
-);
-
-const memoryConverter = createConverter(1024 * 1024, (mb) => {
-	if (mb <= 0) return "";
-	return mb >= 1024
-		? `${formatNumber(mb / 1024)} GB`
-		: `${formatNumber(mb)} MB`;
-});
-
 const addResourcesSchema = z.object({
 	memoryReservation: z.string().optional(),
 	cpuLimit: z.string().optional(),
@@ -71,7 +51,6 @@ interface Props {
 }
 
 type AddResources = z.infer<typeof addResourcesSchema>;
-
 export const ShowResources = ({ id, type }: Props) => {
 	const queryMap = {
 		postgres: () =>
@@ -184,20 +163,16 @@ export const ShowResources = ({ id, type }: Props) => {
 														<TooltipContent>
 															<p>
 																Memory hard limit in bytes. Example: 1GB =
-																1073741824 bytes. Use +/- buttons to adjust by
-																256 MB.
+																1073741824 bytes
 															</p>
 														</TooltipContent>
 													</Tooltip>
 												</TooltipProvider>
 											</div>
 											<FormControl>
-												<NumberInputWithSteps
-													value={field.value}
-													onChange={field.onChange}
+												<Input
 													placeholder="1073741824 (1GB in bytes)"
-													step={MEMORY_STEP_MB}
-													converter={memoryConverter}
+													{...field}
 												/>
 											</FormControl>
 											<FormMessage />
@@ -223,20 +198,16 @@ export const ShowResources = ({ id, type }: Props) => {
 													<TooltipContent>
 														<p>
 															Memory soft limit in bytes. Example: 256MB =
-															268435456 bytes. Use +/- buttons to adjust by 256
-															MB.
+															268435456 bytes
 														</p>
 													</TooltipContent>
 												</Tooltip>
 											</TooltipProvider>
 										</div>
 										<FormControl>
-											<NumberInputWithSteps
-												value={field.value}
-												onChange={field.onChange}
+											<Input
 												placeholder="268435456 (256MB in bytes)"
-												step={MEMORY_STEP_MB}
-												converter={memoryConverter}
+												{...field}
 											/>
 										</FormControl>
 										<FormMessage />
@@ -263,20 +234,17 @@ export const ShowResources = ({ id, type }: Props) => {
 														<TooltipContent>
 															<p>
 																CPU quota in units of 10^-9 CPUs. Example: 2
-																CPUs = 2000000000. Use +/- buttons to adjust by
-																0.25 CPU.
+																CPUs = 2000000000
 															</p>
 														</TooltipContent>
 													</Tooltip>
 												</TooltipProvider>
 											</div>
 											<FormControl>
-												<NumberInputWithSteps
-													value={field.value}
-													onChange={field.onChange}
+												<Input
 													placeholder="2000000000 (2 CPUs)"
-													step={CPU_STEP}
-													converter={cpuConverter}
+													{...field}
+													value={field.value?.toString() || ""}
 												/>
 											</FormControl>
 											<FormMessage />
@@ -303,21 +271,14 @@ export const ShowResources = ({ id, type }: Props) => {
 														<TooltipContent>
 															<p>
 																CPU shares (relative weight). Example: 1 CPU =
-																1000000000. Use +/- buttons to adjust by 0.25
-																CPU.
+																1000000000
 															</p>
 														</TooltipContent>
 													</Tooltip>
 												</TooltipProvider>
 											</div>
 											<FormControl>
-												<NumberInputWithSteps
-													value={field.value}
-													onChange={field.onChange}
-													placeholder="1000000000 (1 CPU)"
-													step={CPU_STEP}
-													converter={cpuConverter}
-												/>
+												<Input placeholder="1000000000 (1 CPU)" {...field} />
 											</FormControl>
 											<FormMessage />
 										</FormItem>

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

@@ -123,7 +123,7 @@ export const ShowPreviewSettings = ({ applicationId }: Props) => {
 				previewCertificateType: data.previewCertificateType || "none",
 				previewCustomCertResolver: data.previewCustomCertResolver || "",
 				previewRequireCollaboratorPermissions:
-					data.previewRequireCollaboratorPermissions ?? true,
+					data.previewRequireCollaboratorPermissions || true,
 			});
 		}
 	}, [data]);

apps/dokploy/components/dashboard/application/schedules/handle-schedules.tsx

@@ -1,7 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import {
-	CheckIcon,
-	ChevronsUpDown,
 	DatabaseZap,
 	Info,
 	PenBoxIcon,
@@ -15,14 +13,6 @@ import { z } from "zod";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { CodeEditor } from "@/components/shared/code-editor";
 import { Button } from "@/components/ui/button";
-import {
-	Command,
-	CommandEmpty,
-	CommandGroup,
-	CommandInput,
-	CommandItem,
-	CommandList,
-} from "@/components/ui/command";
 import {
 	Dialog,
 	DialogContent,
@@ -41,12 +31,6 @@ import {
 	FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
-import {
-	Popover,
-	PopoverContent,
-	PopoverTrigger,
-} from "@/components/ui/popover";
-import { ScrollArea } from "@/components/ui/scroll-area";
 import {
 	Select,
 	SelectContent,
@@ -64,7 +48,6 @@ import {
 import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
 import type { CacheType } from "../domains/handle-domain";
-import { getTimezoneLabel, TIMEZONES } from "./timezones";
 
 export const commonCronExpressions = [
 	{ label: "Every minute", value: "* * * * *" },
@@ -77,6 +60,30 @@ export const commonCronExpressions = [
 	{ label: "Custom", value: "custom" },
 ];
 
+export const commonTimezones = [
+	{ label: "UTC (Coordinated Universal Time)", value: "UTC" },
+	{ label: "America/New_York (Eastern Time)", value: "America/New_York" },
+	{ label: "America/Chicago (Central Time)", value: "America/Chicago" },
+	{ label: "America/Denver (Mountain Time)", value: "America/Denver" },
+	{ label: "America/Los_Angeles (Pacific Time)", value: "America/Los_Angeles" },
+	{
+		label: "America/Mexico_City (Central Mexico)",
+		value: "America/Mexico_City",
+	},
+	{ label: "America/Sao_Paulo (Brasilia Time)", value: "America/Sao_Paulo" },
+	{ label: "Europe/London (Greenwich Mean Time)", value: "Europe/London" },
+	{ label: "Europe/Paris (Central European Time)", value: "Europe/Paris" },
+	{ label: "Europe/Berlin (Central European Time)", value: "Europe/Berlin" },
+	{ label: "Asia/Tokyo (Japan Standard Time)", value: "Asia/Tokyo" },
+	{ label: "Asia/Shanghai (China Standard Time)", value: "Asia/Shanghai" },
+	{ label: "Asia/Dubai (Gulf Standard Time)", value: "Asia/Dubai" },
+	{ label: "Asia/Kolkata (India Standard Time)", value: "Asia/Kolkata" },
+	{
+		label: "Australia/Sydney (Australian Eastern Time)",
+		value: "Australia/Sydney",
+	},
+];
+
 const formSchema = z
 	.object({
 		name: z.string().min(1, "Name is required"),
@@ -505,60 +512,25 @@ export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
 											</Tooltip>
 										</TooltipProvider>
 									</FormLabel>
-									<Popover>
-										<PopoverTrigger asChild>
-											<FormControl>
-												<Button
-													variant="outline"
-													className={cn(
-														"w-full justify-between !bg-input",
-														!field.value && "text-muted-foreground",
-													)}
-												>
-													{getTimezoneLabel(field.value)}
-													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-												</Button>
-											</FormControl>
-										</PopoverTrigger>
-										<PopoverContent className="w-[400px] p-0" align="start">
-											<Command>
-												<CommandInput
-													placeholder="Search timezone..."
-													className="h-9"
-												/>
-												<CommandList>
-													<CommandEmpty>No timezone found.</CommandEmpty>
-													<ScrollArea className="h-72">
-														{Object.entries(TIMEZONES).map(
-															([region, zones]) => (
-																<CommandGroup key={region} heading={region}>
-																	{zones.map((tz) => (
-																		<CommandItem
-																			key={tz.value}
-																			value={`${region} ${tz.label} ${tz.value}`}
-																			onSelect={() => {
-																				field.onChange(tz.value);
-																			}}
-																		>
-																			{tz.value}
-																			<CheckIcon
-																				className={cn(
-																					"ml-auto h-4 w-4",
-																					field.value === tz.value
-																						? "opacity-100"
-																						: "opacity-0",
-																				)}
-																			/>
-																		</CommandItem>
-																	))}
-																</CommandGroup>
-															),
-														)}
-													</ScrollArea>
-												</CommandList>
-											</Command>
-										</PopoverContent>
-									</Popover>
+									<Select
+										onValueChange={(value) => {
+											field.onChange(value);
+										}}
+										value={field.value}
+									>
+										<FormControl>
+											<SelectTrigger>
+												<SelectValue placeholder="UTC (default)" />
+											</SelectTrigger>
+										</FormControl>
+										<SelectContent>
+											{commonTimezones.map((tz) => (
+												<SelectItem key={tz.value} value={tz.value}>
+													{tz.label}
+												</SelectItem>
+											))}
+										</SelectContent>
+									</Select>
 									<FormDescription>
 										Optional: Choose a timezone for the schedule execution time
 									</FormDescription>

apps/dokploy/components/dashboard/application/schedules/timezones.ts

@@ -1,458 +0,0 @@
-// Complete list of IANA timezones grouped by region
-export const TIMEZONES: Record<
-	string,
-	Array<{ label: string; value: string }>
-> = {
-	Common: [{ label: "UTC (Coordinated Universal Time)", value: "UTC" }],
-	Africa: [
-		{ label: "Abidjan", value: "Africa/Abidjan" },
-		{ label: "Accra", value: "Africa/Accra" },
-		{ label: "Addis Ababa", value: "Africa/Addis_Ababa" },
-		{ label: "Algiers", value: "Africa/Algiers" },
-		{ label: "Asmara", value: "Africa/Asmara" },
-		{ label: "Bamako", value: "Africa/Bamako" },
-		{ label: "Bangui", value: "Africa/Bangui" },
-		{ label: "Banjul", value: "Africa/Banjul" },
-		{ label: "Bissau", value: "Africa/Bissau" },
-		{ label: "Blantyre", value: "Africa/Blantyre" },
-		{ label: "Brazzaville", value: "Africa/Brazzaville" },
-		{ label: "Bujumbura", value: "Africa/Bujumbura" },
-		{ label: "Cairo", value: "Africa/Cairo" },
-		{ label: "Casablanca", value: "Africa/Casablanca" },
-		{ label: "Ceuta", value: "Africa/Ceuta" },
-		{ label: "Conakry", value: "Africa/Conakry" },
-		{ label: "Dakar", value: "Africa/Dakar" },
-		{ label: "Dar es Salaam", value: "Africa/Dar_es_Salaam" },
-		{ label: "Djibouti", value: "Africa/Djibouti" },
-		{ label: "Douala", value: "Africa/Douala" },
-		{ label: "El Aaiun", value: "Africa/El_Aaiun" },
-		{ label: "Freetown", value: "Africa/Freetown" },
-		{ label: "Gaborone", value: "Africa/Gaborone" },
-		{ label: "Harare", value: "Africa/Harare" },
-		{ label: "Johannesburg", value: "Africa/Johannesburg" },
-		{ label: "Juba", value: "Africa/Juba" },
-		{ label: "Kampala", value: "Africa/Kampala" },
-		{ label: "Khartoum", value: "Africa/Khartoum" },
-		{ label: "Kigali", value: "Africa/Kigali" },
-		{ label: "Kinshasa", value: "Africa/Kinshasa" },
-		{ label: "Lagos", value: "Africa/Lagos" },
-		{ label: "Libreville", value: "Africa/Libreville" },
-		{ label: "Lome", value: "Africa/Lome" },
-		{ label: "Luanda", value: "Africa/Luanda" },
-		{ label: "Lubumbashi", value: "Africa/Lubumbashi" },
-		{ label: "Lusaka", value: "Africa/Lusaka" },
-		{ label: "Malabo", value: "Africa/Malabo" },
-		{ label: "Maputo", value: "Africa/Maputo" },
-		{ label: "Maseru", value: "Africa/Maseru" },
-		{ label: "Mbabane", value: "Africa/Mbabane" },
-		{ label: "Mogadishu", value: "Africa/Mogadishu" },
-		{ label: "Monrovia", value: "Africa/Monrovia" },
-		{ label: "Nairobi", value: "Africa/Nairobi" },
-		{ label: "Ndjamena", value: "Africa/Ndjamena" },
-		{ label: "Niamey", value: "Africa/Niamey" },
-		{ label: "Nouakchott", value: "Africa/Nouakchott" },
-		{ label: "Ouagadougou", value: "Africa/Ouagadougou" },
-		{ label: "Porto-Novo", value: "Africa/Porto-Novo" },
-		{ label: "Sao Tome", value: "Africa/Sao_Tome" },
-		{ label: "Tripoli", value: "Africa/Tripoli" },
-		{ label: "Tunis", value: "Africa/Tunis" },
-		{ label: "Windhoek", value: "Africa/Windhoek" },
-	],
-	America: [
-		{ label: "Adak", value: "America/Adak" },
-		{ label: "Anchorage", value: "America/Anchorage" },
-		{ label: "Anguilla", value: "America/Anguilla" },
-		{ label: "Antigua", value: "America/Antigua" },
-		{ label: "Araguaina", value: "America/Araguaina" },
-		{
-			label: "Argentina/Buenos Aires",
-			value: "America/Argentina/Buenos_Aires",
-		},
-		{ label: "Argentina/Catamarca", value: "America/Argentina/Catamarca" },
-		{ label: "Argentina/Cordoba", value: "America/Argentina/Cordoba" },
-		{ label: "Argentina/Jujuy", value: "America/Argentina/Jujuy" },
-		{ label: "Argentina/La Rioja", value: "America/Argentina/La_Rioja" },
-		{ label: "Argentina/Mendoza", value: "America/Argentina/Mendoza" },
-		{
-			label: "Argentina/Rio Gallegos",
-			value: "America/Argentina/Rio_Gallegos",
-		},
-		{ label: "Argentina/Salta", value: "America/Argentina/Salta" },
-		{ label: "Argentina/San Juan", value: "America/Argentina/San_Juan" },
-		{ label: "Argentina/San Luis", value: "America/Argentina/San_Luis" },
-		{ label: "Argentina/Tucuman", value: "America/Argentina/Tucuman" },
-		{ label: "Argentina/Ushuaia", value: "America/Argentina/Ushuaia" },
-		{ label: "Aruba", value: "America/Aruba" },
-		{ label: "Asuncion", value: "America/Asuncion" },
-		{ label: "Atikokan", value: "America/Atikokan" },
-		{ label: "Bahia", value: "America/Bahia" },
-		{ label: "Bahia Banderas", value: "America/Bahia_Banderas" },
-		{ label: "Barbados", value: "America/Barbados" },
-		{ label: "Belem", value: "America/Belem" },
-		{ label: "Belize", value: "America/Belize" },
-		{ label: "Blanc-Sablon", value: "America/Blanc-Sablon" },
-		{ label: "Boa Vista", value: "America/Boa_Vista" },
-		{ label: "Bogota", value: "America/Bogota" },
-		{ label: "Boise", value: "America/Boise" },
-		{ label: "Cambridge Bay", value: "America/Cambridge_Bay" },
-		{ label: "Campo Grande", value: "America/Campo_Grande" },
-		{ label: "Cancun", value: "America/Cancun" },
-		{ label: "Caracas", value: "America/Caracas" },
-		{ label: "Cayenne", value: "America/Cayenne" },
-		{ label: "Cayman", value: "America/Cayman" },
-		{ label: "Chicago (Central Time)", value: "America/Chicago" },
-		{ label: "Chihuahua", value: "America/Chihuahua" },
-		{ label: "Ciudad Juarez", value: "America/Ciudad_Juarez" },
-		{ label: "Costa Rica", value: "America/Costa_Rica" },
-		{ label: "Creston", value: "America/Creston" },
-		{ label: "Cuiaba", value: "America/Cuiaba" },
-		{ label: "Curacao", value: "America/Curacao" },
-		{ label: "Danmarkshavn", value: "America/Danmarkshavn" },
-		{ label: "Dawson", value: "America/Dawson" },
-		{ label: "Dawson Creek", value: "America/Dawson_Creek" },
-		{ label: "Denver (Mountain Time)", value: "America/Denver" },
-		{ label: "Detroit", value: "America/Detroit" },
-		{ label: "Dominica", value: "America/Dominica" },
-		{ label: "Edmonton", value: "America/Edmonton" },
-		{ label: "Eirunepe", value: "America/Eirunepe" },
-		{ label: "El Salvador", value: "America/El_Salvador" },
-		{ label: "Fort Nelson", value: "America/Fort_Nelson" },
-		{ label: "Fortaleza", value: "America/Fortaleza" },
-		{ label: "Glace Bay", value: "America/Glace_Bay" },
-		{ label: "Goose Bay", value: "America/Goose_Bay" },
-		{ label: "Grand Turk", value: "America/Grand_Turk" },
-		{ label: "Grenada", value: "America/Grenada" },
-		{ label: "Guadeloupe", value: "America/Guadeloupe" },
-		{ label: "Guatemala", value: "America/Guatemala" },
-		{ label: "Guayaquil", value: "America/Guayaquil" },
-		{ label: "Guyana", value: "America/Guyana" },
-		{ label: "Halifax", value: "America/Halifax" },
-		{ label: "Havana", value: "America/Havana" },
-		{ label: "Hermosillo", value: "America/Hermosillo" },
-		{ label: "Indiana/Indianapolis", value: "America/Indiana/Indianapolis" },
-		{ label: "Indiana/Knox", value: "America/Indiana/Knox" },
-		{ label: "Indiana/Marengo", value: "America/Indiana/Marengo" },
-		{ label: "Indiana/Petersburg", value: "America/Indiana/Petersburg" },
-		{ label: "Indiana/Tell City", value: "America/Indiana/Tell_City" },
-		{ label: "Indiana/Vevay", value: "America/Indiana/Vevay" },
-		{ label: "Indiana/Vincennes", value: "America/Indiana/Vincennes" },
-		{ label: "Indiana/Winamac", value: "America/Indiana/Winamac" },
-		{ label: "Inuvik", value: "America/Inuvik" },
-		{ label: "Iqaluit", value: "America/Iqaluit" },
-		{ label: "Jamaica", value: "America/Jamaica" },
-		{ label: "Juneau", value: "America/Juneau" },
-		{ label: "Kentucky/Louisville", value: "America/Kentucky/Louisville" },
-		{ label: "Kentucky/Monticello", value: "America/Kentucky/Monticello" },
-		{ label: "Kralendijk", value: "America/Kralendijk" },
-		{ label: "La Paz", value: "America/La_Paz" },
-		{ label: "Lima", value: "America/Lima" },
-		{ label: "Los Angeles (Pacific Time)", value: "America/Los_Angeles" },
-		{ label: "Lower Princes", value: "America/Lower_Princes" },
-		{ label: "Maceio", value: "America/Maceio" },
-		{ label: "Managua", value: "America/Managua" },
-		{ label: "Manaus", value: "America/Manaus" },
-		{ label: "Marigot", value: "America/Marigot" },
-		{ label: "Martinique", value: "America/Martinique" },
-		{ label: "Matamoros", value: "America/Matamoros" },
-		{ label: "Mazatlan", value: "America/Mazatlan" },
-		{ label: "Menominee", value: "America/Menominee" },
-		{ label: "Merida", value: "America/Merida" },
-		{ label: "Metlakatla", value: "America/Metlakatla" },
-		{ label: "Mexico City (Central Mexico)", value: "America/Mexico_City" },
-		{ label: "Miquelon", value: "America/Miquelon" },
-		{ label: "Moncton", value: "America/Moncton" },
-		{ label: "Monterrey", value: "America/Monterrey" },
-		{ label: "Montevideo", value: "America/Montevideo" },
-		{ label: "Montserrat", value: "America/Montserrat" },
-		{ label: "Nassau", value: "America/Nassau" },
-		{ label: "New York (Eastern Time)", value: "America/New_York" },
-		{ label: "Nome", value: "America/Nome" },
-		{ label: "Noronha", value: "America/Noronha" },
-		{ label: "North Dakota/Beulah", value: "America/North_Dakota/Beulah" },
-		{ label: "North Dakota/Center", value: "America/North_Dakota/Center" },
-		{
-			label: "North Dakota/New Salem",
-			value: "America/North_Dakota/New_Salem",
-		},
-		{ label: "Nuuk", value: "America/Nuuk" },
-		{ label: "Ojinaga", value: "America/Ojinaga" },
-		{ label: "Panama", value: "America/Panama" },
-		{ label: "Paramaribo", value: "America/Paramaribo" },
-		{ label: "Phoenix", value: "America/Phoenix" },
-		{ label: "Port-au-Prince", value: "America/Port-au-Prince" },
-		{ label: "Port of Spain", value: "America/Port_of_Spain" },
-		{ label: "Porto Velho", value: "America/Porto_Velho" },
-		{ label: "Puerto Rico", value: "America/Puerto_Rico" },
-		{ label: "Punta Arenas", value: "America/Punta_Arenas" },
-		{ label: "Rankin Inlet", value: "America/Rankin_Inlet" },
-		{ label: "Recife", value: "America/Recife" },
-		{ label: "Regina", value: "America/Regina" },
-		{ label: "Resolute", value: "America/Resolute" },
-		{ label: "Rio Branco", value: "America/Rio_Branco" },
-		{ label: "Santarem", value: "America/Santarem" },
-		{ label: "Santiago", value: "America/Santiago" },
-		{ label: "Santo Domingo", value: "America/Santo_Domingo" },
-		{ label: "Sao Paulo (Brasilia Time)", value: "America/Sao_Paulo" },
-		{ label: "Scoresbysund", value: "America/Scoresbysund" },
-		{ label: "Sitka", value: "America/Sitka" },
-		{ label: "St Barthelemy", value: "America/St_Barthelemy" },
-		{ label: "St Johns", value: "America/St_Johns" },
-		{ label: "St Kitts", value: "America/St_Kitts" },
-		{ label: "St Lucia", value: "America/St_Lucia" },
-		{ label: "St Thomas", value: "America/St_Thomas" },
-		{ label: "St Vincent", value: "America/St_Vincent" },
-		{ label: "Swift Current", value: "America/Swift_Current" },
-		{ label: "Tegucigalpa", value: "America/Tegucigalpa" },
-		{ label: "Thule", value: "America/Thule" },
-		{ label: "Tijuana", value: "America/Tijuana" },
-		{ label: "Toronto", value: "America/Toronto" },
-		{ label: "Tortola", value: "America/Tortola" },
-		{ label: "Vancouver", value: "America/Vancouver" },
-		{ label: "Whitehorse", value: "America/Whitehorse" },
-		{ label: "Winnipeg", value: "America/Winnipeg" },
-		{ label: "Yakutat", value: "America/Yakutat" },
-	],
-	Antarctica: [
-		{ label: "Casey", value: "Antarctica/Casey" },
-		{ label: "Davis", value: "Antarctica/Davis" },
-		{ label: "DumontDUrville", value: "Antarctica/DumontDUrville" },
-		{ label: "Macquarie", value: "Antarctica/Macquarie" },
-		{ label: "Mawson", value: "Antarctica/Mawson" },
-		{ label: "McMurdo", value: "Antarctica/McMurdo" },
-		{ label: "Palmer", value: "Antarctica/Palmer" },
-		{ label: "Rothera", value: "Antarctica/Rothera" },
-		{ label: "Syowa", value: "Antarctica/Syowa" },
-		{ label: "Troll", value: "Antarctica/Troll" },
-		{ label: "Vostok", value: "Antarctica/Vostok" },
-	],
-	Arctic: [{ label: "Longyearbyen", value: "Arctic/Longyearbyen" }],
-	Asia: [
-		{ label: "Aden", value: "Asia/Aden" },
-		{ label: "Almaty", value: "Asia/Almaty" },
-		{ label: "Amman", value: "Asia/Amman" },
-		{ label: "Anadyr", value: "Asia/Anadyr" },
-		{ label: "Aqtau", value: "Asia/Aqtau" },
-		{ label: "Aqtobe", value: "Asia/Aqtobe" },
-		{ label: "Ashgabat", value: "Asia/Ashgabat" },
-		{ label: "Atyrau", value: "Asia/Atyrau" },
-		{ label: "Baghdad", value: "Asia/Baghdad" },
-		{ label: "Bahrain", value: "Asia/Bahrain" },
-		{ label: "Baku", value: "Asia/Baku" },
-		{ label: "Bangkok", value: "Asia/Bangkok" },
-		{ label: "Barnaul", value: "Asia/Barnaul" },
-		{ label: "Beirut", value: "Asia/Beirut" },
-		{ label: "Bishkek", value: "Asia/Bishkek" },
-		{ label: "Brunei", value: "Asia/Brunei" },
-		{ label: "Chita", value: "Asia/Chita" },
-		{ label: "Choibalsan", value: "Asia/Choibalsan" },
-		{ label: "Colombo", value: "Asia/Colombo" },
-		{ label: "Damascus", value: "Asia/Damascus" },
-		{ label: "Dhaka", value: "Asia/Dhaka" },
-		{ label: "Dili", value: "Asia/Dili" },
-		{ label: "Dubai (Gulf Standard Time)", value: "Asia/Dubai" },
-		{ label: "Dushanbe", value: "Asia/Dushanbe" },
-		{ label: "Famagusta", value: "Asia/Famagusta" },
-		{ label: "Gaza", value: "Asia/Gaza" },
-		{ label: "Hebron", value: "Asia/Hebron" },
-		{ label: "Ho Chi Minh", value: "Asia/Ho_Chi_Minh" },
-		{ label: "Hong Kong", value: "Asia/Hong_Kong" },
-		{ label: "Hovd", value: "Asia/Hovd" },
-		{ label: "Irkutsk", value: "Asia/Irkutsk" },
-		{ label: "Jakarta", value: "Asia/Jakarta" },
-		{ label: "Jayapura", value: "Asia/Jayapura" },
-		{ label: "Jerusalem", value: "Asia/Jerusalem" },
-		{ label: "Kabul", value: "Asia/Kabul" },
-		{ label: "Kamchatka", value: "Asia/Kamchatka" },
-		{ label: "Karachi", value: "Asia/Karachi" },
-		{ label: "Kathmandu", value: "Asia/Kathmandu" },
-		{ label: "Khandyga", value: "Asia/Khandyga" },
-		{ label: "Kolkata (India Standard Time)", value: "Asia/Kolkata" },
-		{ label: "Krasnoyarsk", value: "Asia/Krasnoyarsk" },
-		{ label: "Kuala Lumpur", value: "Asia/Kuala_Lumpur" },
-		{ label: "Kuching", value: "Asia/Kuching" },
-		{ label: "Kuwait", value: "Asia/Kuwait" },
-		{ label: "Macau", value: "Asia/Macau" },
-		{ label: "Magadan", value: "Asia/Magadan" },
-		{ label: "Makassar", value: "Asia/Makassar" },
-		{ label: "Manila", value: "Asia/Manila" },
-		{ label: "Muscat", value: "Asia/Muscat" },
-		{ label: "Nicosia", value: "Asia/Nicosia" },
-		{ label: "Novokuznetsk", value: "Asia/Novokuznetsk" },
-		{ label: "Novosibirsk", value: "Asia/Novosibirsk" },
-		{ label: "Omsk", value: "Asia/Omsk" },
-		{ label: "Oral", value: "Asia/Oral" },
-		{ label: "Phnom Penh", value: "Asia/Phnom_Penh" },
-		{ label: "Pontianak", value: "Asia/Pontianak" },
-		{ label: "Pyongyang", value: "Asia/Pyongyang" },
-		{ label: "Qatar", value: "Asia/Qatar" },
-		{ label: "Qostanay", value: "Asia/Qostanay" },
-		{ label: "Qyzylorda", value: "Asia/Qyzylorda" },
-		{ label: "Riyadh", value: "Asia/Riyadh" },
-		{ label: "Sakhalin", value: "Asia/Sakhalin" },
-		{ label: "Samarkand", value: "Asia/Samarkand" },
-		{ label: "Seoul", value: "Asia/Seoul" },
-		{ label: "Shanghai (China Standard Time)", value: "Asia/Shanghai" },
-		{ label: "Singapore", value: "Asia/Singapore" },
-		{ label: "Srednekolymsk", value: "Asia/Srednekolymsk" },
-		{ label: "Taipei", value: "Asia/Taipei" },
-		{ label: "Tashkent", value: "Asia/Tashkent" },
-		{ label: "Tbilisi", value: "Asia/Tbilisi" },
-		{ label: "Tehran", value: "Asia/Tehran" },
-		{ label: "Thimphu", value: "Asia/Thimphu" },
-		{ label: "Tokyo (Japan Standard Time)", value: "Asia/Tokyo" },
-		{ label: "Tomsk", value: "Asia/Tomsk" },
-		{ label: "Ulaanbaatar", value: "Asia/Ulaanbaatar" },
-		{ label: "Urumqi", value: "Asia/Urumqi" },
-		{ label: "Ust-Nera", value: "Asia/Ust-Nera" },
-		{ label: "Vientiane", value: "Asia/Vientiane" },
-		{ label: "Vladivostok", value: "Asia/Vladivostok" },
-		{ label: "Yakutsk", value: "Asia/Yakutsk" },
-		{ label: "Yangon", value: "Asia/Yangon" },
-		{ label: "Yekaterinburg", value: "Asia/Yekaterinburg" },
-		{ label: "Yerevan", value: "Asia/Yerevan" },
-	],
-	Atlantic: [
-		{ label: "Azores", value: "Atlantic/Azores" },
-		{ label: "Bermuda", value: "Atlantic/Bermuda" },
-		{ label: "Canary", value: "Atlantic/Canary" },
-		{ label: "Cape Verde", value: "Atlantic/Cape_Verde" },
-		{ label: "Faroe", value: "Atlantic/Faroe" },
-		{ label: "Madeira", value: "Atlantic/Madeira" },
-		{ label: "Reykjavik", value: "Atlantic/Reykjavik" },
-		{ label: "South Georgia", value: "Atlantic/South_Georgia" },
-		{ label: "St Helena", value: "Atlantic/St_Helena" },
-		{ label: "Stanley", value: "Atlantic/Stanley" },
-	],
-	Australia: [
-		{ label: "Adelaide", value: "Australia/Adelaide" },
-		{ label: "Brisbane", value: "Australia/Brisbane" },
-		{ label: "Broken Hill", value: "Australia/Broken_Hill" },
-		{ label: "Darwin", value: "Australia/Darwin" },
-		{ label: "Eucla", value: "Australia/Eucla" },
-		{ label: "Hobart", value: "Australia/Hobart" },
-		{ label: "Lindeman", value: "Australia/Lindeman" },
-		{ label: "Lord Howe", value: "Australia/Lord_Howe" },
-		{ label: "Melbourne", value: "Australia/Melbourne" },
-		{ label: "Perth", value: "Australia/Perth" },
-		{ label: "Sydney (Australian Eastern Time)", value: "Australia/Sydney" },
-	],
-	Europe: [
-		{ label: "Amsterdam", value: "Europe/Amsterdam" },
-		{ label: "Andorra", value: "Europe/Andorra" },
-		{ label: "Astrakhan", value: "Europe/Astrakhan" },
-		{ label: "Athens", value: "Europe/Athens" },
-		{ label: "Belgrade", value: "Europe/Belgrade" },
-		{ label: "Berlin (Central European Time)", value: "Europe/Berlin" },
-		{ label: "Bratislava", value: "Europe/Bratislava" },
-		{ label: "Brussels", value: "Europe/Brussels" },
-		{ label: "Bucharest", value: "Europe/Bucharest" },
-		{ label: "Budapest", value: "Europe/Budapest" },
-		{ label: "Busingen", value: "Europe/Busingen" },
-		{ label: "Chisinau", value: "Europe/Chisinau" },
-		{ label: "Copenhagen", value: "Europe/Copenhagen" },
-		{ label: "Dublin", value: "Europe/Dublin" },
-		{ label: "Gibraltar", value: "Europe/Gibraltar" },
-		{ label: "Guernsey", value: "Europe/Guernsey" },
-		{ label: "Helsinki", value: "Europe/Helsinki" },
-		{ label: "Isle of Man", value: "Europe/Isle_of_Man" },
-		{ label: "Istanbul", value: "Europe/Istanbul" },
-		{ label: "Jersey", value: "Europe/Jersey" },
-		{ label: "Kaliningrad", value: "Europe/Kaliningrad" },
-		{ label: "Kirov", value: "Europe/Kirov" },
-		{ label: "Kyiv", value: "Europe/Kyiv" },
-		{ label: "Lisbon", value: "Europe/Lisbon" },
-		{ label: "Ljubljana", value: "Europe/Ljubljana" },
-		{ label: "London (Greenwich Mean Time)", value: "Europe/London" },
-		{ label: "Luxembourg", value: "Europe/Luxembourg" },
-		{ label: "Madrid", value: "Europe/Madrid" },
-		{ label: "Malta", value: "Europe/Malta" },
-		{ label: "Mariehamn", value: "Europe/Mariehamn" },
-		{ label: "Minsk", value: "Europe/Minsk" },
-		{ label: "Monaco", value: "Europe/Monaco" },
-		{ label: "Moscow", value: "Europe/Moscow" },
-		{ label: "Oslo", value: "Europe/Oslo" },
-		{ label: "Paris (Central European Time)", value: "Europe/Paris" },
-		{ label: "Podgorica", value: "Europe/Podgorica" },
-		{ label: "Prague", value: "Europe/Prague" },
-		{ label: "Riga", value: "Europe/Riga" },
-		{ label: "Rome", value: "Europe/Rome" },
-		{ label: "Samara", value: "Europe/Samara" },
-		{ label: "San Marino", value: "Europe/San_Marino" },
-		{ label: "Sarajevo", value: "Europe/Sarajevo" },
-		{ label: "Saratov", value: "Europe/Saratov" },
-		{ label: "Simferopol", value: "Europe/Simferopol" },
-		{ label: "Skopje", value: "Europe/Skopje" },
-		{ label: "Sofia", value: "Europe/Sofia" },
-		{ label: "Stockholm", value: "Europe/Stockholm" },
-		{ label: "Tallinn", value: "Europe/Tallinn" },
-		{ label: "Tirane", value: "Europe/Tirane" },
-		{ label: "Ulyanovsk", value: "Europe/Ulyanovsk" },
-		{ label: "Vaduz", value: "Europe/Vaduz" },
-		{ label: "Vatican", value: "Europe/Vatican" },
-		{ label: "Vienna", value: "Europe/Vienna" },
-		{ label: "Vilnius", value: "Europe/Vilnius" },
-		{ label: "Volgograd", value: "Europe/Volgograd" },
-		{ label: "Warsaw", value: "Europe/Warsaw" },
-		{ label: "Zagreb", value: "Europe/Zagreb" },
-		{ label: "Zurich", value: "Europe/Zurich" },
-	],
-	Indian: [
-		{ label: "Antananarivo", value: "Indian/Antananarivo" },
-		{ label: "Chagos", value: "Indian/Chagos" },
-		{ label: "Christmas", value: "Indian/Christmas" },
-		{ label: "Cocos", value: "Indian/Cocos" },
-		{ label: "Comoro", value: "Indian/Comoro" },
-		{ label: "Kerguelen", value: "Indian/Kerguelen" },
-		{ label: "Mahe", value: "Indian/Mahe" },
-		{ label: "Maldives", value: "Indian/Maldives" },
-		{ label: "Mauritius", value: "Indian/Mauritius" },
-		{ label: "Mayotte", value: "Indian/Mayotte" },
-		{ label: "Reunion", value: "Indian/Reunion" },
-	],
-	Pacific: [
-		{ label: "Apia", value: "Pacific/Apia" },
-		{ label: "Auckland", value: "Pacific/Auckland" },
-		{ label: "Bougainville", value: "Pacific/Bougainville" },
-		{ label: "Chatham", value: "Pacific/Chatham" },
-		{ label: "Chuuk", value: "Pacific/Chuuk" },
-		{ label: "Easter", value: "Pacific/Easter" },
-		{ label: "Efate", value: "Pacific/Efate" },
-		{ label: "Fakaofo", value: "Pacific/Fakaofo" },
-		{ label: "Fiji", value: "Pacific/Fiji" },
-		{ label: "Funafuti", value: "Pacific/Funafuti" },
-		{ label: "Galapagos", value: "Pacific/Galapagos" },
-		{ label: "Gambier", value: "Pacific/Gambier" },
-		{ label: "Guadalcanal", value: "Pacific/Guadalcanal" },
-		{ label: "Guam", value: "Pacific/Guam" },
-		{ label: "Honolulu", value: "Pacific/Honolulu" },
-		{ label: "Kanton", value: "Pacific/Kanton" },
-		{ label: "Kiritimati", value: "Pacific/Kiritimati" },
-		{ label: "Kosrae", value: "Pacific/Kosrae" },
-		{ label: "Kwajalein", value: "Pacific/Kwajalein" },
-		{ label: "Majuro", value: "Pacific/Majuro" },
-		{ label: "Marquesas", value: "Pacific/Marquesas" },
-		{ label: "Midway", value: "Pacific/Midway" },
-		{ label: "Nauru", value: "Pacific/Nauru" },
-		{ label: "Niue", value: "Pacific/Niue" },
-		{ label: "Norfolk", value: "Pacific/Norfolk" },
-		{ label: "Noumea", value: "Pacific/Noumea" },
-		{ label: "Pago Pago", value: "Pacific/Pago_Pago" },
-		{ label: "Palau", value: "Pacific/Palau" },
-		{ label: "Pitcairn", value: "Pacific/Pitcairn" },
-		{ label: "Pohnpei", value: "Pacific/Pohnpei" },
-		{ label: "Port Moresby", value: "Pacific/Port_Moresby" },
-		{ label: "Rarotonga", value: "Pacific/Rarotonga" },
-		{ label: "Saipan", value: "Pacific/Saipan" },
-		{ label: "Tahiti", value: "Pacific/Tahiti" },
-		{ label: "Tarawa", value: "Pacific/Tarawa" },
-		{ label: "Tongatapu", value: "Pacific/Tongatapu" },
-		{ label: "Wake", value: "Pacific/Wake" },
-		{ label: "Wallis", value: "Pacific/Wallis" },
-	],
-};
-
-// Helper to get display label for a timezone value
-export function getTimezoneLabel(value: string | undefined): string {
-	if (!value) return "UTC (default)";
-	return value;
-}

apps/dokploy/components/dashboard/docker/logs/utils.ts

@@ -108,8 +108,7 @@ export const getLogType = (message: string): LogStyle => {
 		/(?:might|may|could)\s+(?:not|cause|lead\s+to)/i.test(lowerMessage) ||
 		/(?:!+\s*(?:warning|caution|attention)\s*!+)/i.test(lowerMessage) ||
 		/\b(?:deprecated|obsolete)\b/i.test(lowerMessage) ||
-		/\b(?:unstable|experimental)\b/i.test(lowerMessage) ||
-		/⚠|⚠️/i.test(lowerMessage)
+		/\b(?:unstable|experimental)\b/i.test(lowerMessage)
 	) {
 		return LOG_STYLES.warning;
 	}

apps/dokploy/components/dashboard/projects/show.tsx

@@ -190,9 +190,7 @@ export const ShowProjects = () => {
 									Create and manage your projects
 								</CardDescription>
 							</CardHeader>
-							{(auth?.role === "owner" ||
-								auth?.role === "admin" ||
-								auth?.canCreateProjects) && (
+							{(auth?.role === "owner" || auth?.canCreateProjects) && (
 								<div className="">
 									<HandleProject />
 								</div>

apps/dokploy/components/dashboard/settings/servers/actions/show-server-actions.tsx

@@ -1,6 +1,5 @@
 import { Activity } from "lucide-react";
 import { useState } from "react";
-import { Button } from "@/components/ui/button";
 import {
 	Dialog,
 	DialogContent,
@@ -8,6 +7,7 @@ import {
 	DialogTitle,
 	DialogTrigger,
 } from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
 import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
 import { ShowStorageActions } from "./show-storage-actions";
 import { ShowTraefikActions } from "./show-traefik-actions";

apps/dokploy/components/dashboard/settings/servers/actions/toggle-docker-cleanup.tsx

@@ -7,12 +7,9 @@ interface Props {
 	serverId?: string;
 }
 export const ToggleDockerCleanup = ({ serverId }: Props) => {
-	const { data, refetch } = api.settings.getWebServerSettings.useQuery(
-		undefined,
-		{
-			enabled: !serverId,
-		},
-	);
+	const { data, refetch } = api.user.get.useQuery(undefined, {
+		enabled: !serverId,
+	});
 
 	const { data: server, refetch: refetchServer } = api.server.one.useQuery(
 		{
@@ -25,7 +22,7 @@ export const ToggleDockerCleanup = ({ serverId }: Props) => {
 
 	const enabled = serverId
 		? server?.enableDockerCleanup
-		: data?.enableDockerCleanup;
+		: data?.user.enableDockerCleanup;
 
 	const { mutateAsync } = api.settings.updateDockerCleanup.useMutation();
 
@@ -33,10 +30,7 @@ export const ToggleDockerCleanup = ({ serverId }: Props) => {
 		try {
 			await mutateAsync({
 				enableDockerCleanup: checked,
-				...(serverId && { serverId }),
-			} as {
-				enableDockerCleanup: boolean;
-				serverId?: string;
+				serverId: serverId,
 			});
 			if (serverId) {
 				await refetchServer();

apps/dokploy/components/dashboard/settings/servers/handle-servers.tsx

@@ -1,5 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import { Pencil, PlusIcon } from "lucide-react";
+import { PlusIcon, Pencil } from "lucide-react";
 import Link from "next/link";
 import { useTranslation } from "next-i18next";
 import { useEffect, useState } from "react";

apps/dokploy/components/dashboard/settings/servers/setup-monitoring.tsx

@@ -80,7 +80,7 @@ const Schema = z.object({
 type Schema = z.infer<typeof Schema>;
 
 export const SetupMonitoring = ({ serverId }: Props) => {
-	const { data: serverData } = serverId
+	const { data } = serverId
 		? api.server.one.useQuery(
 				{
 					serverId: serverId || "",
@@ -89,14 +89,7 @@ export const SetupMonitoring = ({ serverId }: Props) => {
 					enabled: !!serverId,
 				},
 			)
-		: { data: null };
-
-	const { data: webServerSettings } =
-		api.settings.getWebServerSettings.useQuery(undefined, {
-			enabled: !serverId,
-		});
-
-	const data = serverId ? serverData : webServerSettings;
+		: api.user.getServerMetrics.useQuery();
 
 	const url = useUrl();
 

apps/dokploy/components/dashboard/settings/servers/show-servers.tsx

@@ -1,17 +1,17 @@
 import { format } from "date-fns";
 import {
-	Clock,
-	Key,
 	KeyIcon,
 	Loader2,
 	MoreHorizontal,
-	Network,
-	Pencil,
 	ServerIcon,
-	Settings,
-	Terminal,
-	Trash2,
+	Clock,
 	User,
+	Key,
+	Network,
+	Terminal,
+	Settings,
+	Pencil,
+	Trash2,
 } from "lucide-react";
 import Link from "next/link";
 import { useRouter } from "next/router";

apps/dokploy/components/dashboard/settings/web-domain.tsx

@@ -67,7 +67,7 @@ type AddServerDomain = z.infer<typeof addServerDomain>;
 
 export const WebDomain = () => {
 	const { t } = useTranslation("settings");
-	const { data, refetch } = api.settings.getWebServerSettings.useQuery();
+	const { data, refetch } = api.user.get.useQuery();
 	const { mutateAsync, isLoading } =
 		api.settings.assignDomainServer.useMutation();
 
@@ -82,15 +82,15 @@ export const WebDomain = () => {
 	});
 	const https = form.watch("https");
 	const domain = form.watch("domain") || "";
-	const host = data?.host || "";
+	const host = data?.user?.host || "";
 	const hasChanged = domain !== host;
 	useEffect(() => {
 		if (data) {
 			form.reset({
-				domain: data?.host || "",
-				certificateType: data?.certificateType || "none",
-				letsEncryptEmail: data?.letsEncryptEmail || "",
-				https: data?.https || false,
+				domain: data?.user?.host || "",
+				certificateType: data?.user?.certificateType,
+				letsEncryptEmail: data?.user?.letsEncryptEmail || "",
+				https: data?.user?.https || false,
 			});
 		}
 	}, [form, form.reset, data]);

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

@@ -16,8 +16,7 @@ import { UpdateServer } from "./web-server/update-server";
 
 export const WebServer = () => {
 	const { t } = useTranslation("settings");
-	const { data: webServerSettings } =
-		api.settings.getWebServerSettings.useQuery();
+	const { data } = api.user.get.useQuery();
 
 	const { data: dokployVersion } = api.settings.getDokployVersion.useQuery();
 
@@ -54,7 +53,7 @@ export const WebServer = () => {
 
 						<div className="flex items-center flex-wrap justify-between gap-4">
 							<span className="text-sm text-muted-foreground">
-								Server IP: {webServerSettings?.serverIp}
+								Server IP: {data?.user.serverIp}
 							</span>
 							<span className="text-sm text-muted-foreground">
 								Version: {dokployVersion}

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

@@ -46,15 +46,15 @@ interface Props {
 export const UpdateServerIp = ({ children }: Props) => {
 	const [isOpen, setIsOpen] = useState(false);
 
-	const { data, refetch } = api.settings.getWebServerSettings.useQuery();
+	const { data } = api.user.get.useQuery();
 	const { data: ip } = api.server.publicIp.useQuery();
 
 	const { mutateAsync, isLoading, error, isError } =
-		api.settings.updateServerIp.useMutation();
+		api.user.update.useMutation();
 
 	const form = useForm<Schema>({
 		defaultValues: {
-			serverIp: data?.serverIp || "",
+			serverIp: data?.user.serverIp || "",
 		},
 		resolver: zodResolver(schema),
 	});
@@ -62,11 +62,13 @@ export const UpdateServerIp = ({ children }: Props) => {
 	useEffect(() => {
 		if (data) {
 			form.reset({
-				serverIp: data.serverIp || "",
+				serverIp: data.user.serverIp || "",
 			});
 		}
 	}, [form, form.reset, data]);
 
+	const utils = api.useUtils();
+
 	const setCurrentIp = () => {
 		if (!ip) return;
 		form.setValue("serverIp", ip);
@@ -78,7 +80,7 @@ export const UpdateServerIp = ({ children }: Props) => {
 		})
 			.then(async () => {
 				toast.success("Server IP Updated");
-				await refetch();
+				await utils.user.get.invalidate();
 				setIsOpen(false);
 			})
 			.catch(() => {

apps/dokploy/components/shared/breadcrumb-sidebar.tsx

@@ -1,13 +1,13 @@
-import { ChevronDown } from "lucide-react";
 import Link from "next/link";
 import { Fragment } from "react";
+import { ChevronDown } from "lucide-react";
 import {
 	Breadcrumb,
 	BreadcrumbItem,
 	BreadcrumbLink,
 	BreadcrumbList,
-	BreadcrumbPage,
 	BreadcrumbSeparator,
+	BreadcrumbPage,
 } from "@/components/ui/breadcrumb";
 import {
 	DropdownMenu,

apps/dokploy/components/ui/number-input.tsx

@@ -1,84 +0,0 @@
-import { MinusIcon, PlusIcon } from "lucide-react";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-
-export interface UnitConverter {
-	toValue: (raw: string | undefined) => number;
-	fromValue: (value: number) => string;
-	formatDisplay: (value: number) => string;
-}
-
-export const createConverter = (
-	multiplier: number,
-	formatDisplay: (value: number) => string,
-): UnitConverter => ({
-	toValue: (raw) => {
-		if (!raw) return 0;
-		const value = Number.parseInt(raw, 10);
-		return Number.isNaN(value) ? 0 : value / multiplier;
-	},
-	fromValue: (value) =>
-		value <= 0 ? "" : String(Math.round(value * multiplier)),
-	formatDisplay,
-});
-
-interface NumberInputWithStepsProps {
-	value: string | undefined;
-	onChange: (value: string) => void;
-	placeholder: string;
-	step: number;
-	converter: UnitConverter;
-}
-
-export const NumberInputWithSteps = ({
-	value,
-	onChange,
-	placeholder,
-	step,
-	converter,
-}: NumberInputWithStepsProps) => {
-	const numericValue = converter.toValue(value);
-	const displayValue = converter.formatDisplay(numericValue);
-
-	const handleIncrement = () =>
-		onChange(converter.fromValue(numericValue + step));
-	const handleDecrement = () =>
-		onChange(converter.fromValue(Math.max(0, numericValue - step)));
-
-	return (
-		<div className="flex flex-col gap-2">
-			<div className="flex items-center gap-2">
-				<Button
-					type="button"
-					variant="outline"
-					size="icon"
-					className="h-9 w-9 shrink-0"
-					onClick={handleDecrement}
-					disabled={numericValue <= 0}
-				>
-					<MinusIcon className="h-4 w-4" />
-				</Button>
-				<Input
-					placeholder={placeholder}
-					value={value || ""}
-					onChange={(e) => onChange(e.target.value)}
-					className="text-center"
-				/>
-				<Button
-					type="button"
-					variant="outline"
-					size="icon"
-					className="h-9 w-9 shrink-0"
-					onClick={handleIncrement}
-				>
-					<PlusIcon className="h-4 w-4" />
-				</Button>
-			</div>
-			{displayValue && (
-				<span className="text-xs text-muted-foreground text-center">
-					{displayValue}
-				</span>
-			)}
-		</div>
-	);
-};

apps/dokploy/drizzle/0133_striped_the_order.sql

@@ -1,114 +0,0 @@
-CREATE TABLE "webServerSettings" (
-	"id" text PRIMARY KEY NOT NULL,
-	"serverIp" text,
-	"certificateType" "certificateType" DEFAULT 'none' NOT NULL,
-	"https" boolean DEFAULT false NOT NULL,
-	"host" text,
-	"letsEncryptEmail" text,
-	"sshPrivateKey" text,
-	"enableDockerCleanup" boolean DEFAULT true NOT NULL,
-	"logCleanupCron" text DEFAULT '0 0 * * *',
-	"metricsConfig" jsonb DEFAULT '{"server":{"type":"Dokploy","refreshRate":60,"port":4500,"token":"","retentionDays":2,"cronJob":"","urlCallback":"","thresholds":{"cpu":0,"memory":0}},"containers":{"refreshRate":60,"services":{"include":[],"exclude":[]}}}'::jsonb NOT NULL,
-	"cleanupCacheApplications" boolean DEFAULT false NOT NULL,
-	"cleanupCacheOnPreviews" boolean DEFAULT false NOT NULL,
-	"cleanupCacheOnCompose" boolean DEFAULT false NOT NULL,
-	"created_at" timestamp DEFAULT now(),
-	"updated_at" timestamp DEFAULT now() NOT NULL
-);
-
--- Migrate data from user table to webServerSettings
--- Get the owner user's data and insert into webServerSettings
-INSERT INTO "webServerSettings" (
-	"id",
-	"serverIp",
-	"certificateType",
-	"https",
-	"host",
-	"letsEncryptEmail",
-	"sshPrivateKey",
-	"enableDockerCleanup",
-	"logCleanupCron",
-	"metricsConfig",
-	"cleanupCacheApplications",
-	"cleanupCacheOnPreviews",
-	"cleanupCacheOnCompose",
-	"created_at",
-	"updated_at"
-)
-SELECT 
-	gen_random_uuid()::text as "id",
-	u."serverIp",
-	COALESCE(u."certificateType", 'none') as "certificateType",
-	COALESCE(u."https", false) as "https",
-	u."host",
-	u."letsEncryptEmail",
-	u."sshPrivateKey",
-	COALESCE(u."enableDockerCleanup", true) as "enableDockerCleanup",
-	COALESCE(u."logCleanupCron", '0 0 * * *') as "logCleanupCron",
-	COALESCE(
-		u."metricsConfig",
-		'{"server":{"type":"Dokploy","refreshRate":60,"port":4500,"token":"","retentionDays":2,"cronJob":"","urlCallback":"","thresholds":{"cpu":0,"memory":0}},"containers":{"refreshRate":60,"services":{"include":[],"exclude":[]}}}'::jsonb
-	) as "metricsConfig",
-	COALESCE(u."cleanupCacheApplications", false) as "cleanupCacheApplications",
-	COALESCE(u."cleanupCacheOnPreviews", false) as "cleanupCacheOnPreviews",
-	COALESCE(u."cleanupCacheOnCompose", false) as "cleanupCacheOnCompose",
-	NOW() as "created_at",
-	NOW() as "updated_at"
-FROM "user" u
-INNER JOIN "member" m ON u."id" = m."user_id"
-WHERE m."role" = 'owner'
-ORDER BY m."created_at" ASC
-LIMIT 1;
-
--- If no owner found, create a default entry
-INSERT INTO "webServerSettings" (
-	"id",
-	"serverIp",
-	"certificateType",
-	"https",
-	"host",
-	"letsEncryptEmail",
-	"sshPrivateKey",
-	"enableDockerCleanup",
-	"logCleanupCron",
-	"metricsConfig",
-	"cleanupCacheApplications",
-	"cleanupCacheOnPreviews",
-	"cleanupCacheOnCompose",
-	"created_at",
-	"updated_at"
-)
-SELECT 
-	gen_random_uuid()::text as "id",
-	NULL as "serverIp",
-	'none' as "certificateType",
-	false as "https",
-	NULL as "host",
-	NULL as "letsEncryptEmail",
-	NULL as "sshPrivateKey",
-	true as "enableDockerCleanup",
-	'0 0 * * *' as "logCleanupCron",
-	'{"server":{"type":"Dokploy","refreshRate":60,"port":4500,"token":"","retentionDays":2,"cronJob":"","urlCallback":"","thresholds":{"cpu":0,"memory":0}},"containers":{"refreshRate":60,"services":{"include":[],"exclude":[]}}}'::jsonb as "metricsConfig",
-	false as "cleanupCacheApplications",
-	false as "cleanupCacheOnPreviews",
-	false as "cleanupCacheOnCompose",
-	NOW() as "created_at",
-	NOW() as "updated_at"
-WHERE NOT EXISTS (
-	SELECT 1 FROM "webServerSettings"
-);
-
-
---> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "serverIp";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "certificateType";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "https";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "host";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "letsEncryptEmail";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "sshPrivateKey";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "enableDockerCleanup";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "logCleanupCron";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "metricsConfig";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "cleanupCacheApplications";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "cleanupCacheOnPreviews";--> statement-breakpoint
-ALTER TABLE "user" DROP COLUMN "cleanupCacheOnCompose";

apps/dokploy/drizzle/meta/_journal.json

@@ -932,13 +932,6 @@
       "when": 1765346573500,
       "tag": "0132_clean_layla_miller",
       "breakpoints": true
-    },
-    {
-      "idx": 133,
-      "version": "7",
-      "when": 1766301478005,
-      "tag": "0133_striped_the_order",
-      "breakpoints": true
     }
   ]
 }

apps/dokploy/package.json

@@ -33,7 +33,7 @@
 		"docker:build:canary": "./docker/build.sh canary",
 		"docker:push:canary": "./docker/push.sh canary",
 		"version": "echo $(node -p \"require('./package.json').version\")",
-		"test": "vitest --config __test__/vitest.config.ts",
+		"test": "vitest --config __test__/vitest.config.ts volume-backups",
 		"generate:openapi": "tsx -r dotenv/config scripts/generate-openapi.ts"
 	},
 	"dependencies": {
@@ -140,6 +140,7 @@
 		"react-i18next": "^15.5.2",
 		"react-markdown": "^9.1.0",
 		"recharts": "^2.15.3",
+		"rotating-file-stream": "3.2.3",
 		"slugify": "^1.6.6",
 		"sonner": "^1.7.4",
 		"ssh2": "1.15.0",

apps/dokploy/server/api/routers/admin.ts

@@ -1,8 +1,8 @@
 import {
-	getWebServerSettings,
+	findUserById,
 	IS_CLOUD,
 	setupWebMonitoring,
-	updateWebServerSettings,
+	updateUser,
 } from "@dokploy/server";
 import { TRPCError } from "@trpc/server";
 import { apiUpdateWebServerMonitoring } from "@/server/db/schema";
@@ -11,7 +11,7 @@ import { adminProcedure, createTRPCRouter } from "../trpc";
 export const adminRouter = createTRPCRouter({
 	setupMonitoring: adminProcedure
 		.input(apiUpdateWebServerMonitoring)
-		.mutation(async ({ input }) => {
+		.mutation(async ({ input, ctx }) => {
 			try {
 				if (IS_CLOUD) {
 					throw new TRPCError({
@@ -19,8 +19,15 @@ export const adminRouter = createTRPCRouter({
 						message: "Feature disabled on cloud",
 					});
 				}
+				const user = await findUserById(ctx.user.ownerId);
+				if (user.id !== ctx.user.ownerId) {
+					throw new TRPCError({
+						code: "UNAUTHORIZED",
+						message: "You are not authorized to setup the monitoring",
+					});
+				}
 
-				await updateWebServerSettings({
+				await updateUser(user.id, {
 					metricsConfig: {
 						server: {
 							type: "Dokploy",
@@ -45,9 +52,8 @@ export const adminRouter = createTRPCRouter({
 					},
 				});
 
-				await setupWebMonitoring();
-				const settings = await getWebServerSettings();
-				return settings;
+				const currentServer = await setupWebMonitoring(user.id);
+				return currentServer;
 			} catch (error) {
 				throw error;
 			}

apps/dokploy/server/api/routers/ai.ts

@@ -68,40 +68,6 @@ export const aiRouter = createTRPCRouter({
 							{ headers: {} },
 						);
 						break;
-					case "perplexity":
-						// Perplexity doesn't have a /models endpoint, return hardcoded list
-						return [
-							{
-								id: "sonar-deep-research",
-								object: "model",
-								created: Date.now(),
-								owned_by: "perplexity",
-							},
-							{
-								id: "sonar-reasoning-pro",
-								object: "model",
-								created: Date.now(),
-								owned_by: "perplexity",
-							},
-							{
-								id: "sonar-reasoning",
-								object: "model",
-								created: Date.now(),
-								owned_by: "perplexity",
-							},
-							{
-								id: "sonar-pro",
-								object: "model",
-								created: Date.now(),
-								owned_by: "perplexity",
-							},
-							{
-								id: "sonar",
-								object: "model",
-								created: Date.now(),
-								owned_by: "perplexity",
-							},
-						] as Model[];
 					default:
 						if (!input.apiKey)
 							throw new TRPCError({

apps/dokploy/server/api/routers/compose.ts

@@ -17,8 +17,8 @@ import {
 	findGitProviderById,
 	findProjectById,
 	findServerById,
+	findUserById,
 	getComposeContainer,
-	getWebServerSettings,
 	IS_CLOUD,
 	loadServices,
 	randomizeComposeFile,
@@ -569,7 +569,8 @@ export const composeRouter = createTRPCRouter({
 
 			const template = await fetchTemplateFiles(input.id, input.baseUrl);
 
-			let serverIp = "127.0.0.1";
+			const admin = await findUserById(ctx.user.ownerId);
+			let serverIp = admin.serverIp || "127.0.0.1";
 
 			const project = await findProjectById(environment.projectId);
 
@@ -578,9 +579,6 @@ export const composeRouter = createTRPCRouter({
 				serverIp = server.ipAddress;
 			} else if (process.env.NODE_ENV === "development") {
 				serverIp = "127.0.0.1";
-			} else {
-				const settings = await getWebServerSettings();
-				serverIp = settings?.serverIp || "127.0.0.1";
 			}
 
 			const projectName = slugify(`${project.name} ${input.id}`);
@@ -805,16 +803,14 @@ export const composeRouter = createTRPCRouter({
 				const decodedData = Buffer.from(input.base64, "base64").toString(
 					"utf-8",
 				);
-				let serverIp = "127.0.0.1";
+				const admin = await findUserById(ctx.user.ownerId);
+				let serverIp = admin.serverIp || "127.0.0.1";
 
 				if (compose.serverId) {
 					const server = await findServerById(compose.serverId);
 					serverIp = server.ipAddress;
 				} else if (process.env.NODE_ENV === "development") {
 					serverIp = "127.0.0.1";
-				} else {
-					const settings = await getWebServerSettings();
-					serverIp = settings?.serverIp || "127.0.0.1";
 				}
 				const templateData = JSON.parse(decodedData);
 				const config = parse(templateData.config) as CompleteTemplate;
@@ -884,16 +880,14 @@ export const composeRouter = createTRPCRouter({
 					await removeDomainById(domain.domainId);
 				}
 
-				let serverIp = "127.0.0.1";
+				const admin = await findUserById(ctx.user.ownerId);
+				let serverIp = admin.serverIp || "127.0.0.1";
 
 				if (compose.serverId) {
 					const server = await findServerById(compose.serverId);
 					serverIp = server.ipAddress;
 				} else if (process.env.NODE_ENV === "development") {
 					serverIp = "127.0.0.1";
-				} else {
-					const settings = await getWebServerSettings();
-					serverIp = settings?.serverIp || "127.0.0.1";
 				}
 
 				const templateData = JSON.parse(decodedData);

apps/dokploy/server/api/routers/domain.ts

@@ -9,7 +9,6 @@ import {
 	findPreviewDeploymentById,
 	findServerById,
 	generateTraefikMeDomain,
-	getWebServerSettings,
 	manageDomain,
 	removeDomain,
 	removeDomainById,
@@ -108,13 +107,16 @@ export const domainRouter = createTRPCRouter({
 		}),
 	canGenerateTraefikMeDomains: protectedProcedure
 		.input(z.object({ serverId: z.string() }))
-		.query(async ({ input }) => {
+		.query(async ({ input, ctx }) => {
+			const organization = await findOrganizationById(
+				ctx.session.activeOrganizationId,
+			);
+
 			if (input.serverId) {
 				const server = await findServerById(input.serverId);
 				return server.ipAddress;
 			}
-			const settings = await getWebServerSettings();
-			return settings?.serverIp || "";
+			return organization?.owner.serverIp;
 		}),
 
 	update: protectedProcedure

apps/dokploy/server/api/routers/notification.ts

@@ -8,7 +8,6 @@ import {
 	createSlackNotification,
 	createTelegramNotification,
 	findNotificationById,
-	getWebServerSettings,
 	IS_CLOUD,
 	removeNotificationById,
 	sendCustomNotification,
@@ -67,6 +66,7 @@ import {
 	apiUpdateTelegram,
 	notifications,
 	server,
+	user,
 } from "@/server/db/schema";
 
 export const notificationRouter = createTRPCRouter({
@@ -364,20 +364,21 @@ export const notificationRouter = createTRPCRouter({
 				let organizationId = "";
 				let ServerName = "";
 				if (input.ServerType === "Dokploy") {
-					const settings = await getWebServerSettings();
-					if (
-						!settings?.metricsConfig?.server?.token ||
-						settings.metricsConfig.server.token !== input.Token
-					) {
+					const result = await db
+						.select()
+						.from(user)
+						.where(
+							sql`${user.metricsConfig}::jsonb -> 'server' ->> 'token' = ${input.Token}`,
+						);
+
+					if (!result?.[0]?.id) {
 						throw new TRPCError({
 							code: "BAD_REQUEST",
 							message: "Token not found",
 						});
 					}
 
-					// For Dokploy server type, we don't have a specific organizationId
-					// This might need to be adjusted based on your business logic
-					organizationId = "";
+					organizationId = result?.[0]?.id;
 					ServerName = "Dokploy";
 				} else {
 					const result = await db

apps/dokploy/server/api/routers/settings.ts

@@ -12,11 +12,11 @@ import {
 	DEFAULT_UPDATE_DATA,
 	execAsync,
 	findServerById,
+	findUserById,
 	getDokployImage,
 	getDokployImageTag,
 	getLogCleanupStatus,
 	getUpdateData,
-	getWebServerSettings,
 	IS_CLOUD,
 	parseRawConfig,
 	paths,
@@ -40,7 +40,7 @@ import {
 	updateLetsEncryptEmail,
 	updateServerById,
 	updateServerTraefik,
-	updateWebServerSettings,
+	updateUser,
 	writeConfig,
 	writeMainConfig,
 	writeTraefikConfigInPath,
@@ -77,13 +77,6 @@ import {
 } from "../trpc";
 
 export const settingsRouter = createTRPCRouter({
-	getWebServerSettings: protectedProcedure.query(async () => {
-		if (IS_CLOUD) {
-			return null;
-		}
-		const settings = await getWebServerSettings();
-		return settings;
-	}),
 	reloadServer: adminProcedure.mutation(async () => {
 		if (IS_CLOUD) {
 			return true;
@@ -216,11 +209,11 @@ export const settingsRouter = createTRPCRouter({
 	}),
 	saveSSHPrivateKey: adminProcedure
 		.input(apiSaveSSHKey)
-		.mutation(async ({ input }) => {
+		.mutation(async ({ input, ctx }) => {
 			if (IS_CLOUD) {
 				return true;
 			}
-			await updateWebServerSettings({
+			await updateUser(ctx.user.ownerId, {
 				sshPrivateKey: input.sshPrivateKey,
 			});
 
@@ -228,36 +221,36 @@ export const settingsRouter = createTRPCRouter({
 		}),
 	assignDomainServer: adminProcedure
 		.input(apiAssignDomain)
-		.mutation(async ({ input }) => {
+		.mutation(async ({ ctx, input }) => {
 			if (IS_CLOUD) {
 				return true;
 			}
-			const settings = await updateWebServerSettings({
+			const user = await updateUser(ctx.user.ownerId, {
 				host: input.host,
 				letsEncryptEmail: input.letsEncryptEmail,
 				certificateType: input.certificateType,
 				https: input.https,
 			});
 
-			if (!settings) {
+			if (!user) {
 				throw new TRPCError({
 					code: "NOT_FOUND",
-					message: "Web server settings not found",
+					message: "User not found",
 				});
 			}
 
-			updateServerTraefik(settings, input.host);
+			updateServerTraefik(user, input.host);
 			if (input.letsEncryptEmail) {
 				updateLetsEncryptEmail(input.letsEncryptEmail);
 			}
 
-			return settings;
+			return user;
 		}),
-	cleanSSHPrivateKey: adminProcedure.mutation(async () => {
+	cleanSSHPrivateKey: adminProcedure.mutation(async ({ ctx }) => {
 		if (IS_CLOUD) {
 			return true;
 		}
-		await updateWebServerSettings({
+		await updateUser(ctx.user.ownerId, {
 			sshPrivateKey: null,
 		});
 		return true;
@@ -317,11 +310,11 @@ export const settingsRouter = createTRPCRouter({
 					}
 				}
 			} else if (!IS_CLOUD) {
-				const settingsUpdated = await updateWebServerSettings({
+				const userUpdated = await updateUser(ctx.user.ownerId, {
 					enableDockerCleanup: input.enableDockerCleanup,
 				});
 
-				if (settingsUpdated?.enableDockerCleanup) {
+				if (userUpdated?.enableDockerCleanup) {
 					scheduleJob("docker-cleanup", "0 0 * * *", async () => {
 						console.log(
 							`Docker Cleanup ${new Date().toLocaleString()}] Running...`,
@@ -495,28 +488,13 @@ export const settingsRouter = createTRPCRouter({
 
 			return readConfigInPath(input.path, input.serverId);
 		}),
-	getIp: protectedProcedure.query(async () => {
+	getIp: protectedProcedure.query(async ({ ctx }) => {
 		if (IS_CLOUD) {
-			return "";
+			return true;
 		}
-		const settings = await getWebServerSettings();
-		return settings?.serverIp || "";
+		const user = await findUserById(ctx.user.ownerId);
+		return user.serverIp;
 	}),
-	updateServerIp: adminProcedure
-		.input(
-			z.object({
-				serverIp: z.string(),
-			}),
-		)
-		.mutation(async ({ input }) => {
-			if (IS_CLOUD) {
-				return true;
-			}
-			const settings = await updateWebServerSettings({
-				serverIp: input.serverIp,
-			});
-			return settings;
-		}),
 
 	getOpenApiDocument: protectedProcedure.query(
 		async ({ ctx }): Promise<unknown> => {

apps/dokploy/server/api/routers/user.ts

@@ -5,7 +5,6 @@ import {
 	findUserById,
 	getDokployUrl,
 	getUserByToken,
-	getWebServerSettings,
 	IS_CLOUD,
 	removeUserById,
 	sendEmailNotification,
@@ -215,11 +214,10 @@ export const userRouter = createTRPCRouter({
 		}),
 	getMetricsToken: protectedProcedure.query(async ({ ctx }) => {
 		const user = await findUserById(ctx.user.ownerId);
-		const settings = await getWebServerSettings();
 		return {
-			serverIp: settings?.serverIp,
+			serverIp: user.serverIp,
 			enabledFeatures: user.enablePaidFeatures,
-			metricsConfig: settings?.metricsConfig,
+			metricsConfig: user?.metricsConfig,
 		};
 	}),
 	remove: protectedProcedure

packages/server/package.json

@@ -75,6 +75,7 @@
     "qrcode": "^1.5.4",
     "react": "18.2.0",
     "react-dom": "18.2.0",
+    "rotating-file-stream": "3.2.3",
     "shell-quote": "^1.8.1",
     "slugify": "^1.6.6",
     "ssh2": "1.15.0",

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

@@ -35,4 +35,3 @@ export * from "./ssh-key";
 export * from "./user";
 export * from "./utils";
 export * from "./volume-backups";
-export * from "./web-server-settings";

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

@@ -3,6 +3,7 @@ import { relations } from "drizzle-orm";
 import {
 	boolean,
 	integer,
+	jsonb,
 	pgTable,
 	text,
 	timestamp,
@@ -14,6 +15,7 @@ import { account, apikey, organization } from "./account";
 import { backups } from "./backups";
 import { projects } from "./project";
 import { schedules } from "./schedule";
+import { certificateType } from "./shared";
 /**
  * This is an example of how to use the multi-project schema feature of Drizzle ORM. Use the same
  * database instance for multiple projects.
@@ -49,10 +51,73 @@ export const user = pgTable("user", {
 	banExpires: timestamp("ban_expires"),
 	updatedAt: timestamp("updated_at").notNull(),
 	// Admin
+	serverIp: text("serverIp"),
+	certificateType: certificateType("certificateType").notNull().default("none"),
+	https: boolean("https").notNull().default(false),
+	host: text("host"),
+	letsEncryptEmail: text("letsEncryptEmail"),
+	sshPrivateKey: text("sshPrivateKey"),
+	enableDockerCleanup: boolean("enableDockerCleanup").notNull().default(true),
+	logCleanupCron: text("logCleanupCron").default("0 0 * * *"),
 	role: text("role").notNull().default("user"),
 	// Metrics
 	enablePaidFeatures: boolean("enablePaidFeatures").notNull().default(false),
 	allowImpersonation: boolean("allowImpersonation").notNull().default(false),
+	metricsConfig: jsonb("metricsConfig")
+		.$type<{
+			server: {
+				type: "Dokploy" | "Remote";
+				refreshRate: number;
+				port: number;
+				token: string;
+				urlCallback: string;
+				retentionDays: number;
+				cronJob: string;
+				thresholds: {
+					cpu: number;
+					memory: number;
+				};
+			};
+			containers: {
+				refreshRate: number;
+				services: {
+					include: string[];
+					exclude: string[];
+				};
+			};
+		}>()
+		.notNull()
+		.default({
+			server: {
+				type: "Dokploy",
+				refreshRate: 60,
+				port: 4500,
+				token: "",
+				retentionDays: 2,
+				cronJob: "",
+				urlCallback: "",
+				thresholds: {
+					cpu: 0,
+					memory: 0,
+				},
+			},
+			containers: {
+				refreshRate: 60,
+				services: {
+					include: [],
+					exclude: [],
+				},
+			},
+		}),
+	cleanupCacheApplications: boolean("cleanupCacheApplications")
+		.notNull()
+		.default(false),
+	cleanupCacheOnPreviews: boolean("cleanupCacheOnPreviews")
+		.notNull()
+		.default(false),
+	cleanupCacheOnCompose: boolean("cleanupCacheOnCompose")
+		.notNull()
+		.default(false),
 	stripeCustomerId: text("stripeCustomerId"),
 	stripeSubscriptionId: text("stripeSubscriptionId"),
 	serversQuantity: integer("serversQuantity").notNull().default(0),
@@ -138,6 +203,33 @@ export const apiFindOneUserByAuth = createSchema
 		// authId: true,
 	})
 	.required();
+export const apiSaveSSHKey = createSchema
+	.pick({
+		sshPrivateKey: true,
+	})
+	.required();
+
+export const apiAssignDomain = createSchema
+	.pick({
+		host: true,
+		certificateType: true,
+		letsEncryptEmail: true,
+		https: true,
+	})
+	.required()
+	.partial({
+		letsEncryptEmail: true,
+		https: true,
+	});
+
+export const apiUpdateDockerCleanup = createSchema
+	.pick({
+		enableDockerCleanup: true,
+	})
+	.required()
+	.extend({
+		serverId: z.string().optional(),
+	});
 
 export const apiTraefikConfig = z.object({
 	traefikConfig: z.string().min(1),
@@ -206,6 +298,32 @@ export const apiReadStatsLogs = z.object({
 		.optional(),
 });
 
+export const apiUpdateWebServerMonitoring = z.object({
+	metricsConfig: z
+		.object({
+			server: z.object({
+				refreshRate: z.number().min(2),
+				port: z.number().min(1),
+				token: z.string(),
+				urlCallback: z.string().url(),
+				retentionDays: z.number().min(1),
+				cronJob: z.string().min(1),
+				thresholds: z.object({
+					cpu: z.number().min(0),
+					memory: z.number().min(0),
+				}),
+			}),
+			containers: z.object({
+				refreshRate: z.number().min(2),
+				services: z.object({
+					include: z.array(z.string()).optional(),
+					exclude: z.array(z.string()).optional(),
+				}),
+			}),
+		})
+		.required(),
+});
+
 export const apiUpdateUser = createSchema.partial().extend({
 	email: z
 		.string()
@@ -216,4 +334,29 @@ export const apiUpdateUser = createSchema.partial().extend({
 	currentPassword: z.string().optional(),
 	name: z.string().optional(),
 	lastName: z.string().optional(),
+	metricsConfig: z
+		.object({
+			server: z.object({
+				type: z.enum(["Dokploy", "Remote"]),
+				refreshRate: z.number(),
+				port: z.number(),
+				token: z.string(),
+				urlCallback: z.string(),
+				retentionDays: z.number(),
+				cronJob: z.string(),
+				thresholds: z.object({
+					cpu: z.number(),
+					memory: z.number(),
+				}),
+			}),
+			containers: z.object({
+				refreshRate: z.number(),
+				services: z.object({
+					include: z.array(z.string()),
+					exclude: z.array(z.string()),
+				}),
+			}),
+		})
+		.optional(),
+	logCleanupCron: z.string().optional().nullable(),
 });

packages/server/src/db/schema/web-server-settings.ts

@@ -1,178 +0,0 @@
-import { relations } from "drizzle-orm";
-import { boolean, jsonb, pgTable, text, timestamp } from "drizzle-orm/pg-core";
-import { createInsertSchema } from "drizzle-zod";
-import { nanoid } from "nanoid";
-import { z } from "zod";
-import { certificateType } from "./shared";
-
-export const webServerSettings = pgTable("webServerSettings", {
-	id: text("id")
-		.notNull()
-		.primaryKey()
-		.$defaultFn(() => nanoid()),
-	// Web Server Configuration
-	serverIp: text("serverIp"),
-	certificateType: certificateType("certificateType").notNull().default("none"),
-	https: boolean("https").notNull().default(false),
-	host: text("host"),
-	letsEncryptEmail: text("letsEncryptEmail"),
-	sshPrivateKey: text("sshPrivateKey"),
-	enableDockerCleanup: boolean("enableDockerCleanup").notNull().default(true),
-	logCleanupCron: text("logCleanupCron").default("0 0 * * *"),
-	// Metrics Configuration
-	metricsConfig: jsonb("metricsConfig")
-		.$type<{
-			server: {
-				type: "Dokploy" | "Remote";
-				refreshRate: number;
-				port: number;
-				token: string;
-				urlCallback: string;
-				retentionDays: number;
-				cronJob: string;
-				thresholds: {
-					cpu: number;
-					memory: number;
-				};
-			};
-			containers: {
-				refreshRate: number;
-				services: {
-					include: string[];
-					exclude: string[];
-				};
-			};
-		}>()
-		.notNull()
-		.default({
-			server: {
-				type: "Dokploy",
-				refreshRate: 60,
-				port: 4500,
-				token: "",
-				retentionDays: 2,
-				cronJob: "",
-				urlCallback: "",
-				thresholds: {
-					cpu: 0,
-					memory: 0,
-				},
-			},
-			containers: {
-				refreshRate: 60,
-				services: {
-					include: [],
-					exclude: [],
-				},
-			},
-		}),
-	// Cache Cleanup Configuration
-	cleanupCacheApplications: boolean("cleanupCacheApplications")
-		.notNull()
-		.default(false),
-	cleanupCacheOnPreviews: boolean("cleanupCacheOnPreviews")
-		.notNull()
-		.default(false),
-	cleanupCacheOnCompose: boolean("cleanupCacheOnCompose")
-		.notNull()
-		.default(false),
-	createdAt: timestamp("created_at").defaultNow(),
-	updatedAt: timestamp("updated_at").notNull().defaultNow(),
-});
-
-export const webServerSettingsRelations = relations(
-	webServerSettings,
-	() => ({}),
-);
-
-const createSchema = createInsertSchema(webServerSettings, {
-	id: z.string().min(1),
-});
-
-export const apiUpdateWebServerSettings = createSchema.partial().extend({
-	serverIp: z.string().optional(),
-	certificateType: z.enum(["letsencrypt", "none", "custom"]).optional(),
-	https: z.boolean().optional(),
-	host: z.string().optional(),
-	letsEncryptEmail: z.string().email().optional().nullable(),
-	sshPrivateKey: z.string().optional(),
-	enableDockerCleanup: z.boolean().optional(),
-	logCleanupCron: z.string().optional().nullable(),
-	metricsConfig: z
-		.object({
-			server: z.object({
-				type: z.enum(["Dokploy", "Remote"]),
-				refreshRate: z.number(),
-				port: z.number(),
-				token: z.string(),
-				urlCallback: z.string(),
-				retentionDays: z.number(),
-				cronJob: z.string(),
-				thresholds: z.object({
-					cpu: z.number(),
-					memory: z.number(),
-				}),
-			}),
-			containers: z.object({
-				refreshRate: z.number(),
-				services: z.object({
-					include: z.array(z.string()),
-					exclude: z.array(z.string()),
-				}),
-			}),
-		})
-		.optional(),
-	cleanupCacheApplications: z.boolean().optional(),
-	cleanupCacheOnPreviews: z.boolean().optional(),
-	cleanupCacheOnCompose: z.boolean().optional(),
-});
-
-export const apiAssignDomain = z
-	.object({
-		host: z.string(),
-		certificateType: z.enum(["letsencrypt", "none", "custom"]),
-		letsEncryptEmail: z.string().email().optional().nullable(),
-		https: z.boolean().optional(),
-	})
-	.required()
-	.partial({
-		letsEncryptEmail: true,
-		https: true,
-	});
-
-export const apiSaveSSHKey = z
-	.object({
-		sshPrivateKey: z.string(),
-	})
-	.required();
-
-export const apiUpdateDockerCleanup = z.object({
-	enableDockerCleanup: z.boolean(),
-	serverId: z.string().optional(),
-});
-
-export const apiUpdateWebServerMonitoring = z.object({
-	metricsConfig: z
-		.object({
-			server: z.object({
-				refreshRate: z.number().min(2),
-				port: z.number().min(1),
-				token: z.string(),
-				urlCallback: z.string().url(),
-				retentionDays: z.number().min(1),
-				cronJob: z.string().min(1),
-				thresholds: z.object({
-					cpu: z.number().min(0),
-					memory: z.number().min(0),
-				}),
-			}),
-			containers: z.object({
-				refreshRate: z.number().min(2),
-				services: z.object({
-					include: z.array(z.string()).optional(),
-					exclude: z.array(z.string()).optional(),
-				}),
-			}),
-		})
-		.required(),
-});

packages/server/src/index.ts

@@ -41,7 +41,6 @@ export * from "./services/settings";
 export * from "./services/ssh-key";
 export * from "./services/user";
 export * from "./services/volume-backups";
-export * from "./services/web-server-settings";
 export * from "./setup/config-paths";
 export * from "./setup/monitoring-setup";
 export * from "./setup/postgres-setup";

packages/server/src/lib/auth.ts

@@ -9,10 +9,7 @@ import { IS_CLOUD } from "../constants";
 import { db } from "../db";
 import * as schema from "../db/schema";
 import { getUserByToken } from "../services/admin";
-import {
-	getWebServerSettings,
-	updateWebServerSettings,
-} from "../services/web-server-settings";
+import { updateUser } from "../services/user";
 import { getHubSpotUTK, submitToHubSpot } from "../utils/tracking/hubspot";
 import { sendEmail } from "../verification/send-verification-email";
 import { getPublicIpWithFallback } from "../wss/utils";
@@ -38,14 +35,22 @@ const { handler, api } = betterAuth({
 	},
 	...(!IS_CLOUD && {
 		async trustedOrigins() {
-			const settings = await getWebServerSettings();
-			if (!settings) {
-				return [];
+			const admin = await db.query.member.findFirst({
+				where: eq(schema.member.role, "owner"),
+				with: {
+					user: true,
+				},
+			});
+
+			if (admin?.user) {
+				return [
+					...(admin.user.serverIp
+						? [`http://${admin.user.serverIp}:3000`]
+						: []),
+					...(admin.user.host ? [`https://${admin.user.host}`] : []),
+				];
 			}
-			return [
-				...(settings?.serverIp ? [`http://${settings?.serverIp}:3000`] : []),
-				...(settings?.host ? [`https://${settings?.host}`] : []),
-			];
+			return [];
 		},
 	}),
 	emailVerification: {
@@ -117,7 +122,7 @@ const { handler, api } = betterAuth({
 					});
 
 					if (!IS_CLOUD) {
-						await updateWebServerSettings({
+						await updateUser(user.id, {
 							serverIp: await getPublicIpWithFallback(),
 						});
 					}

packages/server/src/services/admin.ts

@@ -8,7 +8,6 @@ import {
 import { TRPCError } from "@trpc/server";
 import { eq } from "drizzle-orm";
 import { IS_CLOUD } from "../constants";
-import { getWebServerSettings } from "./web-server-settings";
 
 export const findUserById = async (userId: string) => {
 	const userResult = await db.query.user.findFirst({
@@ -108,11 +107,11 @@ export const getDokployUrl = async () => {
 	if (IS_CLOUD) {
 		return "https://app.dokploy.com";
 	}
-	const settings = await getWebServerSettings();
+	const owner = await findOwner();
 
-	if (settings?.host) {
-		const protocol = settings?.https ? "https" : "http";
-		return `${protocol}://${settings?.host}`;
+	if (owner.user.host) {
+		const protocol = owner.user.https ? "https" : "http";
+		return `${protocol}://${owner.user.host}`;
 	}
-	return `http://${settings?.serverIp}:${process.env.PORT}`;
+	return `http://${owner.user.serverIp}:${process.env.PORT}`;
 };

packages/server/src/services/ai.ts

@@ -6,8 +6,8 @@ import { generateObject } from "ai";
 import { desc, eq } from "drizzle-orm";
 import { z } from "zod";
 import { IS_CLOUD } from "../constants";
+import { findOrganizationById } from "./admin";
 import { findServerById } from "./server";
-import { getWebServerSettings } from "./web-server-settings";
 
 export const getAiSettingsByOrganizationId = async (organizationId: string) => {
 	const aiSettings = await db.query.ai.findMany({
@@ -79,8 +79,8 @@ export const suggestVariants = async ({
 
 		let ip = "";
 		if (!IS_CLOUD) {
-			const settings = await getWebServerSettings();
-			ip = settings?.serverIp || "";
+			const organization = await findOrganizationById(organizationId);
+			ip = organization?.owner.serverIp || "";
 		}
 
 		if (serverId) {

packages/server/src/services/domain.ts

@@ -3,10 +3,10 @@ import { promisify } from "node:util";
 import { db } from "@dokploy/server/db";
 import { generateRandomDomain } from "@dokploy/server/templates";
 import { manageDomain } from "@dokploy/server/utils/traefik/domain";
-import { getWebServerSettings } from "@dokploy/server/services/web-server-settings";
 import { TRPCError } from "@trpc/server";
 import { eq } from "drizzle-orm";
 import { type apiCreateDomain, domains } from "../db/schema";
+import { findUserById } from "./admin";
 import { findApplicationById } from "./application";
 import { detectCDNProvider } from "./cdn";
 import { findServerById } from "./server";
@@ -61,9 +61,9 @@ export const generateTraefikMeDomain = async (
 			projectName: appName,
 		});
 	}
-	const settings = await getWebServerSettings();
+	const admin = await findUserById(userId);
 	return generateRandomDomain({
-		serverIp: settings?.serverIp || "",
+		serverIp: admin?.serverIp || "",
 		projectName: appName,
 	});
 };

packages/server/src/services/preview-deployment.ts

@@ -13,11 +13,11 @@ import { removeDirectoryCode } from "../utils/filesystem/directory";
 import { authGithub } from "../utils/providers/github";
 import { removeTraefikConfig } from "../utils/traefik/application";
 import { manageDomain } from "../utils/traefik/domain";
+import { findUserById } from "./admin";
 import { findApplicationById } from "./application";
 import { removeDeploymentsByPreviewDeploymentId } from "./deployment";
 import { createDomain } from "./domain";
 import { type Github, getIssueComment } from "./github";
-import { getWebServerSettings } from "./web-server-settings";
 
 export type PreviewDeployment = typeof previewDeployments.$inferSelect;
 
@@ -253,8 +253,8 @@ const generateWildcardDomain = async (
 		}
 
 		if (!ip) {
-			const settings = await getWebServerSettings();
-			ip = settings?.serverIp || "";
+			const admin = await findUserById(userId);
+			ip = admin?.serverIp || "";
 		}
 
 		const slugIp = ip.replaceAll(".", "-");

packages/server/src/services/web-server-settings.ts

@@ -1,44 +0,0 @@
-import { db } from "@dokploy/server/db";
-import { webServerSettings } from "@dokploy/server/db/schema";
-import { eq } from "drizzle-orm";
-
-/**
- * Get the web server settings (singleton - only one row should exist)
- */
-export const getWebServerSettings = async () => {
-	const settings = await db.query.webServerSettings.findFirst({
-		orderBy: (settings, { asc }) => [asc(settings.createdAt)],
-	});
-
-	if (!settings) {
-		// Create default settings if none exist
-		const [newSettings] = await db
-			.insert(webServerSettings)
-			.values({})
-			.returning();
-
-		return newSettings;
-	}
-
-	return settings;
-};
-
-/**
- * Update web server settings
- */
-export const updateWebServerSettings = async (
-	updates: Partial<typeof webServerSettings.$inferInsert>,
-) => {
-	const current = await getWebServerSettings();
-
-	const [updated] = await db
-		.update(webServerSettings)
-		.set({
-			...updates,
-			updatedAt: new Date(),
-		})
-		.where(eq(webServerSettings.id, current?.id ?? ""))
-		.returning();
-
-	return updated;
-};

packages/server/src/setup/monitoring-setup.ts

@@ -1,7 +1,7 @@
 import { findServerById } from "@dokploy/server/services/server";
-import { getWebServerSettings } from "@dokploy/server/services/web-server-settings";
 import type { ContainerCreateOptions } from "dockerode";
 import { IS_CLOUD } from "../constants";
+import { findUserById } from "../services/admin";
 import { getDokployImageTag } from "../services/settings";
 import { pullImage, pullRemoteImage } from "../utils/docker/utils";
 import { execAsync, execAsyncRemote } from "../utils/process/execAsync";
@@ -83,8 +83,8 @@ export const setupMonitoring = async (serverId: string) => {
 	}
 };
 
-export const setupWebMonitoring = async () => {
-	const webServerSettings = await getWebServerSettings();
+export const setupWebMonitoring = async (userId: string) => {
+	const user = await findUserById(userId);
 
 	const containerName = "dokploy-monitoring";
 	let imageName = "dokploy/monitoring:latest";
@@ -99,7 +99,7 @@ export const setupWebMonitoring = async () => {
 
 	const settings: ContainerCreateOptions = {
 		name: containerName,
-		Env: [`METRICS_CONFIG=${JSON.stringify(webServerSettings?.metricsConfig)}`],
+		Env: [`METRICS_CONFIG=${JSON.stringify(user?.metricsConfig)}`],
 		Image: imageName,
 		HostConfig: {
 			// Memory: 100 * 1024 * 1024, // 100MB en bytes
@@ -110,9 +110,9 @@ export const setupWebMonitoring = async () => {
 				Name: "always",
 			},
 			PortBindings: {
-				[`${webServerSettings?.metricsConfig?.server?.port}/tcp`]: [
+				[`${user?.metricsConfig?.server?.port}/tcp`]: [
 					{
-						HostPort: webServerSettings?.metricsConfig?.server?.port.toString(),
+						HostPort: user?.metricsConfig?.server?.port.toString(),
 					},
 				],
 			},
@@ -126,7 +126,7 @@ export const setupWebMonitoring = async () => {
 			// NetworkMode: "host",
 		},
 		ExposedPorts: {
-			[`${webServerSettings?.metricsConfig?.server?.port}/tcp`]: {},
+			[`${user?.metricsConfig?.server?.port}/tcp`]: {},
 		},
 	};
 	const docker = await getRemoteDocker();

packages/server/src/utils/access-log/handler.ts

@@ -1,8 +1,6 @@
 import { paths } from "@dokploy/server/constants";
-import {
-	getWebServerSettings,
-	updateWebServerSettings,
-} from "@dokploy/server/services/web-server-settings";
+import { findOwner } from "@dokploy/server/services/admin";
+import { updateUser } from "@dokploy/server/services/user";
 import { scheduledJobs, scheduleJob } from "node-schedule";
 import { execAsync } from "../process/execAsync";
 
@@ -31,9 +29,12 @@ export const startLogCleanup = async (
 			}
 		});
 
-		await updateWebServerSettings({
-			logCleanupCron: cronExpression,
-		});
+		const owner = await findOwner();
+		if (owner) {
+			await updateUser(owner.user.id, {
+				logCleanupCron: cronExpression,
+			});
+		}
 
 		return true;
 	} catch (error) {
@@ -50,9 +51,12 @@ export const stopLogCleanup = async (): Promise<boolean> => {
 		}
 
 		// Update database
-		await updateWebServerSettings({
-			logCleanupCron: null,
-		});
+		const owner = await findOwner();
+		if (owner) {
+			await updateUser(owner.user.id, {
+				logCleanupCron: null,
+			});
+		}
 
 		return true;
 	} catch (error) {
@@ -65,8 +69,8 @@ export const getLogCleanupStatus = async (): Promise<{
 	enabled: boolean;
 	cronExpression: string | null;
 }> => {
-	const settings = await getWebServerSettings();
-	const cronExpression = settings?.logCleanupCron ?? null;
+	const owner = await findOwner();
+	const cronExpression = owner?.user.logCleanupCron ?? null;
 	return {
 		enabled: cronExpression !== null,
 		cronExpression,

packages/server/src/utils/backups/index.ts

@@ -2,7 +2,6 @@ import path from "node:path";
 import { member } from "@dokploy/server/db/schema";
 import type { BackupSchedule } from "@dokploy/server/services/backup";
 import { getAllServers } from "@dokploy/server/services/server";
-import { getWebServerSettings } from "@dokploy/server/services/web-server-settings";
 import { eq } from "drizzle-orm";
 import { scheduleJob } from "node-schedule";
 import { db } from "../../db/index";
@@ -26,9 +25,7 @@ export const initCronJobs = async () => {
 		return;
 	}
 
-	const webServerSettings = await getWebServerSettings();
-
-	if (webServerSettings?.enableDockerCleanup) {
+	if (admin?.user?.enableDockerCleanup) {
 		scheduleJob("docker-cleanup", "0 0 * * *", async () => {
 			console.log(
 				`Docker Cleanup ${new Date().toLocaleString()}]  Running docker cleanup`,
@@ -85,12 +82,9 @@ export const initCronJobs = async () => {
 		}
 	}
 
-	if (webServerSettings?.logCleanupCron) {
-		console.log(
-			"Starting log requests cleanup",
-			webServerSettings.logCleanupCron,
-		);
-		await startLogCleanup(webServerSettings.logCleanupCron);
+	if (admin?.user?.logCleanupCron) {
+		console.log("Starting log requests cleanup", admin.user.logCleanupCron);
+		await startLogCleanup(admin.user.logCleanupCron);
 	}
 };
 

packages/server/src/utils/builders/compose.ts

@@ -90,7 +90,7 @@ export const createCommand = (compose: ComposeNested) => {
 	if (composeType === "docker-compose") {
 		command = `compose -p ${appName} -f ${path} up -d --build --remove-orphans`;
 	} else if (composeType === "stack") {
-		command = `stack deploy -c ${path} ${appName} --prune --with-registry-auth`;
+		command = `stack deploy -c ${path} ${appName} --prune`;
 	}
 
 	return command;

packages/server/src/utils/cluster/upload.ts

@@ -117,7 +117,7 @@ const getRegistryCommands = (
 ): string => {
 	return `
 echo "📦 [Enabled Registry] Uploading image to '${registry.registryType}' | '${registryTag}'" ;
-echo "${registry.password}" | docker login ${registry.registryUrl} -u '${registry.username}' --password-stdin || { 
+echo "${registry.password}" | docker login ${registry.registryUrl} -u ${registry.username} --password-stdin || { 
 	echo "❌ DockerHub Failed" ;
 	exit 1;
 }

packages/server/src/utils/docker/utils.ts

@@ -146,17 +146,17 @@ export const getContainerByName = (name: string): Promise<ContainerInfo> => {
 };
 
 /**
- * Docker commands sent using this method are held in a hold when Docker is busy.
+ * Docker commands passed through this method are held during Docker's build or pull process.
  *
  * https://github.com/Dokploy/dokploy/pull/3064
+ * https://github.com/fir4tozden
  */
-export const dockerSafeExec = (exec: string) => `
-CHECK_INTERVAL=10
+export const dockerSafeExec = (exec: string) => `CHECK_INTERVAL=10
 
 echo "Preparing for execution..."
 
 while true; do
-    PROCESSES=$(ps aux | grep -E "^.*docker [A-Za-z]" | grep -v grep)
+    PROCESSES=$(ps aux | grep -E "docker build|docker pull" | grep -v grep)
 
     if [ -z "$PROCESSES" ]; then
         echo "Docker is idle. Starting execution..."
@@ -169,15 +169,14 @@ done
 
 ${exec}
 
-echo "Execution completed."
-`;
+echo "Execution completed."`;
 
 const cleanupCommands = {
 	containers: "docker container prune --force",
 	images: "docker image prune --all --force",
-	volumes: "docker volume prune --all --force",
 	builders: "docker builder prune --all --force",
 	system: "docker system prune --all --force",
+	volumes: "docker volume prune --all --force",
 };
 
 export const cleanupContainers = async (serverId?: string) => {
@@ -258,48 +257,24 @@ export const cleanupSystem = async (serverId?: string) => {
 	}
 };
 
-/**
- * Volume cleanup should always be performed manually by the user. The reason is that during automatic cleanup, a volume may be deleted due to a stopped container, which is a dangerous situation.
- *
- * https://github.com/Dokploy/dokploy/pull/3267
- */
-const excludedCleanupAllCommands: (keyof typeof cleanupCommands)[] = [
-	"volumes",
-];
-
 export const cleanupAll = async (serverId?: string) => {
-	for (const [key, command] of Object.entries(cleanupCommands) as [
-		keyof typeof cleanupCommands,
-		string,
-	][]) {
-		if (excludedCleanupAllCommands.includes(key)) continue;
-
-		try {
-			if (serverId) {
-				await execAsyncRemote(serverId, dockerSafeExec(command));
-			} else {
-				await execAsync(dockerSafeExec(command));
-			}
-		} catch {}
-	}
+	await cleanupContainers(serverId);
+	await cleanupImages(serverId);
+	await cleanupBuilders(serverId);
+	await cleanupSystem(serverId);
 };
 
 export const cleanupAllBackground = async (serverId?: string) => {
 	Promise.allSettled(
-		(
-			Object.entries(cleanupCommands) as [
-				keyof typeof cleanupCommands,
-				string,
-			][]
-		)
-			.filter(([key]) => !excludedCleanupAllCommands.includes(key))
-			.map(async ([, command]) => {
+		Object.values(cleanupCommands).map(async (command) => {
+			try {
 				if (serverId) {
 					await execAsyncRemote(serverId, dockerSafeExec(command));
 				} else {
 					await execAsync(dockerSafeExec(command));
 				}
-			}),
+			} catch (error) {}
+		}),
 	)
 		.then((results) => {
 			const failed = results.filter((r) => r.status === "rejected");

packages/server/src/utils/process/execAsync.ts

@@ -9,19 +9,12 @@ export { ExecError } from "./ExecError";
 
 const execAsyncBase = util.promisify(exec);
 
-// Set maxBuffer to 100MB to handle large backup restore operations
-// Default is 1MB which can cause "maxBuffer length exceeded" errors
-const MAX_EXEC_BUFFER_SIZE = 100 * 1024 * 1024;
-
 export const execAsync = async (
 	command: string,
-	options?: ExecOptions & { shell?: string },
+	options?: { cwd?: string; env?: NodeJS.ProcessEnv; shell?: string },
 ): Promise<{ stdout: string; stderr: string }> => {
 	try {
-		const result = await execAsyncBase(command, {
-			...options,
-			maxBuffer: options?.maxBuffer ?? MAX_EXEC_BUFFER_SIZE,
-		});
+		const result = await execAsyncBase(command, options);
 		return {
 			stdout: result.stdout.toString(),
 			stderr: result.stderr.toString(),
@@ -50,7 +43,6 @@ export const execAsync = async (
 interface ExecOptions {
 	cwd?: string;
 	env?: NodeJS.ProcessEnv;
-	maxBuffer?: number;
 }
 
 export const execAsyncStream = (
@@ -62,26 +54,22 @@ export const execAsyncStream = (
 		let stdoutComplete = "";
 		let stderrComplete = "";
 
-		const childProcess = exec(
-			command,
-			{ ...options, maxBuffer: options?.maxBuffer ?? MAX_EXEC_BUFFER_SIZE },
-			(error) => {
-				if (error) {
-					reject(
-						new ExecError(`Command execution failed: ${error.message}`, {
-							command,
-							stdout: stdoutComplete,
-							stderr: stderrComplete,
-							// @ts-ignore
-							exitCode: error.code,
-							originalError: error,
-						}),
-					);
-					return;
-				}
-				resolve({ stdout: stdoutComplete, stderr: stderrComplete });
-			},
-		);
+		const childProcess = exec(command, options, (error) => {
+			if (error) {
+				reject(
+					new ExecError(`Command execution failed: ${error.message}`, {
+						command,
+						stdout: stdoutComplete,
+						stderr: stderrComplete,
+						// @ts-ignore
+						exitCode: error.code,
+						originalError: error,
+					}),
+				);
+				return;
+			}
+			resolve({ stdout: stdoutComplete, stderr: stderrComplete });
+		});
 
 		childProcess.stdout?.on("data", (data: Buffer | string) => {
 			const stringData = data.toString();

packages/server/src/utils/traefik/web-server.ts

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { paths } from "@dokploy/server/constants";
-import type { webServerSettings } from "@dokploy/server/db/schema/web-server-settings";
+import type { User } from "@dokploy/server/services/user";
 import { parse, stringify } from "yaml";
 import {
 	loadOrCreateConfig,
@@ -12,10 +12,10 @@ import type { FileConfig } from "./file-types";
 import type { MainTraefikConfig } from "./types";
 
 export const updateServerTraefik = (
-	settings: typeof webServerSettings.$inferSelect | null,
+	user: User | null,
 	newHost: string | null,
 ) => {
-	const { https, certificateType } = settings || {};
+	const { https, certificateType } = user || {};
 	const appName = "dokploy";
 	const config: FileConfig = loadOrCreateConfig(appName);
 

packages/server/src/utils/volume-backups/backup.ts

@@ -27,6 +27,9 @@ export const backupVolume = async (
 	echo "Turning off volume backup: ${turnOff ? "Yes" : "No"}"
 	echo "Starting volume backup" 
 	echo "Dir: ${volumeBackupPath}"
+	echo "Ensuring ubuntu image is available..."
+	docker image inspect ubuntu:latest > /dev/null 2>&1 || docker pull ubuntu:latest
+	echo "Ubuntu image ready ✅"
     docker run --rm \
   -v ${volumeName}:/volume_data \
   -v ${volumeBackupPath}:/backup \

pnpm-lock.yaml

@@ -406,6 +406,9 @@ importers:
       recharts:
         specifier: ^2.15.3
         version: 2.15.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      rotating-file-stream:
+        specifier: 3.2.3
+        version: 3.2.3
       shell-quote:
         specifier: ^1.8.1
         version: 1.8.2
@@ -729,6 +732,9 @@ importers:
       react-dom:
         specifier: 18.2.0
         version: 18.2.0(react@18.2.0)
+      rotating-file-stream:
+        specifier: 3.2.3
+        version: 3.2.3
       shell-quote:
         specifier: ^1.8.1
         version: 1.8.2
@@ -7058,6 +7064,10 @@ packages:
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
+  rotating-file-stream@3.2.3:
+    resolution: {integrity: sha512-cfmm3tqdnbuYw2FBmRTPBDaohYEbMJ3211T35o6eZdr4d7v69+ZeK1Av84Br7FLj2dlzyeZSbN6qTuXXE6dawQ==}
+    engines: {node: '>=14.0'}
+
   rou3@0.5.1:
     resolution: {integrity: sha512-OXMmJ3zRk2xeXFGfA3K+EOPHC5u7RDFG7lIOx0X1pdnhUkI8MdVrbV+sNsD80ElpUZ+MRHdyxPnFthq9VHs8uQ==}
 
@@ -14650,6 +14660,8 @@ snapshots:
       '@rollup/rollup-win32-x64-msvc': 4.41.1
       fsevents: 2.3.3
 
+  rotating-file-stream@3.2.3: {}
+
   rou3@0.5.1: {}
 
   run-parallel@1.2.0: