Merge branch 'canary' into canary

README.md

@@ -39,6 +39,8 @@ Dokploy includes multiple features to make your life easier.
 
 To get started, run the following command on a VPS:
 
+Want to skip the installation process? [Try the Dokploy Cloud](https://app.dokploy.com).
+
 ```bash
 curl -sSL https://dokploy.com/install.sh | sh
 ```

apps/dokploy/components/dashboard/settings/git/github/add-github-provider.tsx

@@ -53,7 +53,7 @@ export const AddGithubProvider = () => {
 		<Dialog open={isOpen} onOpenChange={setIsOpen}>
 			<DialogTrigger asChild>
 				<Button variant="secondary" className="flex items-center space-x-1">
-					<GithubIcon />
+					<GithubIcon className="text-current fill-current" />
 					<span>Github</span>
 				</Button>
 			</DialogTrigger>

apps/dokploy/package.json

@@ -11,7 +11,7 @@
 		"build-next": "next build",
 		"setup": "tsx -r dotenv/config setup.ts && sleep 5 && pnpm run migration:run",
 		"reset-password": "node -r dotenv/config dist/reset-password.mjs",
-		"dev": "TURBOPACK=1 tsx -r dotenv/config ./server/server.ts  --project tsconfig.server.json ",
+		"dev": "tsx -r dotenv/config ./server/server.ts  --project tsconfig.server.json ",
 		"studio": "drizzle-kit studio --config ./server/db/drizzle.config.ts",
 		"migration:generate": "drizzle-kit generate --config ./server/db/drizzle.config.ts",
 		"migration:run": "tsx -r dotenv/config migration.ts",

apps/dokploy/server/server.ts

@@ -24,7 +24,7 @@ import { setupTerminalWebSocketServer } from "./wss/terminal";
 config({ path: ".env" });
 const PORT = Number.parseInt(process.env.PORT || "3000", 10);
 const dev = process.env.NODE_ENV !== "production";
-const app = next({ dev, turbopack: dev });
+const app = next({ dev });
 const handle = app.getRequestHandler();
 void app.prepare().then(async () => {
 	try {

packages/server/src/services/mongo.ts

@@ -14,7 +14,7 @@ export type Mongo = typeof mongo.$inferSelect;
 
 export const createMongo = async (input: typeof apiCreateMongo._type) => {
 	input.appName =
-		`${input.appName}-${generatePassword(6)}` || generateAppName("postgres");
+		`${input.appName}-${generatePassword(6)}` || generateAppName("mongo");
 	if (input.appName) {
 		const valid = await validUniqueServerAppName(input.appName);
 
@@ -72,12 +72,12 @@ export const findMongoById = async (mongoId: string) => {
 
 export const updateMongoById = async (
 	mongoId: string,
-	postgresData: Partial<Mongo>,
+	mongoData: Partial<Mongo>,
 ) => {
 	const result = await db
 		.update(mongo)
 		.set({
-			...postgresData,
+			...mongoData,
 		})
 		.where(eq(mongo.mongoId, mongoId))
 		.returning();