Merge branch 'Dokploy:canary' into feat/internal-path-routing

apps/dokploy/components/dashboard/application/rollbacks/show-rollback-settings.tsx

@@ -1,3 +1,4 @@
+import { AlertBlock } from "@/components/shared/alert-block";
 import { Button } from "@/components/ui/button";
 import {
 	Dialog,
@@ -79,6 +80,11 @@ export const ShowRollbackSettings = ({ applicationId, children }: Props) => {
 					<DialogDescription>
 						Configure how rollbacks work for this application
 					</DialogDescription>
+					<AlertBlock>
+						Having rollbacks enabled increases storage usage. Be careful with
+						this option. Note that manually cleaning the cache may delete
+						rollback images, making them unavailable for future rollbacks.
+					</AlertBlock>
 				</DialogHeader>
 
 				<Form {...form}>

apps/dokploy/package.json

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

apps/dokploy/reset-2fa.ts

@@ -4,24 +4,24 @@ import { users_temp } from "@dokploy/server/db/schema";
 import { eq } from "drizzle-orm";
 
 (async () => {
-  try {
-    const result = await findAdmin();
+	try {
+		const result = await findAdmin();
 
-    const update = await db
-      .update(users_temp)
-      .set({
-        twoFactorEnabled: false,
-      })
-      .where(eq(users_temp.id, result.userId));
+		const update = await db
+			.update(users_temp)
+			.set({
+				twoFactorEnabled: false,
+			})
+			.where(eq(users_temp.id, result.userId));
 
-    if (update) {
-      console.log("2FA reset successful");
-    } else {
-      console.log("Password reset failed");
-    }
+		if (update) {
+			console.log("2FA reset successful");
+		} else {
+			console.log("Password reset failed");
+		}
 
-    process.exit(0);
-  } catch (error) {
-    console.log("Error resetting 2FA", error);
-  }
+		process.exit(0);
+	} catch (error) {
+		console.log("Error resetting 2FA", error);
+	}
 })();