feat(domains): add domains to each docker compose service #216

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

@@ -4,6 +4,7 @@ import { db } from "@/server/db";
 import { type apiCreateCompose, compose } from "@/server/db/schema";
 import { generateAppName } from "@/server/db/schema/utils";
 import { buildCompose } from "@/server/utils/builders/compose";
+import { cloneCompose, loadDockerCompose } from "@/server/utils/docker/domain";
 import type { ComposeSpecification } from "@/server/utils/docker/types";
 import { sendBuildErrorNotifications } from "@/server/utils/notifications/build-error";
 import { sendBuildSuccessNotifications } from "@/server/utils/notifications/build-success";
@@ -14,7 +15,6 @@ import { createComposeFile } from "@/server/utils/providers/raw";
 import { generatePassword } from "@/templates/utils";
 import { TRPCError } from "@trpc/server";
 import { eq } from "drizzle-orm";
-import { load } from "js-yaml";
 import { findAdmin, getDokployUrl } from "./admin";
 import { createDeploymentCompose, updateDeploymentStatus } from "./deployment";
 import { validUniqueServerAppName } from "./project";
@@ -102,20 +102,27 @@ export const findComposeById = async (composeId: string) => {
 	return result;
 };
 
-export const loadServices = async (composeId: string) => {
+export const loadServices = async (
+	composeId: string,
+	type: "fetch" | "cache" = "fetch",
+) => {
 	const compose = await findComposeById(composeId);
 
-	// use js-yaml to parse the docker compose file and then extact the services
-	const composeFile = compose.composeFile;
-	const composeData = load(composeFile) as ComposeSpecification;
+	if (type === "fetch") {
+		await cloneCompose(compose);
+	}
 
+	const composeData = await loadDockerCompose(compose);
 	if (!composeData?.services) {
-		return ["All Services"];
+		throw new TRPCError({
+			code: "NOT_FOUND",
+			message: "Services not found",
+		});
 	}
 
 	const services = Object.keys(composeData.services);
 
-	return [...services, "All Services"];
+	return [...services];
 };
 
 export const updateCompose = async (

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

@@ -15,8 +15,6 @@ export type Domain = typeof domains.$inferSelect;
 
 export const createDomain = async (input: typeof apiCreateDomain._type) => {
 	await db.transaction(async (tx) => {
-		const application = await findApplicationById(input.applicationId);
-
 		const domain = await tx
 			.insert(domains)
 			.values({
@@ -32,7 +30,10 @@ export const createDomain = async (input: typeof apiCreateDomain._type) => {
 			});
 		}
 
-		await manageDomain(application, domain);
+		if (domain.applicationId) {
+			const application = await findApplicationById(domain.applicationId);
+			await manageDomain(application, domain);
+		}
 	});
 };
 
@@ -114,6 +115,17 @@ export const findDomainsByApplicationId = async (applicationId: string) => {
 	return domainsArray;
 };
 
+export const findDomainsByComposeId = async (composeId: string) => {
+	const domainsArray = await db.query.domains.findMany({
+		where: eq(domains.composeId, composeId),
+		with: {
+			compose: true,
+		},
+	});
+
+	return domainsArray;
+};
+
 export const updateDomainById = async (
 	domainId: string,
 	domainData: Partial<Domain>,