Merge pull request #1529 from Dokploy/canary

🚀 Release v0.20.6

apps/dokploy/components/dashboard/application/domains/add-domain.tsx

@@ -42,6 +42,7 @@ import { domain } from "@/server/db/validations/domain";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Dices } from "lucide-react";
 import type z from "zod";
+import Link from "next/link";
 
 type Domain = z.infer<typeof domain>;
 
@@ -83,6 +84,13 @@ export const AddDomain = ({
 	const { mutateAsync: generateDomain, isLoading: isLoadingGenerate } =
 		api.domain.generateDomain.useMutation();
 
+	const { data: canGenerateTraefikMeDomains } =
+		api.domain.canGenerateTraefikMeDomains.useQuery({
+			serverId: application?.serverId || "",
+		});
+
+	console.log("canGenerateTraefikMeDomains", canGenerateTraefikMeDomains);
+
 	const form = useForm<Domain>({
 		resolver: zodResolver(domain),
 		defaultValues: {
@@ -186,6 +194,21 @@ export const AddDomain = ({
 									name="host"
 									render={({ field }) => (
 										<FormItem>
+											{!canGenerateTraefikMeDomains &&
+												field.value.includes("traefik.me") && (
+													<AlertBlock type="warning">
+														You need to set an IP address in your{" "}
+														<Link
+															href="/dashboard/settings/server"
+															className="text-primary"
+														>
+															{application?.serverId
+																? "Remote Servers -> Server -> Edit Server -> Update IP Address"
+																: "Web Server -> Server -> Update Server IP"}
+														</Link>{" "}
+														to make your traefik.me domain work.
+													</AlertBlock>
+												)}
 											<FormLabel>Host</FormLabel>
 											<div className="flex gap-2">
 												<FormControl>

apps/dokploy/components/dashboard/compose/domains/add-domain.tsx

@@ -42,6 +42,7 @@ import { domainCompose } from "@/server/db/validations/domain";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { DatabaseZap, Dices, RefreshCw } from "lucide-react";
 import type z from "zod";
+import Link from "next/link";
 
 type Domain = z.infer<typeof domainCompose>;
 
@@ -102,6 +103,11 @@ export const AddDomainCompose = ({
 		? api.domain.update.useMutation()
 		: api.domain.create.useMutation();
 
+	const { data: canGenerateTraefikMeDomains } =
+		api.domain.canGenerateTraefikMeDomains.useQuery({
+			serverId: compose?.serverId || "",
+		});
+
 	const form = useForm<Domain>({
 		resolver: zodResolver(domainCompose),
 		defaultValues: {
@@ -313,6 +319,21 @@ export const AddDomainCompose = ({
 									name="host"
 									render={({ field }) => (
 										<FormItem>
+											{!canGenerateTraefikMeDomains &&
+												field.value.includes("traefik.me") && (
+													<AlertBlock type="warning">
+														You need to set an IP address in your{" "}
+														<Link
+															href="/dashboard/settings/server"
+															className="text-primary"
+														>
+															{compose?.serverId
+																? "Remote Servers -> Server -> Edit Server -> Update IP Address"
+																: "Web Server -> Server -> Update Server IP"}
+														</Link>{" "}
+														to make your traefik.me domain work.
+													</AlertBlock>
+												)}
 											<FormLabel>Host</FormLabel>
 											<div className="flex gap-2">
 												<FormControl>

apps/dokploy/components/dashboard/database/backups/restore-backup.tsx

@@ -48,6 +48,7 @@ import { toast } from "sonner";
 interface Props {
 	databaseId: string;
 	databaseType: Exclude<ServiceType, "application" | "redis">;
+	serverId: string | null;
 }
 
 const RestoreBackupSchema = z.object({
@@ -76,7 +77,11 @@ const RestoreBackupSchema = z.object({
 
 type RestoreBackup = z.infer<typeof RestoreBackupSchema>;
 
-export const RestoreBackup = ({ databaseId, databaseType }: Props) => {
+export const RestoreBackup = ({
+	databaseId,
+	databaseType,
+	serverId,
+}: Props) => {
 	const [isOpen, setIsOpen] = useState(false);
 	const [search, setSearch] = useState("");
 
@@ -101,6 +106,7 @@ export const RestoreBackup = ({ databaseId, databaseType }: Props) => {
 		{
 			destinationId: destionationId,
 			search,
+			serverId: serverId ?? "",
 		},
 		{
 			enabled: isOpen && !!destionationId,
@@ -304,7 +310,9 @@ export const RestoreBackup = ({ databaseId, databaseType }: Props) => {
 																		form.setValue("backupFile", file);
 																	}}
 																>
-																	{file}
+																	<div className="flex w-full justify-between">
+																		<span>{file}</span>
+																	</div>
 																	<CheckIcon
 																		className={cn(
 																			"ml-auto h-4 w-4",

apps/dokploy/components/dashboard/database/backups/show-backups.tsx

@@ -74,7 +74,11 @@ export const ShowBackups = ({ id, type }: Props) => {
 				{postgres && postgres?.backups?.length > 0 && (
 					<div className="flex flex-col lg:flex-row gap-4 w-full lg:w-auto">
 						<AddBackup databaseId={id} databaseType={type} refetch={refetch} />
-						<RestoreBackup databaseId={id} databaseType={type} />
+						<RestoreBackup
+							databaseId={id}
+							databaseType={type}
+							serverId={postgres.serverId}
+						/>
 					</div>
 				)}
 			</CardHeader>
@@ -108,7 +112,11 @@ export const ShowBackups = ({ id, type }: Props) => {
 										databaseType={type}
 										refetch={refetch}
 									/>
-									<RestoreBackup databaseId={id} databaseType={type} />
+									<RestoreBackup
+										databaseId={id}
+										databaseType={type}
+										serverId={postgres.serverId}
+									/>
 								</div>
 							</div>
 						) : (

apps/dokploy/components/dashboard/mongo/general/show-general-mongo.tsx

@@ -24,7 +24,7 @@ export const ShowGeneralMongo = ({ mongoId }: Props) => {
 		{
 			mongoId,
 		},
-    { enabled: !!mongoId }
+		{ enabled: !!mongoId },
 	);
 
 	const { mutateAsync: reload, isLoading: isReloading } =
@@ -61,7 +61,7 @@ export const ShowGeneralMongo = ({ mongoId }: Props) => {
 				console.error("Deployment logs error:", error);
 				setIsDeploying(false);
 			},
-    }
+		},
 	);
 	return (
 		<>
@@ -82,16 +82,17 @@ export const ShowGeneralMongo = ({ mongoId }: Props) => {
 									refetch();
 								}}
 							>
-                <Tooltip>
-                  <TooltipTrigger asChild>
 								<Button
 									variant="default"
 									isLoading={data?.applicationStatus === "running"}
 									className="flex items-center gap-1.5 focus-visible:ring-2 focus-visible:ring-offset-2"
 								>
+									<Tooltip>
+										<TooltipTrigger asChild>
+											<div className="flex items-center">
 												<Rocket className="size-4 mr-1" />
 												Deploy
-                    </Button>
+											</div>
 										</TooltipTrigger>
 										<TooltipPrimitive.Portal>
 											<TooltipContent sideOffset={5} className="z-[60]">
@@ -99,6 +100,7 @@ export const ShowGeneralMongo = ({ mongoId }: Props) => {
 											</TooltipContent>
 										</TooltipPrimitive.Portal>
 									</Tooltip>
+								</Button>
 							</DialogAction>
 							<DialogAction
 								title="Reload Mongo"
@@ -118,16 +120,17 @@ export const ShowGeneralMongo = ({ mongoId }: Props) => {
 										});
 								}}
 							>
-                <Tooltip>
-                  <TooltipTrigger asChild>
 								<Button
 									variant="secondary"
 									isLoading={isReloading}
 									className="flex items-center gap-1.5 focus-visible:ring-2 focus-visible:ring-offset-2"
 								>
+									<Tooltip>
+										<TooltipTrigger asChild>
+											<div className="flex items-center">
 												<RefreshCcw className="size-4 mr-1" />
 												Reload
-                    </Button>
+											</div>
 										</TooltipTrigger>
 										<TooltipPrimitive.Portal>
 											<TooltipContent sideOffset={5} className="z-[60]">
@@ -135,6 +138,7 @@ export const ShowGeneralMongo = ({ mongoId }: Props) => {
 											</TooltipContent>
 										</TooltipPrimitive.Portal>
 									</Tooltip>
+								</Button>
 							</DialogAction>
 							{data?.applicationStatus === "idle" ? (
 								<DialogAction
@@ -154,16 +158,17 @@ export const ShowGeneralMongo = ({ mongoId }: Props) => {
 											});
 									}}
 								>
-                  <Tooltip>
-                    <TooltipTrigger asChild>
 									<Button
 										variant="secondary"
 										isLoading={isStarting}
 										className="flex items-center gap-1.5 focus-visible:ring-2 focus-visible:ring-offset-2"
 									>
+										<Tooltip>
+											<TooltipTrigger asChild>
+												<div className="flex items-center">
 													<CheckCircle2 className="size-4 mr-1" />
 													Start
-                      </Button>
+												</div>
 											</TooltipTrigger>
 											<TooltipPrimitive.Portal>
 												<TooltipContent sideOffset={5} className="z-[60]">
@@ -174,6 +179,7 @@ export const ShowGeneralMongo = ({ mongoId }: Props) => {
 												</TooltipContent>
 											</TooltipPrimitive.Portal>
 										</Tooltip>
+									</Button>
 								</DialogAction>
 							) : (
 								<DialogAction
@@ -192,16 +198,17 @@ export const ShowGeneralMongo = ({ mongoId }: Props) => {
 											});
 									}}
 								>
-                  <Tooltip>
-                    <TooltipTrigger asChild>
 									<Button
 										variant="destructive"
 										isLoading={isStopping}
 										className="flex items-center gap-1.5 focus-visible:ring-2 focus-visible:ring-offset-2"
 									>
+										<Tooltip>
+											<TooltipTrigger asChild>
+												<div className="flex items-center">
 													<Ban className="size-4 mr-1" />
 													Stop
-                      </Button>
+												</div>
 											</TooltipTrigger>
 											<TooltipPrimitive.Portal>
 												<TooltipContent sideOffset={5} className="z-[60]">
@@ -209,6 +216,7 @@ export const ShowGeneralMongo = ({ mongoId }: Props) => {
 												</TooltipContent>
 											</TooltipPrimitive.Portal>
 										</Tooltip>
+									</Button>
 								</DialogAction>
 							)}
 						</TooltipProvider>
@@ -216,15 +224,16 @@ export const ShowGeneralMongo = ({ mongoId }: Props) => {
 							appName={data?.appName || ""}
 							serverId={data?.serverId || ""}
 						>
-              <Tooltip>
-                <TooltipTrigger asChild>
 							<Button
 								variant="outline"
-                    className="flex items-center gap-2 focus-visible:ring-2 focus-visible:ring-offset-2"
+								className="flex items-center gap-1.5 focus-visible:ring-2 focus-visible:ring-offset-2"
 							>
-                    <Terminal className="size-4" />
+								<Tooltip>
+									<TooltipTrigger asChild>
+										<div className="flex items-center">
+											<Terminal className="size-4 mr-1" />
 											Open Terminal
-                  </Button>
+										</div>
 									</TooltipTrigger>
 									<TooltipPrimitive.Portal>
 										<TooltipContent sideOffset={5} className="z-[60]">
@@ -232,6 +241,7 @@ export const ShowGeneralMongo = ({ mongoId }: Props) => {
 										</TooltipContent>
 									</TooltipPrimitive.Portal>
 								</Tooltip>
+							</Button>
 						</DockerTerminalModal>
 					</CardContent>
 				</Card>

apps/dokploy/package.json

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

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

@@ -31,7 +31,10 @@ import {
 
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
-import { execAsync } from "@dokploy/server/utils/process/execAsync";
+import {
+	execAsync,
+	execAsyncRemote,
+} from "@dokploy/server/utils/process/execAsync";
 import { getS3Credentials } from "@dokploy/server/utils/backups/utils";
 import { findDestinationById } from "@dokploy/server/services/destination";
 import {
@@ -229,6 +232,7 @@ export const backupRouter = createTRPCRouter({
 			z.object({
 				destinationId: z.string(),
 				search: z.string(),
+				serverId: z.string().optional(),
 			}),
 		)
 		.query(async ({ input }) => {
@@ -250,7 +254,16 @@ export const backupRouter = createTRPCRouter({
 				const searchPath = baseDir ? `${bucketPath}/${baseDir}` : bucketPath;
 				const listCommand = `rclone lsf ${rcloneFlags.join(" ")} "${searchPath}" | head -n 100`;
 
-				const { stdout } = await execAsync(listCommand);
+				let stdout = "";
+
+				if (input.serverId) {
+					const result = await execAsyncRemote(listCommand, input.serverId);
+					stdout = result.stdout;
+				} else {
+					const result = await execAsync(listCommand);
+					stdout = result.stdout;
+				}
+
 				const files = stdout.split("\n").filter(Boolean);
 
 				const results = baseDir

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

@@ -13,7 +13,9 @@ import {
 	findDomainById,
 	findDomainsByApplicationId,
 	findDomainsByComposeId,
+	findOrganizationById,
 	findPreviewDeploymentById,
+	findServerById,
 	generateTraefikMeDomain,
 	manageDomain,
 	removeDomain,
@@ -94,6 +96,19 @@ export const domainRouter = createTRPCRouter({
 				input.serverId,
 			);
 		}),
+	canGenerateTraefikMeDomains: protectedProcedure
+		.input(z.object({ serverId: z.string() }))
+		.query(async ({ input, ctx }) => {
+			const organization = await findOrganizationById(
+				ctx.session.activeOrganizationId,
+			);
+
+			if (input.serverId) {
+				const server = await findServerById(input.serverId);
+				return server.ipAddress;
+			}
+			return organization?.owner.serverIp;
+		}),
 
 	update: protectedProcedure
 		.input(apiUpdateDomain)

packages/server/src/lib/auth.ts

@@ -8,6 +8,10 @@ import { db } from "../db";
 import * as schema from "../db/schema";
 import { sendEmail } from "../verification/send-verification-email";
 import { IS_CLOUD } from "../constants";
+import { getPublicIpWithFallback } from "../wss/utils";
+import { updateUser } from "../services/user";
+import { getUserByToken } from "../services/admin";
+import { APIError } from "better-auth/api";
 
 const { handler, api } = betterAuth({
 	database: drizzleAdapter(db, {
@@ -88,11 +92,40 @@ const { handler, api } = betterAuth({
 	databaseHooks: {
 		user: {
 			create: {
+				before: async (_user, context) => {
+					if (!IS_CLOUD) {
+						const xDokployToken =
+							context?.request?.headers?.get("x-dokploy-token");
+						if (xDokployToken) {
+							const user = await getUserByToken(xDokployToken);
+							if (!user) {
+								throw new APIError("BAD_REQUEST", {
+									message: "User not found",
+								});
+							}
+						} else {
+							const isAdminPresent = await db.query.member.findFirst({
+								where: eq(schema.member.role, "owner"),
+							});
+							if (isAdminPresent) {
+								throw new APIError("BAD_REQUEST", {
+									message: "Admin is already created",
+								});
+							}
+						}
+					}
+				},
 				after: async (user) => {
 					const isAdminPresent = await db.query.member.findFirst({
 						where: eq(schema.member.role, "owner"),
 					});
 
+					if (!IS_CLOUD) {
+						await updateUser(user.id, {
+							serverIp: await getPublicIpWithFallback(),
+						});
+					}
+
 					if (IS_CLOUD || !isAdminPresent) {
 						await db.transaction(async (tx) => {
 							const organization = await tx