Merge branch 'canary' into fix-mount-update

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 { findServerById } from "./server";
 import { findOrganizationById } from "./admin";
+import { findServerById } from "./server";
 
 export const getAiSettingsByOrganizationId = async (organizationId: string) => {
 	const aiSettings = await db.query.ai.findMany({

packages/server/src/services/application.ts

@@ -26,6 +26,10 @@ import {
 	cloneGitRepository,
 	getCustomGitCloneCommand,
 } from "@dokploy/server/utils/providers/git";
+import {
+	cloneGiteaRepository,
+	getGiteaCloneCommand,
+} from "@dokploy/server/utils/providers/gitea";
 import {
 	cloneGithubRepository,
 	getGithubCloneCommand,
@@ -111,6 +115,7 @@ export const findApplicationById = async (applicationId: string) => {
 			gitlab: true,
 			github: true,
 			bitbucket: true,
+			gitea: true,
 			server: true,
 			previewDeployments: true,
 		},
@@ -191,6 +196,9 @@ export const deployApplication = async ({
 		} else if (application.sourceType === "gitlab") {
 			await cloneGitlabRepository(application, deployment.logPath);
 			await buildApplication(application, deployment.logPath);
+		} else if (application.sourceType === "gitea") {
+			await cloneGiteaRepository(application, deployment.logPath);
+			await buildApplication(application, deployment.logPath);
 		} else if (application.sourceType === "bitbucket") {
 			await cloneBitbucketRepository(application, deployment.logPath);
 			await buildApplication(application, deployment.logPath);
@@ -309,6 +317,8 @@ export const deployRemoteApplication = async ({
 					application,
 					deployment.logPath,
 				);
+			} else if (application.sourceType === "gitea") {
+				command += await getGiteaCloneCommand(application, deployment.logPath);
 			} else if (application.sourceType === "git") {
 				command += await getCustomGitCloneCommand(
 					application,

packages/server/src/services/compose.ts

@@ -29,6 +29,10 @@ import {
 	cloneGitRepository,
 	getCustomGitCloneCommand,
 } from "@dokploy/server/utils/providers/git";
+import {
+	cloneGiteaRepository,
+	getGiteaCloneCommand,
+} from "@dokploy/server/utils/providers/gitea";
 import {
 	cloneGithubRepository,
 	getGithubCloneCommand,
@@ -65,7 +69,7 @@ export const createCompose = async (input: typeof apiCreateCompose._type) => {
 		.insert(compose)
 		.values({
 			...input,
-			composeFile: "",
+			composeFile: input.composeFile || "",
 			appName,
 		})
 		.returning()
@@ -125,6 +129,7 @@ export const findComposeById = async (composeId: string) => {
 			github: true,
 			gitlab: true,
 			bitbucket: true,
+			gitea: true,
 			server: true,
 		},
 	});
@@ -228,6 +233,8 @@ export const deployCompose = async ({
 			await cloneBitbucketRepository(compose, deployment.logPath, true);
 		} else if (compose.sourceType === "git") {
 			await cloneGitRepository(compose, deployment.logPath, true);
+		} else if (compose.sourceType === "gitea") {
+			await cloneGiteaRepository(compose, deployment.logPath, true);
 		} else if (compose.sourceType === "raw") {
 			await createComposeFile(compose, deployment.logPath);
 		}
@@ -351,6 +358,12 @@ export const deployRemoteCompose = async ({
 				);
 			} else if (compose.sourceType === "raw") {
 				command += getCreateComposeFileCommand(compose, deployment.logPath);
+			} else if (compose.sourceType === "gitea") {
+				command += await getGiteaCloneCommand(
+					compose,
+					deployment.logPath,
+					true,
+				);
 			}
 
 			await execAsyncRemote(compose.serverId, command);

packages/server/src/services/gitea.ts

@@ -0,0 +1,98 @@
+import { db } from "@dokploy/server/db";
+import {
+	type apiCreateGitea,
+	gitProvider,
+	gitea,
+} from "@dokploy/server/db/schema";
+import { TRPCError } from "@trpc/server";
+import { eq } from "drizzle-orm";
+
+export type Gitea = typeof gitea.$inferSelect;
+
+export const createGitea = async (
+	input: typeof apiCreateGitea._type,
+	organizationId: string,
+) => {
+	return await db.transaction(async (tx) => {
+		const newGitProvider = await tx
+			.insert(gitProvider)
+			.values({
+				providerType: "gitea",
+				organizationId: organizationId,
+				name: input.name,
+			})
+			.returning()
+			.then((response) => response[0]);
+
+		if (!newGitProvider) {
+			throw new TRPCError({
+				code: "BAD_REQUEST",
+				message: "Error creating the Git provider",
+			});
+		}
+
+		const giteaProvider = await tx
+			.insert(gitea)
+			.values({
+				...input,
+				gitProviderId: newGitProvider?.gitProviderId,
+			})
+			.returning()
+			.then((response: (typeof gitea.$inferSelect)[]) => response[0]);
+
+		if (!giteaProvider) {
+			throw new TRPCError({
+				code: "BAD_REQUEST",
+				message: "Error creating the Gitea provider",
+			});
+		}
+
+		return {
+			giteaId: giteaProvider.giteaId,
+			clientId: giteaProvider.clientId,
+			giteaUrl: giteaProvider.giteaUrl,
+		};
+	});
+};
+
+export const findGiteaById = async (giteaId: string) => {
+	try {
+		const giteaProviderResult = await db.query.gitea.findFirst({
+			where: eq(gitea.giteaId, giteaId),
+			with: {
+				gitProvider: true,
+			},
+		});
+
+		if (!giteaProviderResult) {
+			throw new TRPCError({
+				code: "NOT_FOUND",
+				message: "Gitea Provider not found",
+			});
+		}
+
+		return giteaProviderResult;
+	} catch (error) {
+		throw error;
+	}
+};
+
+export const updateGitea = async (giteaId: string, input: Partial<Gitea>) => {
+	try {
+		const updateResult = await db
+			.update(gitea)
+			.set(input)
+			.where(eq(gitea.giteaId, giteaId))
+			.returning();
+
+		const result = updateResult[0] as Gitea | undefined;
+
+		if (!result) {
+			throw new Error(`Failed to update Gitea provider with ID ${giteaId}`);
+		}
+
+		return result;
+	} catch (error) {
+		throw error;
+	}
+};

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

@@ -62,6 +62,7 @@ export const findApplicationByPreview = async (applicationId: string) => {
 			gitlab: true,
 			github: true,
 			bitbucket: true,
+			gitea: true,
 			server: true,
 		},
 	});