Merge pull request #3148 from Dokploy/2938-not-all-ntfy-topics-need-access-tokens

feat: update notification handling to make accessToken optional

.github/workflows/pull-request.yml

@@ -20,6 +20,32 @@ jobs:
         with:
           node-version: 20.16.0
           cache: "pnpm"
+      
+      - name: Install Nixpacks
+        if: matrix.job == 'test'
+        run:  |
+          export NIXPACKS_VERSION=1.39.0
+          curl -sSL https://nixpacks.com/install.sh | bash
+          echo "Nixpacks installed $NIXPACKS_VERSION"
+      
+      - name: Install Railpack
+        if: matrix.job == 'test'
+        run:  |
+          export RAILPACK_VERSION=0.15.0
+          curl -sSL https://railpack.com/install.sh | bash
+          echo "Railpack installed $RAILPACK_VERSION"
+      
+      - name: Add build tools to PATH
+        if: matrix.job == 'test'
+        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
+      
+      - name: Initialize Docker Swarm
+        if: matrix.job == 'test'
+        run: |
+          docker swarm init
+          docker network create --driver overlay dokploy-network || true
+          echo "✅ Docker Swarm initialized"
+      
       - run: pnpm install --frozen-lockfile
       - run: pnpm server:build
       - run: pnpm ${{ matrix.job }}

.github/workflows/sync-openapi-docs.yml

@@ -0,0 +1,70 @@
+name: Generate and Sync OpenAPI
+
+on:
+  push:
+    branches:
+      - canary
+      - main
+    paths:
+      - 'apps/dokploy/server/api/routers/**'
+      - 'packages/server/src/services/**'
+      - 'packages/server/src/db/schema/**'
+
+  workflow_dispatch:
+
+jobs:
+  generate-and-commit:
+    name: Generate OpenAPI and commit to Dokploy repo
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Dokploy repository
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.16.0
+          cache: "pnpm"
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Generate OpenAPI specification
+        run: |
+          pnpm generate:openapi
+          
+          # Verifica que se generó correctamente
+          if [ ! -f openapi.json ]; then
+            echo "❌ openapi.json not found"
+            exit 1
+          fi
+          
+          echo "✅ OpenAPI specification generated successfully"
+
+      - name: Sync to website repository
+        run: |
+          # Clona el repositorio de website
+          git clone https://x-access-token:${{ secrets.DOCS_SYNC_TOKEN }}@github.com/dokploy/website.git website-repo
+          
+          cd website-repo
+          
+          # Copia el openapi.json al website (sobrescribe)
+          mkdir -p apps/docs/public
+          cp -f ../openapi.json apps/docs/public/openapi.json
+          
+          # Configura git
+          git config user.name "Dokploy Bot"
+          git config user.email "bot@dokploy.com"
+          
+          # Agrega y commitea siempre
+          git add apps/docs/public/openapi.json
+          git commit -m "chore: sync OpenAPI specification [skip ci]" \
+            -m "Source: ${{ github.repository }}@${{ github.sha }}" \
+            -m "Updated: $(date -u +'%Y-%m-%d %H:%M:%S UTC')" \
+            --allow-empty
+          
+          git push
+          
+          echo "✅ OpenAPI synced to website successfully"
+

.gitignore

@@ -13,6 +13,8 @@ node_modules
 .env.test.local
 .env.production.local
 
+openapi.json
+
 # Testing
 coverage
 

Dockerfile

@@ -46,7 +46,7 @@ COPY --from=build /prod/dokploy/node_modules ./node_modules
 
 
 # Install docker
-RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh && rm get-docker.sh && curl https://rclone.org/install.sh | bash
+RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh --version 28.5.2 && rm get-docker.sh && curl https://rclone.org/install.sh | bash
 
 # Install Nixpacks and tsx
 # | VERBOSE=1 VERSION=1.21.0 bash

apps/dokploy/.env.example

@@ -1,3 +1,3 @@
 DATABASE_URL="postgres://dokploy:amukds4wi9001583845717ad2@localhost:5432/dokploy"
 PORT=3000
-NODE_ENV=development
+NODE_ENV=development

apps/dokploy/__test__/deploy/application.command.test.ts

@@ -0,0 +1,276 @@
+import * as adminService from "@dokploy/server/services/admin";
+import * as applicationService from "@dokploy/server/services/application";
+import { deployApplication } from "@dokploy/server/services/application";
+import * as deploymentService from "@dokploy/server/services/deployment";
+import * as builders from "@dokploy/server/utils/builders";
+import * as notifications from "@dokploy/server/utils/notifications/build-success";
+import * as execProcess from "@dokploy/server/utils/process/execAsync";
+import * as gitProvider from "@dokploy/server/utils/providers/git";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+vi.mock("@dokploy/server/db", () => {
+	const createChainableMock = (): any => {
+		const chain = {
+			set: vi.fn(() => chain),
+			where: vi.fn(() => chain),
+			returning: vi.fn().mockResolvedValue([{}] as any),
+		} as any;
+		return chain;
+	};
+
+	return {
+		db: {
+			select: vi.fn(),
+			insert: vi.fn(),
+			update: vi.fn(() => createChainableMock()),
+			delete: vi.fn(),
+			query: {
+				applications: {
+					findFirst: vi.fn(),
+				},
+			},
+		},
+	};
+});
+
+vi.mock("@dokploy/server/services/application", async () => {
+	const actual = await vi.importActual<
+		typeof import("@dokploy/server/services/application")
+	>("@dokploy/server/services/application");
+	return {
+		...actual,
+		findApplicationById: vi.fn(),
+		updateApplicationStatus: vi.fn(),
+	};
+});
+
+vi.mock("@dokploy/server/services/admin", () => ({
+	getDokployUrl: vi.fn(),
+}));
+
+vi.mock("@dokploy/server/services/deployment", () => ({
+	createDeployment: vi.fn(),
+	updateDeploymentStatus: vi.fn(),
+	updateDeployment: vi.fn(),
+}));
+
+vi.mock("@dokploy/server/utils/providers/git", async () => {
+	const actual = await vi.importActual<
+		typeof import("@dokploy/server/utils/providers/git")
+	>("@dokploy/server/utils/providers/git");
+	return {
+		...actual,
+		getGitCommitInfo: vi.fn(),
+	};
+});
+
+vi.mock("@dokploy/server/utils/process/execAsync", () => ({
+	execAsync: vi.fn(),
+	ExecError: class ExecError extends Error {},
+}));
+
+vi.mock("@dokploy/server/utils/builders", async () => {
+	const actual = await vi.importActual<
+		typeof import("@dokploy/server/utils/builders")
+	>("@dokploy/server/utils/builders");
+	return {
+		...actual,
+		mechanizeDockerContainer: vi.fn(),
+		getBuildCommand: vi.fn(),
+	};
+});
+
+vi.mock("@dokploy/server/utils/notifications/build-success", () => ({
+	sendBuildSuccessNotifications: vi.fn(),
+}));
+
+vi.mock("@dokploy/server/utils/notifications/build-error", () => ({
+	sendBuildErrorNotifications: vi.fn(),
+}));
+
+vi.mock("@dokploy/server/services/rollbacks", () => ({
+	createRollback: vi.fn(),
+}));
+
+import { db } from "@dokploy/server/db";
+import { cloneGitRepository } from "@dokploy/server/utils/providers/git";
+
+const createMockApplication = (overrides = {}) => ({
+	applicationId: "test-app-id",
+	name: "Test App",
+	appName: "test-app",
+	sourceType: "git" as const,
+	customGitUrl: "https://github.com/Dokploy/examples.git",
+	customGitBranch: "main",
+	customGitSSHKeyId: null,
+	buildType: "nixpacks" as const,
+	buildPath: "/astro",
+	env: "NODE_ENV=production",
+	serverId: null,
+	rollbackActive: false,
+	enableSubmodules: false,
+	environmentId: "env-id",
+	environment: {
+		projectId: "project-id",
+		env: "",
+		name: "production",
+		project: {
+			name: "Test Project",
+			organizationId: "org-id",
+			env: "",
+		},
+	},
+	domains: [],
+	...overrides,
+});
+
+const createMockDeployment = () => ({
+	deploymentId: "deployment-id",
+	logPath: "/tmp/test-deployment.log",
+});
+
+describe("deployApplication - Command Generation Tests", () => {
+	beforeEach(() => {
+		vi.clearAllMocks();
+		vi.mocked(db.query.applications.findFirst).mockResolvedValue(
+			createMockApplication() as any,
+		);
+		vi.mocked(applicationService.findApplicationById).mockResolvedValue(
+			createMockApplication() as any,
+		);
+		vi.mocked(adminService.getDokployUrl).mockResolvedValue(
+			"http://localhost:3000",
+		);
+		vi.mocked(deploymentService.createDeployment).mockResolvedValue(
+			createMockDeployment() as any,
+		);
+		vi.mocked(execProcess.execAsync).mockResolvedValue({
+			stdout: "",
+			stderr: "",
+		} as any);
+		vi.mocked(builders.mechanizeDockerContainer).mockResolvedValue(
+			undefined as any,
+		);
+		vi.mocked(deploymentService.updateDeploymentStatus).mockResolvedValue(
+			undefined as any,
+		);
+		vi.mocked(applicationService.updateApplicationStatus).mockResolvedValue(
+			{} as any,
+		);
+		vi.mocked(notifications.sendBuildSuccessNotifications).mockResolvedValue(
+			undefined as any,
+		);
+		vi.mocked(gitProvider.getGitCommitInfo).mockResolvedValue({
+			message: "test commit",
+			hash: "abc123",
+		});
+		vi.mocked(deploymentService.updateDeployment).mockResolvedValue({} as any);
+	});
+
+	it("should generate correct git clone command for astro example", async () => {
+		const app = createMockApplication();
+		const command = await cloneGitRepository(app);
+		console.log(command);
+
+		expect(command).toContain("https://github.com/Dokploy/examples.git");
+		expect(command).not.toContain("--recurse-submodules");
+		expect(command).toContain("--branch main");
+		expect(command).toContain("--depth 1");
+		expect(command).toContain("git clone");
+	});
+
+	it("should generate git clone with submodules when enabled", async () => {
+		const app = createMockApplication({ enableSubmodules: true });
+		const command = await cloneGitRepository(app);
+
+		expect(command).toContain("--recurse-submodules");
+		expect(command).toContain("https://github.com/Dokploy/examples.git");
+	});
+
+	it("should verify nixpacks command is called with correct app", async () => {
+		const mockNixpacksCommand = "nixpacks build /path/to/app --name test-app";
+		vi.mocked(builders.getBuildCommand).mockReturnValue(mockNixpacksCommand);
+
+		await deployApplication({
+			applicationId: "test-app-id",
+			titleLog: "Test deployment",
+			descriptionLog: "",
+		});
+
+		expect(builders.getBuildCommand).toHaveBeenCalledWith(
+			expect.objectContaining({
+				buildType: "nixpacks",
+				customGitUrl: "https://github.com/Dokploy/examples.git",
+				buildPath: "/astro",
+			}),
+		);
+
+		expect(execProcess.execAsync).toHaveBeenCalledWith(
+			expect.stringContaining("nixpacks build"),
+		);
+	});
+
+	it("should verify railpack command includes correct parameters", async () => {
+		const mockApp = createMockApplication({ buildType: "railpack" });
+		vi.mocked(db.query.applications.findFirst).mockResolvedValue(
+			mockApp as any,
+		);
+		vi.mocked(applicationService.findApplicationById).mockResolvedValue(
+			mockApp as any,
+		);
+
+		const mockRailpackCommand = "railpack prepare /path/to/app";
+		vi.mocked(builders.getBuildCommand).mockReturnValue(mockRailpackCommand);
+
+		await deployApplication({
+			applicationId: "test-app-id",
+			titleLog: "Railpack test",
+			descriptionLog: "",
+		});
+
+		expect(builders.getBuildCommand).toHaveBeenCalledWith(
+			expect.objectContaining({
+				buildType: "railpack",
+			}),
+		);
+
+		expect(execProcess.execAsync).toHaveBeenCalledWith(
+			expect.stringContaining("railpack prepare"),
+		);
+	});
+
+	it("should execute commands in correct order", async () => {
+		const mockNixpacksCommand = "nixpacks build";
+		vi.mocked(builders.getBuildCommand).mockReturnValue(mockNixpacksCommand);
+
+		await deployApplication({
+			applicationId: "test-app-id",
+			titleLog: "Test",
+			descriptionLog: "",
+		});
+
+		const execCalls = vi.mocked(execProcess.execAsync).mock.calls;
+		expect(execCalls.length).toBeGreaterThan(0);
+
+		const fullCommand = execCalls[0]?.[0];
+		expect(fullCommand).toContain("set -e");
+		expect(fullCommand).toContain("git clone");
+		expect(fullCommand).toContain("nixpacks build");
+	});
+
+	it("should include log redirection in command", async () => {
+		const mockCommand = "nixpacks build";
+		vi.mocked(builders.getBuildCommand).mockReturnValue(mockCommand);
+
+		await deployApplication({
+			applicationId: "test-app-id",
+			titleLog: "Test",
+			descriptionLog: "",
+		});
+
+		const execCalls = vi.mocked(execProcess.execAsync).mock.calls;
+		const fullCommand = execCalls[0]?.[0];
+
+		expect(fullCommand).toContain(">> /tmp/test-deployment.log 2>&1");
+	});
+});

apps/dokploy/__test__/deploy/application.real.test.ts

@@ -0,0 +1,479 @@
+import { existsSync } from "node:fs";
+import path from "node:path";
+import type { ApplicationNested } from "@dokploy/server";
+import { paths } from "@dokploy/server/constants";
+import { execAsync } from "@dokploy/server/utils/process/execAsync";
+import { format } from "date-fns";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const REAL_TEST_TIMEOUT = 180000; // 3 minutes
+
+// Mock ONLY database and notifications
+vi.mock("@dokploy/server/db", () => {
+	const createChainableMock = (): any => {
+		const chain: any = {
+			set: vi.fn(() => chain),
+			where: vi.fn(() => chain),
+			returning: vi.fn().mockResolvedValue([{}]),
+		};
+		return chain;
+	};
+
+	return {
+		db: {
+			select: vi.fn(),
+			insert: vi.fn(),
+			update: vi.fn(() => createChainableMock()),
+			delete: vi.fn(),
+			query: {
+				applications: {
+					findFirst: vi.fn(),
+				},
+			},
+		},
+	};
+});
+
+vi.mock("@dokploy/server/services/application", async () => {
+	const actual = await vi.importActual<
+		typeof import("@dokploy/server/services/application")
+	>("@dokploy/server/services/application");
+	return {
+		...actual,
+		findApplicationById: vi.fn(),
+		updateApplicationStatus: vi.fn(),
+	};
+});
+
+vi.mock("@dokploy/server/services/admin", () => ({
+	getDokployUrl: vi.fn().mockResolvedValue("http://localhost:3000"),
+}));
+
+vi.mock("@dokploy/server/services/deployment", () => ({
+	createDeployment: vi.fn(),
+	updateDeploymentStatus: vi.fn(),
+	updateDeployment: vi.fn(),
+}));
+
+vi.mock("@dokploy/server/utils/notifications/build-success", () => ({
+	sendBuildSuccessNotifications: vi.fn(),
+}));
+
+vi.mock("@dokploy/server/utils/notifications/build-error", () => ({
+	sendBuildErrorNotifications: vi.fn(),
+}));
+
+vi.mock("@dokploy/server/services/rollbacks", () => ({
+	createRollback: vi.fn(),
+}));
+
+// NOT mocked (executed for real):
+// - execAsync
+// - cloneGitRepository
+// - getBuildCommand
+// - mechanizeDockerContainer (requires Docker Swarm)
+
+import { db } from "@dokploy/server/db";
+import * as adminService from "@dokploy/server/services/admin";
+import * as applicationService from "@dokploy/server/services/application";
+import { deployApplication } from "@dokploy/server/services/application";
+import * as deploymentService from "@dokploy/server/services/deployment";
+
+const createMockApplication = (
+	overrides: Partial<ApplicationNested> = {},
+): ApplicationNested =>
+	({
+		applicationId: "test-app-id",
+		name: "Real Test App",
+		appName: `real-test-${Date.now()}`,
+		sourceType: "git" as const,
+		customGitUrl: "https://github.com/Dokploy/examples.git",
+		customGitBranch: "main",
+		customGitSSHKeyId: null,
+		customGitBuildPath: "/astro",
+		buildType: "nixpacks" as const,
+		env: "NODE_ENV=production",
+		serverId: null,
+		rollbackActive: false,
+		enableSubmodules: false,
+		environmentId: "env-id",
+		environment: {
+			projectId: "project-id",
+			env: "",
+			name: "production",
+			project: {
+				name: "Test Project",
+				organizationId: "org-id",
+				env: "",
+			},
+		},
+		domains: [],
+		mounts: [],
+		security: [],
+		redirects: [],
+		ports: [],
+		registry: null,
+		...overrides,
+	}) as ApplicationNested;
+
+const createMockDeployment = async (appName: string) => {
+	const { LOGS_PATH } = paths(false); // false = local, no remote server
+	const formattedDateTime = format(new Date(), "yyyy-MM-dd:HH:mm:ss");
+	const fileName = `${appName}-${formattedDateTime}.log`;
+	const logFilePath = path.join(LOGS_PATH, appName, fileName);
+
+	// Actually create the log directory
+	await execAsync(`mkdir -p ${path.dirname(logFilePath)}`);
+	await execAsync(`echo "Initializing deployment" > ${logFilePath}`);
+
+	return {
+		deploymentId: "deployment-id",
+		logPath: logFilePath,
+	};
+};
+
+async function cleanupDocker(appName: string) {
+	try {
+		await execAsync(`docker stop ${appName} 2>/dev/null || true`);
+		await execAsync(`docker rm ${appName} 2>/dev/null || true`);
+		await execAsync(`docker rmi ${appName} 2>/dev/null || true`);
+	} catch (error) {
+		console.log("Docker cleanup completed");
+	}
+}
+
+async function cleanupFiles(appName: string) {
+	try {
+		const { LOGS_PATH, APPLICATIONS_PATH } = paths(false);
+
+		// Clean cloned code directories
+		const appPath = path.join(APPLICATIONS_PATH, appName);
+		await execAsync(`rm -rf ${appPath} 2>/dev/null || true`);
+
+		// Clean logs for appName - removes entire folder
+		const logPath = path.join(LOGS_PATH, appName);
+		await execAsync(`rm -rf ${logPath} 2>/dev/null || true`);
+
+		console.log(`✅ Cleaned up files and logs for ${appName}`);
+	} catch (error) {
+		console.error(`⚠️ Error during cleanup for ${appName}:`, error);
+	}
+}
+
+describe(
+	"deployApplication - REAL Execution Tests",
+	() => {
+		let currentAppName: string;
+		let currentDeployment: any;
+		const allTestAppNames: string[] = [];
+
+		beforeEach(async () => {
+			vi.clearAllMocks();
+			currentAppName = `real-test-${Date.now()}`;
+			currentDeployment = await createMockDeployment(currentAppName);
+			allTestAppNames.push(currentAppName);
+
+			const mockApp = createMockApplication({ appName: currentAppName });
+
+			vi.mocked(db.query.applications.findFirst).mockResolvedValue(
+				mockApp as any,
+			);
+			vi.mocked(applicationService.findApplicationById).mockResolvedValue(
+				mockApp as any,
+			);
+			vi.mocked(adminService.getDokployUrl).mockResolvedValue(
+				"http://localhost:3000",
+			);
+			vi.mocked(deploymentService.createDeployment).mockResolvedValue(
+				currentDeployment as any,
+			);
+			vi.mocked(deploymentService.updateDeploymentStatus).mockResolvedValue(
+				undefined as any,
+			);
+			vi.mocked(applicationService.updateApplicationStatus).mockResolvedValue(
+				{} as any,
+			);
+			vi.mocked(deploymentService.updateDeployment).mockResolvedValue(
+				{} as any,
+			);
+		});
+
+		afterEach(async () => {
+			// ALWAYS cleanup, even if test failed or passed
+			console.log(`\n🧹 Cleaning up test: ${currentAppName}`);
+
+			// Clean current appName
+			try {
+				await cleanupDocker(currentAppName);
+				await cleanupFiles(currentAppName);
+			} catch (error) {
+				console.error("⚠️ Error cleaning current app:", error);
+			}
+
+			// Clean ALL test folders just in case
+			try {
+				const { LOGS_PATH, APPLICATIONS_PATH } = paths(false);
+				await execAsync(`rm -rf ${LOGS_PATH}/real-* 2>/dev/null || true`);
+				await execAsync(
+					`rm -rf ${APPLICATIONS_PATH}/real-* 2>/dev/null || true`,
+				);
+				console.log("✅ Cleaned up all test artifacts");
+			} catch (error) {
+				console.error("⚠️ Error cleaning all artifacts:", error);
+			}
+
+			console.log("✅ Cleanup completed\n");
+		});
+
+		it(
+			"should REALLY clone git repo and build with nixpacks",
+			async () => {
+				console.log(`\n🚀 Testing real deployment with app: ${currentAppName}`);
+
+				const result = await deployApplication({
+					applicationId: "test-app-id",
+					titleLog: "Real Nixpacks Test",
+					descriptionLog: "Testing real execution",
+				});
+
+				expect(result).toBe(true);
+
+				// Verify that Docker image was actually created
+				const { stdout: dockerImages } = await execAsync(
+					`docker images ${currentAppName} --format "{{.Repository}}"`,
+				);
+				console.log("dockerImages", dockerImages);
+				expect(dockerImages.trim()).toBe(currentAppName);
+				console.log(`✅ Docker image created: ${currentAppName}`);
+
+				// Verify log exists and has content
+				expect(existsSync(currentDeployment.logPath)).toBe(true);
+				const { stdout: logContent } = await execAsync(
+					`cat ${currentDeployment.logPath}`,
+				);
+				expect(logContent).toContain("Cloning");
+				expect(logContent).toContain("nixpacks");
+				console.log(`✅ Build log created with ${logContent.length} chars`);
+
+				// Verify update functions were called
+				expect(deploymentService.updateDeploymentStatus).toHaveBeenCalledWith(
+					"deployment-id",
+					"done",
+				);
+			},
+			REAL_TEST_TIMEOUT,
+		);
+
+		it.skip(
+			"should REALLY build with railpack (SKIPPED: requires special permissions)",
+			async () => {
+				const railpackAppName = `real-railpack-${Date.now()}`;
+				const railpackApp = createMockApplication({
+					appName: railpackAppName,
+					buildType: "railpack",
+					railpackVersion: "3",
+				});
+				currentAppName = railpackAppName;
+				allTestAppNames.push(railpackAppName);
+
+				vi.mocked(db.query.applications.findFirst).mockResolvedValue(
+					railpackApp as any,
+				);
+				vi.mocked(applicationService.findApplicationById).mockResolvedValue(
+					railpackApp as any,
+				);
+
+				console.log(`\n🚀 Testing real railpack deployment: ${currentAppName}`);
+
+				const result = await deployApplication({
+					applicationId: "test-app-id",
+					titleLog: "Real Railpack Test",
+					descriptionLog: "",
+				});
+
+				expect(result).toBe(true);
+
+				const { stdout: dockerImages } = await execAsync(
+					`docker images ${currentAppName} --format "{{.Repository}}"`,
+				);
+				expect(dockerImages.trim()).toBe(currentAppName);
+				console.log(`✅ Railpack image created: ${currentAppName}`);
+
+				const { stdout: logContent } = await execAsync(
+					`cat ${currentDeployment.logPath}`,
+				);
+				expect(logContent).toContain("railpack");
+				console.log("✅ Railpack build completed");
+			},
+			REAL_TEST_TIMEOUT,
+		);
+
+		it(
+			"should handle REAL git clone errors",
+			async () => {
+				const errorAppName = `real-error-${Date.now()}`;
+				const errorApp = createMockApplication({
+					appName: errorAppName,
+					customGitUrl:
+						"https://github.com/invalid/nonexistent-repo-123456.git",
+				});
+				currentAppName = errorAppName;
+				allTestAppNames.push(errorAppName);
+
+				vi.mocked(db.query.applications.findFirst).mockResolvedValue(
+					errorApp as any,
+				);
+				vi.mocked(applicationService.findApplicationById).mockResolvedValue(
+					errorApp as any,
+				);
+
+				console.log(`\n🚀 Testing real error handling: ${currentAppName}`);
+
+				await expect(
+					deployApplication({
+						applicationId: "test-app-id",
+						titleLog: "Real Error Test",
+						descriptionLog: "",
+					}),
+				).rejects.toThrow();
+
+				// Verify error status was called
+				expect(deploymentService.updateDeploymentStatus).toHaveBeenCalledWith(
+					"deployment-id",
+					"error",
+				);
+
+				// Verify log contains error
+				const { stdout: logContent } = await execAsync(
+					`cat ${currentDeployment.logPath}`,
+				);
+				expect(logContent.toLowerCase()).toContain("error");
+				console.log("✅ Error handling verified");
+			},
+			REAL_TEST_TIMEOUT,
+		);
+
+		it(
+			"should REALLY clone with submodules when enabled",
+			async () => {
+				const submodulesAppName = `real-submodules-${Date.now()}`;
+				const submodulesApp = createMockApplication({
+					appName: submodulesAppName,
+					enableSubmodules: true,
+				});
+				currentAppName = submodulesAppName;
+				allTestAppNames.push(submodulesAppName);
+
+				vi.mocked(db.query.applications.findFirst).mockResolvedValue(
+					submodulesApp as any,
+				);
+				vi.mocked(applicationService.findApplicationById).mockResolvedValue(
+					submodulesApp as any,
+				);
+
+				console.log(`\n🚀 Testing real submodules support: ${currentAppName}`);
+
+				const result = await deployApplication({
+					applicationId: "test-app-id",
+					titleLog: "Real Submodules Test",
+					descriptionLog: "",
+				});
+
+				expect(result).toBe(true);
+
+				// Verify deployment completed successfully
+				const { stdout: logContent } = await execAsync(
+					`cat ${currentDeployment.logPath}`,
+				);
+				expect(logContent).toContain("Cloning");
+				expect(logContent.length).toBeGreaterThan(100);
+				console.log("✅ Submodules deployment completed");
+
+				// Verify image
+				const { stdout: dockerImages } = await execAsync(
+					`docker images ${currentAppName} --format "{{.Repository}}"`,
+				);
+				expect(dockerImages.trim()).toBe(currentAppName);
+			},
+			REAL_TEST_TIMEOUT,
+		);
+
+		it(
+			"should verify REAL commit info extraction",
+			async () => {
+				console.log(`\n🚀 Testing real commit info: ${currentAppName}`);
+
+				await deployApplication({
+					applicationId: "test-app-id",
+					titleLog: "Real Commit Test",
+					descriptionLog: "",
+				});
+
+				// Verify updateDeployment was called with commit info
+				expect(deploymentService.updateDeployment).toHaveBeenCalled();
+				const updateCall = vi.mocked(deploymentService.updateDeployment).mock
+					.calls[0];
+
+				// Real commit info should have title and hash
+				expect(updateCall?.[1]).toHaveProperty("title");
+				expect(updateCall?.[1]).toHaveProperty("description");
+				expect(updateCall?.[1]?.description).toContain("Commit:");
+
+				console.log(
+					`✅ Real commit extracted: ${updateCall?.[1]?.title?.substring(0, 50)}...`,
+				);
+			},
+			REAL_TEST_TIMEOUT,
+		);
+
+		it(
+			"should REALLY build with Dockerfile",
+			async () => {
+				const dockerfileAppName = `real-dockerfile-${Date.now()}`;
+				const dockerfileApp = createMockApplication({
+					appName: dockerfileAppName,
+					buildType: "dockerfile",
+					customGitBuildPath: "/deno",
+					dockerfile: "Dockerfile",
+				});
+				currentAppName = dockerfileAppName;
+				allTestAppNames.push(dockerfileAppName);
+
+				vi.mocked(db.query.applications.findFirst).mockResolvedValue(
+					dockerfileApp as any,
+				);
+				vi.mocked(applicationService.findApplicationById).mockResolvedValue(
+					dockerfileApp as any,
+				);
+
+				console.log(`\n🚀 Testing real Dockerfile build: ${currentAppName}`);
+
+				const result = await deployApplication({
+					applicationId: "test-app-id",
+					titleLog: "Real Dockerfile Test",
+					descriptionLog: "",
+				});
+
+				expect(result).toBe(true);
+
+				// Verify log
+				const { stdout: logContent } = await execAsync(
+					`cat ${currentDeployment.logPath}`,
+				);
+				expect(logContent).toContain("Building");
+				expect(logContent).toContain(dockerfileAppName);
+				console.log("✅ Dockerfile build log verified");
+
+				// Verify image
+				const { stdout: dockerImages } = await execAsync(
+					`docker images ${currentAppName} --format "{{.Repository}}"`,
+				);
+				console.log("dockerImages", dockerImages);
+				expect(dockerImages.trim()).toBe(currentAppName);
+				console.log(`✅ Docker image created: ${currentAppName}`);
+			},
+			REAL_TEST_TIMEOUT,
+		);
+	},
+	REAL_TEST_TIMEOUT,
+);

apps/dokploy/__test__/drop/drop.test.ts

@@ -30,6 +30,10 @@ const baseApp: ApplicationNested = {
 	previewLabels: [],
 	herokuVersion: "",
 	giteaBranch: "",
+	buildServerId: "",
+	buildRegistryId: "",
+	buildRegistry: null,
+	args: [],
 	giteaBuildPath: "",
 	previewRequireCollaboratorPermissions: false,
 	giteaId: "",

apps/dokploy/__test__/env/environment.test.ts

@@ -1,4 +1,7 @@
-import { prepareEnvironmentVariables } from "@dokploy/server/index";
+import {
+	prepareEnvironmentVariables,
+	prepareEnvironmentVariablesForShell,
+} from "@dokploy/server/index";
 import { describe, expect, it } from "vitest";
 
 const projectEnv = `
@@ -332,4 +335,310 @@ IS_DEV=\${{environment.DEVELOPMENT}}
 			"IS_DEV=0",
 		]);
 	});
+
+	it("handles environment variables with single quotes in values", () => {
+		const envWithSingleQuotes = `
+ENV_VARIABLE='ENVITONME'NT'
+ANOTHER_VAR='value with 'quotes' inside'
+SIMPLE_VAR=no-quotes
+`;
+
+		const serviceWithSingleQuotes = `
+TEST_VAR=\${{environment.ENV_VARIABLE}}
+ANOTHER_TEST=\${{environment.ANOTHER_VAR}}
+SIMPLE=\${{environment.SIMPLE_VAR}}
+`;
+
+		const resolved = prepareEnvironmentVariables(
+			serviceWithSingleQuotes,
+			"",
+			envWithSingleQuotes,
+		);
+
+		expect(resolved).toEqual([
+			"TEST_VAR=ENVITONME'NT",
+			"ANOTHER_TEST=value with 'quotes' inside",
+			"SIMPLE=no-quotes",
+		]);
+	});
+});
+
+describe("prepareEnvironmentVariablesForShell (shell escaping)", () => {
+	it("escapes single quotes in environment variable values", () => {
+		const serviceEnv = `
+ENV_VARIABLE='ENVITONME'NT'
+ANOTHER_VAR='value with 'quotes' inside'
+`;
+
+		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
+
+		// shell-quote should wrap these in double quotes
+		expect(resolved).toEqual([
+			`"ENV_VARIABLE=ENVITONME'NT"`,
+			`"ANOTHER_VAR=value with 'quotes' inside"`,
+		]);
+	});
+
+	it("escapes double quotes in environment variable values", () => {
+		const serviceEnv = `
+MESSAGE="Hello "World""
+QUOTED_PATH="/path/to/"file""
+`;
+
+		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
+
+		// shell-quote wraps in single quotes when there are double quotes inside
+		expect(resolved).toEqual([
+			`'MESSAGE=Hello "World"'`,
+			`'QUOTED_PATH=/path/to/"file"'`,
+		]);
+	});
+
+	it("escapes dollar signs in environment variable values", () => {
+		const serviceEnv = `
+PRICE=$100
+VARIABLE=$HOME/path
+TEMPLATE=Hello $USER
+`;
+
+		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
+
+		// Dollar signs should be escaped to prevent variable expansion
+		for (const env of resolved) {
+			expect(env).toContain("$");
+		}
+	});
+
+	it("escapes backticks in environment variable values", () => {
+		const serviceEnv = `
+COMMAND=\`echo "test"\`
+NESTED=value with \`backticks\` inside
+`;
+
+		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
+
+		// Backticks are escaped/removed by dotenv parsing, but values should be safely quoted
+		expect(resolved.length).toBe(2);
+		expect(resolved[0]).toContain("COMMAND");
+		expect(resolved[1]).toContain("NESTED");
+	});
+
+	it("handles environment variables with spaces", () => {
+		const serviceEnv = `
+FULL_NAME="John Doe"
+MESSAGE='Hello World'
+SENTENCE=This is a test
+`;
+
+		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
+
+		// shell-quote uses single quotes for strings with spaces
+		expect(resolved).toEqual([
+			`'FULL_NAME=John Doe'`,
+			`'MESSAGE=Hello World'`,
+			`'SENTENCE=This is a test'`,
+		]);
+	});
+
+	it("handles environment variables with backslashes", () => {
+		const serviceEnv = `
+WINDOWS_PATH=C:\\Users\\Documents
+ESCAPED=value\\with\\backslashes
+`;
+
+		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
+
+		// Backslashes should be properly escaped
+		expect(resolved.length).toBe(2);
+		for (const env of resolved) {
+			expect(env).toContain("\\");
+		}
+	});
+
+	it("handles simple environment variables without special characters", () => {
+		const serviceEnv = `
+NODE_ENV=production
+PORT=3000
+DEBUG=true
+`;
+
+		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
+
+		// shell-quote escapes the = sign in some cases
+		expect(resolved).toEqual([
+			"NODE_ENV\\=production",
+			"PORT\\=3000",
+			"DEBUG\\=true",
+		]);
+	});
+
+	it("handles environment variables with mixed special characters", () => {
+		const serviceEnv = `
+COMPLEX='value with "double" and 'single' quotes'
+BASH_COMMAND=echo "$HOME" && echo 'test'
+WEIRD=\`echo "$VAR"\` with 'quotes' and "more"
+`;
+
+		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
+
+		// All should be escaped, none should throw errors
+		expect(resolved.length).toBe(3);
+		// Verify each can be safely used in shell
+		for (const env of resolved) {
+			expect(typeof env).toBe("string");
+			expect(env.length).toBeGreaterThan(0);
+		}
+	});
+
+	it("handles environment variables with newlines", () => {
+		const serviceEnv = `
+MULTILINE="line1
+line2
+line3"
+`;
+
+		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
+
+		expect(resolved.length).toBe(1);
+		expect(resolved[0]).toContain("MULTILINE");
+	});
+
+	it("handles empty environment variable values", () => {
+		const serviceEnv = `
+EMPTY=
+EMPTY_QUOTED=""
+EMPTY_SINGLE=''
+`;
+
+		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
+
+		// shell-quote escapes the = sign for empty values
+		expect(resolved).toEqual([
+			"EMPTY\\=",
+			"EMPTY_QUOTED\\=",
+			"EMPTY_SINGLE\\=",
+		]);
+	});
+
+	it("handles environment variables with equals signs in values", () => {
+		const serviceEnv = `
+EQUATION=a=b+c
+CONNECTION_STRING=user=admin;password=test
+`;
+
+		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
+
+		expect(resolved.length).toBe(2);
+		expect(resolved[0]).toContain("EQUATION");
+		expect(resolved[1]).toContain("CONNECTION_STRING");
+	});
+
+	it("resolves and escapes environment variables together", () => {
+		const projectEnv = `
+BASE_URL=https://example.com
+API_KEY='secret-key-with-quotes'
+`;
+
+		const environmentEnv = `
+ENV_NAME=production
+DB_PASS='pa$$word'
+`;
+
+		const serviceEnv = `
+FULL_URL=\${{project.BASE_URL}}/api
+AUTH_KEY=\${{project.API_KEY}}
+ENVIRONMENT=\${{environment.ENV_NAME}}
+DB_PASSWORD=\${{environment.DB_PASS}}
+CUSTOM='value with 'quotes' inside'
+`;
+
+		const resolved = prepareEnvironmentVariablesForShell(
+			serviceEnv,
+			projectEnv,
+			environmentEnv,
+		);
+
+		expect(resolved.length).toBe(5);
+		// All resolved values should be properly escaped
+		for (const env of resolved) {
+			expect(typeof env).toBe("string");
+		}
+	});
+
+	it("handles environment variables with semicolons and ampersands", () => {
+		const serviceEnv = `
+COMMAND=echo "test" && echo "test2"
+MULTIPLE=cmd1; cmd2; cmd3
+URL_WITH_PARAMS=https://example.com?a=1&b=2&c=3
+`;
+
+		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
+
+		expect(resolved.length).toBe(3);
+		// These should be safely escaped to prevent command injection
+		for (const env of resolved) {
+			expect(typeof env).toBe("string");
+			expect(env.length).toBeGreaterThan(0);
+		}
+	});
+
+	it("handles environment variables with pipes and redirects", () => {
+		const serviceEnv = `
+PIPE_COMMAND=cat file | grep test
+REDIRECT=echo "test" > output.txt
+BOTH=cat input.txt | grep pattern > output.txt
+`;
+
+		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
+
+		expect(resolved.length).toBe(3);
+		// Pipes and redirects should be safely quoted
+		expect(resolved[0]).toContain("PIPE_COMMAND");
+		expect(resolved[1]).toContain("REDIRECT");
+		expect(resolved[2]).toContain("BOTH");
+		// At least one should contain a pipe
+		const hasPipe = resolved.some((env) => env.includes("|"));
+		expect(hasPipe).toBe(true);
+	});
+
+	it("handles environment variables with parentheses and brackets", () => {
+		const serviceEnv = `
+MATH=(a+b)*c
+ARRAY=[1,2,3]
+JSON={"key":"value"}
+`;
+
+		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
+
+		expect(resolved.length).toBe(3);
+		expect(resolved[0]).toContain("(");
+		expect(resolved[1]).toContain("[");
+		expect(resolved[2]).toContain("{");
+	});
+
+	it("handles very long environment variable values", () => {
+		const longValue = "a".repeat(10000);
+		const serviceEnv = `LONG_VAR=${longValue}`;
+
+		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
+
+		expect(resolved.length).toBe(1);
+		expect(resolved[0]).toContain("LONG_VAR");
+		expect(resolved[0]?.length).toBeGreaterThan(10000);
+	});
+
+	it("handles special unicode characters in environment variables", () => {
+		const serviceEnv = `
+EMOJI=Hello 🌍 World 🚀
+CHINESE=你好世界
+SPECIAL=café résumé naïve
+`;
+
+		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
+
+		expect(resolved.length).toBe(3);
+		expect(resolved[0]).toContain("🌍");
+		expect(resolved[1]).toContain("你好");
+		expect(resolved[2]).toContain("café");
+	});
 });

apps/dokploy/__test__/queues/grouped-queue.test.ts

@@ -1,809 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { GroupedQueue } from "../../server/queues/grouped-queue-wrapper";
-
-describe("GroupedQueue", () => {
-	describe("Basic functionality", () => {
-		it("should process a single job with concurrency 1", async () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-			const processed: string[] = [];
-
-			queue.setHandler(async (data) => {
-				await new Promise((resolve) => setTimeout(resolve, 50));
-				processed.push(data.id);
-			});
-
-			await queue.add("group1", { id: "job1" });
-
-			// Wait for processing to complete
-			await new Promise((resolve) => setTimeout(resolve, 100));
-
-			expect(processed).toEqual(["job1"]);
-			expect(queue.isIdle()).toBe(true);
-		});
-
-		it("should process jobs in FIFO order within a group", async () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-			const processed: string[] = [];
-
-			queue.setHandler(async (data) => {
-				await new Promise((resolve) => setTimeout(resolve, 20));
-				processed.push(data.id);
-			});
-
-			// Add multiple jobs to the same group
-			await Promise.all([
-				queue.add("group1", { id: "job1" }),
-				queue.add("group1", { id: "job2" }),
-				queue.add("group1", { id: "job3" }),
-			]);
-
-			// Wait for all processing
-			await new Promise((resolve) => setTimeout(resolve, 200));
-
-			expect(processed).toEqual(["job1", "job2", "job3"]);
-		});
-	});
-
-	describe("Concurrency 1 with multiple groups", () => {
-		it("should process one group at a time with concurrency 1", async () => {
-			const queue = new GroupedQueue<{ id: string; group: string }>(1);
-			const processed: string[] = [];
-			const activeGroups: string[] = [];
-
-			queue.setHandler(async (data) => {
-				activeGroups.push(data.group);
-				await new Promise((resolve) => setTimeout(resolve, 50));
-				processed.push(data.id);
-				activeGroups.pop();
-			});
-
-			// Add jobs to 3 different groups
-			const promises = [
-				queue.add("app1", { id: "job1", group: "app1" }),
-				queue.add("app2", { id: "job2", group: "app2" }),
-				queue.add("app3", { id: "job3", group: "app3" }),
-			];
-
-			// Check after 30ms - only one should be processing
-			await new Promise((resolve) => setTimeout(resolve, 30));
-			expect(activeGroups.length).toBeLessThanOrEqual(1);
-
-			// Wait for all to complete
-			await Promise.all(promises);
-			await new Promise((resolve) => setTimeout(resolve, 200));
-
-			expect(processed).toHaveLength(3);
-			expect(queue.isIdle()).toBe(true);
-		});
-
-		it("should process groups sequentially with concurrency 1", async () => {
-			const queue = new GroupedQueue<{ id: string; group: string }>(1);
-			const processingOrder: string[] = [];
-			const startTimes: Map<string, number> = new Map();
-			const endTimes: Map<string, number> = new Map();
-
-			queue.setHandler(async (data) => {
-				startTimes.set(data.id, Date.now());
-				processingOrder.push(`start-${data.group}`);
-				await new Promise((resolve) => setTimeout(resolve, 50));
-				endTimes.set(data.id, Date.now());
-				processingOrder.push(`end-${data.group}`);
-			});
-
-			await Promise.all([
-				queue.add("app1", { id: "job1", group: "app1" }),
-				queue.add("app2", { id: "job2", group: "app2" }),
-				queue.add("app3", { id: "job3", group: "app3" }),
-			]);
-
-			await new Promise((resolve) => setTimeout(resolve, 300));
-
-			// Verify sequential processing
-			expect(processingOrder).toEqual([
-				"start-app1",
-				"end-app1",
-				"start-app2",
-				"end-app2",
-				"start-app3",
-				"end-app3",
-			]);
-
-			// Verify jobs don't overlap
-			const job1End = endTimes.get("job1")!;
-			const job2Start = startTimes.get("job2")!;
-			const job2End = endTimes.get("job2")!;
-			const job3Start = startTimes.get("job3")!;
-
-			expect(job2Start).toBeGreaterThanOrEqual(job1End);
-			expect(job3Start).toBeGreaterThanOrEqual(job2End);
-		});
-	});
-
-	describe("Concurrency 3 with 4 groups", () => {
-		it("should process up to 3 groups simultaneously", async () => {
-			const queue = new GroupedQueue<{ id: string; group: string }>(3);
-			const activeGroups = new Set<string>();
-			const maxConcurrent = { value: 0 };
-
-			queue.setHandler(async (data) => {
-				activeGroups.add(data.group);
-				maxConcurrent.value = Math.max(maxConcurrent.value, activeGroups.size);
-
-				await new Promise((resolve) => setTimeout(resolve, 100));
-
-				activeGroups.delete(data.group);
-			});
-
-			// Add 4 jobs to different groups
-			await Promise.all([
-				queue.add("app1", { id: "job1", group: "app1" }),
-				queue.add("app2", { id: "job2", group: "app2" }),
-				queue.add("app3", { id: "job3", group: "app3" }),
-				queue.add("app4", { id: "job4", group: "app4" }),
-			]);
-
-			// Check during processing
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			// Should have processed 3 groups simultaneously
-			expect(maxConcurrent.value).toBe(3);
-			expect(activeGroups.size).toBeLessThanOrEqual(3);
-
-			// Wait for all to complete
-			await new Promise((resolve) => setTimeout(resolve, 200));
-			expect(queue.isIdle()).toBe(true);
-		});
-
-		it("should process 4th group after one of the first 3 completes", async () => {
-			const queue = new GroupedQueue<{ id: string; group: string }>(3);
-			const processingOrder: string[] = [];
-
-			queue.setHandler(async (data) => {
-				processingOrder.push(`start-${data.group}`);
-				await new Promise((resolve) => setTimeout(resolve, 100));
-				processingOrder.push(`end-${data.group}`);
-			});
-
-			await Promise.all([
-				queue.add("app1", { id: "job1", group: "app1" }),
-				queue.add("app2", { id: "job2", group: "app2" }),
-				queue.add("app3", { id: "job3", group: "app3" }),
-				queue.add("app4", { id: "job4", group: "app4" }),
-			]);
-
-			await new Promise((resolve) => setTimeout(resolve, 250));
-
-			// First 3 should start together
-			const firstThree = processingOrder.slice(0, 3);
-			expect(firstThree).toContain("start-app1");
-			expect(firstThree).toContain("start-app2");
-			expect(firstThree).toContain("start-app3");
-
-			// 4th should start after one completes
-			const app4StartIndex = processingOrder.indexOf("start-app4");
-			expect(app4StartIndex).toBeGreaterThan(0);
-			expect(app4StartIndex).toBeLessThan(processingOrder.length - 1);
-		});
-	});
-
-	describe("Multiple jobs per group", () => {
-		it("should process jobs sequentially within same group", async () => {
-			const queue = new GroupedQueue<{ id: string }>(3);
-			const processed: string[] = [];
-
-			queue.setHandler(async (data) => {
-				await new Promise((resolve) => setTimeout(resolve, 30));
-				processed.push(data.id);
-			});
-
-			// Add 3 jobs to same group
-			await Promise.all([
-				queue.add("app1", { id: "job1" }),
-				queue.add("app1", { id: "job2" }),
-				queue.add("app1", { id: "job3" }),
-			]);
-
-			await new Promise((resolve) => setTimeout(resolve, 200));
-
-			// Should process in order
-			expect(processed).toEqual(["job1", "job2", "job3"]);
-		});
-
-		it("should process multiple groups with multiple jobs each", async () => {
-			const queue = new GroupedQueue<{ id: string; group: string }>(2);
-			const processed: string[] = [];
-
-			queue.setHandler(async (data) => {
-				await new Promise((resolve) => setTimeout(resolve, 20));
-				processed.push(`${data.group}-${data.id}`);
-			});
-
-			// Add jobs to 2 groups, 2 jobs each
-			await Promise.all([
-				queue.add("app1", { id: "job1", group: "app1" }),
-				queue.add("app1", { id: "job2", group: "app1" }),
-				queue.add("app2", { id: "job1", group: "app2" }),
-				queue.add("app2", { id: "job2", group: "app2" }),
-			]);
-
-			await new Promise((resolve) => setTimeout(resolve, 200));
-
-			// Should process both groups, jobs within each group in order
-			expect(processed).toHaveLength(4);
-			expect(processed.filter((p) => p.startsWith("app1"))).toEqual([
-				"app1-job1",
-				"app1-job2",
-			]);
-			expect(processed.filter((p) => p.startsWith("app2"))).toEqual([
-				"app2-job1",
-				"app2-job2",
-			]);
-		});
-	});
-
-	describe("Error handling", () => {
-		it("should reject job on handler error", async () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-
-			queue.setHandler(async () => {
-				throw new Error("Test error");
-			});
-
-			await expect(queue.add("group1", { id: "job1" })).rejects.toThrow(
-				"Test error",
-			);
-		});
-
-		it("should continue processing other jobs after error", async () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-			const processed: string[] = [];
-
-			queue.setHandler(async (data) => {
-				if (data.id === "job2") {
-					throw new Error("Job 2 error");
-				}
-				processed.push(data.id);
-			});
-
-			await expect(
-				queue.add("group1", { id: "job1" }),
-			).resolves.toBeUndefined();
-			await expect(queue.add("group1", { id: "job2" })).rejects.toThrow();
-			await expect(
-				queue.add("group1", { id: "job3" }),
-			).resolves.toBeUndefined();
-
-			await new Promise((resolve) => setTimeout(resolve, 100));
-
-			expect(processed).toEqual(["job1", "job3"]);
-		});
-	});
-
-	describe("Queue management", () => {
-		it("should clear group tasks", async () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-			const processed: string[] = [];
-
-			queue.setHandler(async (data) => {
-				await new Promise((resolve) => setTimeout(resolve, 50));
-				processed.push(data.id);
-			});
-
-			// Add jobs without awaiting - they'll start processing
-			const job1Promise = queue.add("group1", { id: "job1" });
-			const job2Promise = queue.add("group1", { id: "job2" });
-
-			// Clear immediately - job1 might be processing, but job2 should be cleared
-			queue.clearGroup("group1");
-
-			// Use Promise.allSettled to handle both promises properly
-			const results = await Promise.allSettled([job1Promise, job2Promise]);
-
-			// job1 might succeed or fail depending on timing
-			// job2 should be rejected
-			const job2Result = results[1];
-			if (job2Result.status === "rejected") {
-				expect(job2Result.reason.message).toBe("Queue cleared");
-			}
-
-			await new Promise((resolve) => setTimeout(resolve, 100));
-
-			// Job1 might have processed, but job2 should not
-			expect(processed.length).toBeLessThanOrEqual(1);
-		});
-
-		it("should return correct group length", async () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-
-			queue.setHandler(async () => {
-				await new Promise((resolve) => setTimeout(resolve, 100));
-			});
-
-			// Add jobs without awaiting - check length immediately
-			const promises = [
-				queue.add("group1", { id: "job1" }),
-				queue.add("group1", { id: "job2" }),
-				queue.add("group1", { id: "job3" }),
-			];
-
-			// Check length immediately - at least some should be pending
-			// (job1 might be processing, but job2 and job3 should be pending)
-			const length = queue.getGroupLength("group1");
-			expect(length).toBeGreaterThanOrEqual(0);
-
-			// Wait for all to complete
-			await Promise.all(promises);
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			// After processing should be 0
-			expect(queue.getGroupLength("group1")).toBe(0);
-		});
-
-		it("should close queue and reject pending tasks", async () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-
-			queue.setHandler(async () => {
-				await new Promise((resolve) => setTimeout(resolve, 100));
-			});
-
-			// Add first job and wait a bit to ensure it starts processing
-			const job1Promise = queue.add("group1", { id: "job1" });
-			// Add second job without awaiting
-			const job2Promise = queue.add("group1", { id: "job2" });
-
-			// Wait a tiny bit to ensure job2 is queued
-			await new Promise((resolve) => setTimeout(resolve, 10));
-
-			// Close queue - job2 should be rejected
-			await queue.close();
-
-			// Use Promise.allSettled to handle both promises properly
-			const results = await Promise.allSettled([job1Promise, job2Promise]);
-
-			// job1 might succeed or fail depending on timing
-			// job2 should be rejected
-			const job2Result = results[1];
-			if (job2Result.status === "rejected") {
-				expect(job2Result.reason.message).toBe("Queue closed");
-			}
-		});
-	});
-
-	describe("Concurrency edge cases", () => {
-		it("should handle concurrency 1 with 1 app correctly", async () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-			const processed: string[] = [];
-
-			queue.setHandler(async (data) => {
-				await new Promise((resolve) => setTimeout(resolve, 50));
-				processed.push(data.id);
-			});
-
-			await queue.add("app1", { id: "job1" });
-
-			await new Promise((resolve) => setTimeout(resolve, 100));
-
-			expect(processed).toEqual(["job1"]);
-			expect(queue.getActiveGroupsCount()).toBe(0);
-		});
-
-		it("should handle concurrency 1 with 3 apps correctly", async () => {
-			const queue = new GroupedQueue<{ id: string; app: string }>(1);
-			const processingTimes: Map<string, { start: number; end: number }> =
-				new Map();
-
-			queue.setHandler(async (data) => {
-				const start = Date.now();
-				await new Promise((resolve) => setTimeout(resolve, 50));
-				const end = Date.now();
-				processingTimes.set(data.app, { start, end });
-			});
-
-			await Promise.all([
-				queue.add("app1", { id: "job1", app: "app1" }),
-				queue.add("app2", { id: "job2", app: "app2" }),
-				queue.add("app3", { id: "job3", app: "app3" }),
-			]);
-
-			await new Promise((resolve) => setTimeout(resolve, 300));
-
-			// Verify sequential processing
-			const app1 = processingTimes.get("app1")!;
-			const app2 = processingTimes.get("app2")!;
-			const app3 = processingTimes.get("app3")!;
-
-			expect(app2.start).toBeGreaterThanOrEqual(app1.end);
-			expect(app3.start).toBeGreaterThanOrEqual(app2.end);
-			expect(queue.getActiveGroupsCount()).toBe(0);
-		});
-
-		it("should handle 4 apps with concurrency 3 correctly", async () => {
-			const queue = new GroupedQueue<{ id: string; app: string }>(3);
-			const concurrentCounts: number[] = [];
-
-			queue.setHandler(async () => {
-				// Track concurrent processing
-				const interval = setInterval(() => {
-					concurrentCounts.push(queue.getActiveGroupsCount());
-				}, 10);
-
-				await new Promise((resolve) => setTimeout(resolve, 100));
-
-				clearInterval(interval);
-			});
-
-			await Promise.all([
-				queue.add("app1", { id: "job1", app: "app1" }),
-				queue.add("app2", { id: "job2", app: "app2" }),
-				queue.add("app3", { id: "job3", app: "app3" }),
-				queue.add("app4", { id: "job4", app: "app4" }),
-			]);
-
-			await new Promise((resolve) => setTimeout(resolve, 200));
-
-			// Should never exceed concurrency of 3
-			const maxConcurrent = Math.max(...concurrentCounts);
-			expect(maxConcurrent).toBeLessThanOrEqual(3);
-			expect(queue.getActiveGroupsCount()).toBe(0);
-		});
-	});
-
-	describe("Idle state", () => {
-		it("should be idle when no jobs are processing", () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-			expect(queue.isIdle()).toBe(true);
-		});
-
-		it("should not be idle while processing", async () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-			let isIdleDuringProcessing = false;
-
-			queue.setHandler(async () => {
-				isIdleDuringProcessing = queue.isIdle();
-				await new Promise((resolve) => setTimeout(resolve, 50));
-			});
-
-			await queue.add("group1", { id: "job1" });
-
-			await new Promise((resolve) => setTimeout(resolve, 30));
-
-			expect(isIdleDuringProcessing).toBe(false);
-			expect(queue.isIdle()).toBe(true);
-		});
-	});
-
-	describe("Concurrency management", () => {
-		it("should get current concurrency", () => {
-			const queue1 = new GroupedQueue<{ id: string }>(1);
-			const queue2 = new GroupedQueue<{ id: string }>(5);
-			const queue3 = new GroupedQueue<{ id: string }>(10);
-
-			expect(queue1.getConcurrency()).toBe(1);
-			expect(queue2.getConcurrency()).toBe(5);
-			expect(queue3.getConcurrency()).toBe(10);
-		});
-
-		it("should set concurrency dynamically", () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-			expect(queue.getConcurrency()).toBe(1);
-
-			queue.setConcurrency(3);
-			expect(queue.getConcurrency()).toBe(3);
-
-			queue.setConcurrency(5);
-			expect(queue.getConcurrency()).toBe(5);
-		});
-
-		it("should throw error when setting concurrency less than 1", () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-			expect(() => queue.setConcurrency(0)).toThrow(
-				"Concurrency must be at least 1",
-			);
-			expect(() => queue.setConcurrency(-1)).toThrow(
-				"Concurrency must be at least 1",
-			);
-		});
-
-		it("should process next group when concurrency increases", async () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-			const processed: string[] = [];
-
-			queue.setHandler(async (data) => {
-				await new Promise((resolve) => setTimeout(resolve, 50));
-				processed.push(data.id);
-			});
-
-			// Add jobs to 3 different groups with concurrency 1
-			const job1Promise = queue.add("group1", { id: "job1" });
-			const job2Promise = queue.add("group2", { id: "job2" });
-			const job3Promise = queue.add("group3", { id: "job3" });
-
-			// Wait a bit to ensure job1 starts processing
-			await new Promise((resolve) => setTimeout(resolve, 10));
-
-			// Increase concurrency to 3 - should allow group2 and group3 to start
-			queue.setConcurrency(3);
-
-			// Wait for all to complete
-			await Promise.all([job1Promise, job2Promise, job3Promise]);
-			await new Promise((resolve) => setTimeout(resolve, 100));
-
-			expect(processed).toHaveLength(3);
-			expect(processed).toContain("job1");
-			expect(processed).toContain("job2");
-			expect(processed).toContain("job3");
-		});
-	});
-
-	describe("Clear all pending tasks", () => {
-		it("should clear all pending tasks across all groups", async () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-			const processed: string[] = [];
-
-			queue.setHandler(async (data) => {
-				await new Promise((resolve) => setTimeout(resolve, 100));
-				processed.push(data.id);
-			});
-
-			// Add multiple jobs to different groups
-			const job1Promise = queue.add("group1", { id: "job1" });
-			const job2Promise = queue.add("group1", { id: "job2" });
-			const job3Promise = queue.add("group2", { id: "job3" });
-			const job4Promise = queue.add("group2", { id: "job4" });
-			const job5Promise = queue.add("group3", { id: "job5" });
-
-			// Wait a bit to ensure job1 starts processing
-			await new Promise((resolve) => setTimeout(resolve, 10));
-
-			// Clear all pending tasks
-			const clearedCount = queue.clearAllPendingTasks();
-
-			// Should have cleared 4 pending tasks (job2, job3, job4, job5)
-			// job1 is processing so it's not in the queue anymore
-			expect(clearedCount).toBe(4);
-
-			// Handle all promises
-			const results = await Promise.allSettled([
-				job1Promise,
-				job2Promise,
-				job3Promise,
-				job4Promise,
-				job5Promise,
-			]);
-
-			// job1 should succeed (it was processing)
-			const job1Result = results[0];
-			expect(job1Result.status).toBe("fulfilled");
-
-			// All pending jobs should be rejected
-			for (let i = 1; i < results.length; i++) {
-				const result = results[i];
-				if (result && result.status === "rejected") {
-					expect(result.reason.message).toBe(
-						"Concurrency changed - queue cleared",
-					);
-				}
-			}
-
-			// Wait for job1 to complete
-			await new Promise((resolve) => setTimeout(resolve, 150));
-
-			// Only job1 should have processed
-			expect(processed).toHaveLength(1);
-			expect(processed).toContain("job1");
-		});
-
-		it("should not clear tasks that are currently processing", async () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-			const processed: string[] = [];
-
-			queue.setHandler(async (data) => {
-				await new Promise((resolve) => setTimeout(resolve, 100));
-				processed.push(data.id);
-			});
-
-			// Add jobs - first one will start processing immediately
-			const job1Promise = queue.add("group1", { id: "job1" });
-			const job2Promise = queue.add("group1", { id: "job2" });
-
-			// Wait to ensure job1 is processing (it's been shifted from tasks)
-			await new Promise((resolve) => setTimeout(resolve, 20));
-
-			// Clear all pending - should only clear job2, not job1
-			// job1 is already executing (not in tasks array)
-			const clearedCount = queue.clearAllPendingTasks();
-
-			expect(clearedCount).toBe(1);
-
-			// Handle all promises
-			const results = await Promise.allSettled([job1Promise, job2Promise]);
-
-			// job1 should succeed (it was processing)
-			const job1Result = results[0];
-			expect(job1Result.status).toBe("fulfilled");
-
-			// job2 should be rejected
-			const job2Result = results[1];
-			if (job2Result && job2Result.status === "rejected") {
-				expect(job2Result.reason.message).toBe(
-					"Concurrency changed - queue cleared",
-				);
-			}
-
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			// Only job1 should have processed
-			expect(processed).toHaveLength(1);
-			expect(processed).toContain("job1");
-		});
-
-		it("should return 0 when no pending tasks", () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-			const clearedCount = queue.clearAllPendingTasks();
-			expect(clearedCount).toBe(0);
-		});
-
-		it("should clear tasks from multiple groups", async () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-			const processed: string[] = [];
-
-			queue.setHandler(async (data) => {
-				await new Promise((resolve) => setTimeout(resolve, 50));
-				processed.push(data.id);
-			});
-
-			// Add jobs to multiple groups
-			const promises = [
-				queue.add("group1", { id: "job1" }),
-				queue.add("group1", { id: "job2" }),
-				queue.add("group2", { id: "job3" }),
-				queue.add("group2", { id: "job4" }),
-				queue.add("group3", { id: "job5" }),
-			];
-
-			// Wait a bit for first job to start (it gets shifted from tasks)
-			await new Promise((resolve) => setTimeout(resolve, 10));
-
-			// Clear all pending
-			const clearedCount = queue.clearAllPendingTasks();
-
-			// Should clear 4 tasks (job2, job3, job4, job5)
-			// job1 is processing so it's not in the queue anymore
-			expect(clearedCount).toBe(4);
-
-			// Handle all promises
-			const results = await Promise.allSettled(promises);
-
-			// job1 should succeed
-			const job1Result = results[0];
-			expect(job1Result?.status).toBe("fulfilled");
-
-			// Others should be rejected
-			for (let i = 1; i < results.length; i++) {
-				const result = results[i];
-				if (result && result.status === "rejected") {
-					expect(result.reason.message).toBe(
-						"Concurrency changed - queue cleared",
-					);
-				}
-			}
-
-			await new Promise((resolve) => setTimeout(resolve, 100));
-
-			// Only first job should process
-			expect(processed.length).toBeLessThanOrEqual(1);
-		});
-	});
-
-	describe("Concurrency change with pending tasks", () => {
-		it("should clear pending tasks when concurrency changes", async () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-			const processed: string[] = [];
-
-			queue.setHandler(async (data) => {
-				await new Promise((resolve) => setTimeout(resolve, 50));
-				processed.push(data.id);
-			});
-
-			// Add jobs with concurrency 1
-			const job1Promise = queue.add("group1", { id: "job1" });
-			const job2Promise = queue.add("group1", { id: "job2" });
-			const job3Promise = queue.add("group2", { id: "job3" });
-
-			// Wait for job1 to start processing (it gets shifted from tasks)
-			await new Promise((resolve) => setTimeout(resolve, 10));
-
-			// Change concurrency - should clear pending tasks via clearAllPendingTasks
-			queue.setConcurrency(3);
-
-			// Handle all promises
-			const results = await Promise.allSettled([
-				job1Promise,
-				job2Promise,
-				job3Promise,
-			]);
-
-			// job1 should succeed (it was processing)
-			const job1Result = results[0];
-			expect(job1Result.status).toBe("fulfilled");
-
-			// Pending jobs should be rejected (job2 and job3 were in queue when cleared)
-			const job2Result = results[1];
-			const job3Result = results[2];
-
-			// At least one of the pending jobs should be rejected
-			const rejectedCount = [job2Result, job3Result].filter(
-				(r) => r && r.status === "rejected",
-			).length;
-			expect(rejectedCount).toBeGreaterThan(0);
-
-			// Verify rejection messages
-			if (job2Result && job2Result.status === "rejected") {
-				expect(job2Result.reason.message).toBe(
-					"Concurrency changed - queue cleared",
-				);
-			}
-			if (job3Result && job3Result.status === "rejected") {
-				expect(job3Result.reason.message).toBe(
-					"Concurrency changed - queue cleared",
-				);
-			}
-
-			await new Promise((resolve) => setTimeout(resolve, 100));
-
-			// job1 should have processed, others may or may not depending on timing
-			expect(processed.length).toBeGreaterThanOrEqual(1);
-			expect(processed).toContain("job1");
-		});
-
-		it("should allow new jobs after concurrency change", async () => {
-			const queue = new GroupedQueue<{ id: string }>(1);
-			const processed: string[] = [];
-
-			queue.setHandler(async (data) => {
-				await new Promise((resolve) => setTimeout(resolve, 50));
-				processed.push(data.id);
-			});
-
-			// Add job with concurrency 1
-			const job1Promise = queue.add("group1", { id: "job1" });
-			const job2Promise = queue.add("group1", { id: "job2" });
-
-			// Wait for job1 to start (it gets shifted from tasks)
-			await new Promise((resolve) => setTimeout(resolve, 10));
-
-			// Change concurrency to 3 - this calls clearAllPendingTasks internally
-			queue.setConcurrency(3);
-
-			// Handle all promises
-			const results = await Promise.allSettled([job1Promise, job2Promise]);
-
-			// job1 should succeed (it was processing)
-			const job1Result = results[0];
-			expect(job1Result.status).toBe("fulfilled");
-
-			// job2 should be rejected (it was in queue when cleared)
-			const job2Result = results[1];
-			if (job2Result && job2Result.status === "rejected") {
-				expect(job2Result.reason.message).toBe(
-					"Concurrency changed - queue cleared",
-				);
-			} else {
-				// If job2 wasn't rejected, it means it started processing before clear
-				// This is acceptable as it's a timing issue
-			}
-
-			// Add new jobs after concurrency change - they should work
-			await Promise.all([
-				queue.add("group2", { id: "job3" }),
-				queue.add("group3", { id: "job4" }),
-			]);
-
-			await new Promise((resolve) => setTimeout(resolve, 100));
-
-			// job1, job3, and job4 should have processed
-			expect(processed.length).toBeGreaterThanOrEqual(2);
-			expect(processed).toContain("job1");
-		});
-	});
-});

apps/dokploy/__test__/queues/queue-manager.test.ts

@@ -1,313 +0,0 @@
-import { beforeEach, describe, expect, it } from "vitest";
-import { QueueManager } from "../../server/queues/queue-manager";
-
-describe("QueueManager", () => {
-	let manager: QueueManager;
-
-	beforeEach(() => {
-		manager = new QueueManager();
-	});
-
-	describe("Queue creation and retrieval", () => {
-		it("should create a queue with default concurrency 1", () => {
-			const queue = manager.getQueue("test-queue");
-			expect(queue.getConcurrency()).toBe(1);
-		});
-
-		it("should create a queue with custom concurrency", () => {
-			const queue = manager.getQueue("test-queue", 5);
-			expect(queue.getConcurrency()).toBe(5);
-		});
-
-		it("should return the same queue instance for the same name", () => {
-			const queue1 = manager.getQueue("test-queue", 3);
-			const queue2 = manager.getQueue("test-queue", 5);
-			expect(queue1).toBe(queue2);
-			// Concurrency should remain as first set
-			expect(queue1.getConcurrency()).toBe(3);
-		});
-
-		it("should create different queues for different names", () => {
-			const queue1 = manager.getQueue("queue1", 2);
-			const queue2 = manager.getQueue("queue2", 4);
-			expect(queue1).not.toBe(queue2);
-			expect(queue1.getConcurrency()).toBe(2);
-			expect(queue2.getConcurrency()).toBe(4);
-		});
-	});
-
-	describe("Handler management", () => {
-		it("should set handler for a queue", async () => {
-			const processed: string[] = [];
-
-			manager.setHandler("test-queue", async (data: { id: string }) => {
-				processed.push(data.id);
-			});
-
-			await manager.add("test-queue", "group1", { id: "job1" });
-
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			expect(processed).toEqual(["job1"]);
-		});
-
-		it("should handle different handlers for different queues", async () => {
-			const queue1Processed: string[] = [];
-			const queue2Processed: string[] = [];
-
-			manager.setHandler("queue1", async (data: { id: string }) => {
-				queue1Processed.push(data.id);
-			});
-
-			manager.setHandler("queue2", async (data: { id: string }) => {
-				queue2Processed.push(data.id);
-			});
-
-			await Promise.all([
-				manager.add("queue1", "group1", { id: "job1" }),
-				manager.add("queue2", "group1", { id: "job2" }),
-			]);
-
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			expect(queue1Processed).toEqual(["job1"]);
-			expect(queue2Processed).toEqual(["job2"]);
-		});
-	});
-
-	describe("Job management", () => {
-		it("should add jobs to correct queue and group", async () => {
-			const processed: string[] = [];
-
-			manager.setHandler("test-queue", async (data: { id: string }) => {
-				processed.push(data.id);
-			});
-
-			await manager.add("test-queue", "group1", { id: "job1" });
-			await manager.add("test-queue", "group2", { id: "job2" });
-
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			expect(processed).toContain("job1");
-			expect(processed).toContain("job2");
-		});
-
-		it("should create queue with concurrency when adding job", async () => {
-			const processed: string[] = [];
-
-			// Create queue with concurrency first (without handler)
-			manager.getQueue("new-queue", 3);
-
-			// Set handler
-			manager.setHandler("new-queue", async (data: { id: string }) => {
-				processed.push(data.id);
-			});
-
-			// Now add job - it should process
-			await manager.add("new-queue", "group1", { id: "job1" });
-
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			const queue = manager.getQueue("new-queue");
-			expect(queue.getConcurrency()).toBe(3);
-			expect(processed).toEqual(["job1"]);
-		});
-	});
-
-	describe("Queue operations", () => {
-		it("should clear group in specific queue", async () => {
-			const processed: string[] = [];
-
-			manager.setHandler("test-queue", async (data: { id: string }) => {
-				await new Promise((resolve) => setTimeout(resolve, 100));
-				processed.push(data.id);
-			});
-
-			// Add jobs but don't await - they'll start processing
-			const job1Promise = manager.add("test-queue", "group1", { id: "job1" });
-			const job2Promise = manager.add("test-queue", "group1", { id: "job2" });
-
-			// Clear immediately - job1 might be processing, but job2 should be cleared
-			manager.clearGroup("test-queue", "group1");
-
-			// Use Promise.allSettled to handle both promises properly
-			const results = await Promise.allSettled([job1Promise, job2Promise]);
-
-			// job1 might succeed or fail depending on timing
-			// job2 should be rejected
-			const job2Result = results[1];
-			if (job2Result.status === "rejected") {
-				expect(job2Result.reason.message).toBe("Queue cleared");
-			}
-
-			await new Promise((resolve) => setTimeout(resolve, 150));
-
-			// Job1 might have processed, but job2 should not
-			expect(processed.length).toBeLessThanOrEqual(1);
-		});
-
-		it("should get group length for specific queue", async () => {
-			manager.setHandler("test-queue", async () => {
-				await new Promise((resolve) => setTimeout(resolve, 100));
-			});
-
-			// Add jobs without awaiting - check length immediately
-			const job1Promise = manager.add("test-queue", "group1", { id: "job1" });
-			const job2Promise = manager.add("test-queue", "group1", { id: "job2" });
-
-			// Check length immediately - at least one should be pending
-			// (job1 might be processing, but job2 should be pending)
-			const length = manager.getGroupLength("test-queue", "group1");
-			expect(length).toBeGreaterThanOrEqual(0);
-
-			// Wait for both to complete
-			await Promise.all([job1Promise, job2Promise]);
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			expect(manager.getGroupLength("test-queue", "group1")).toBe(0);
-		});
-
-		it("should get total length for specific queue", async () => {
-			manager.setHandler("test-queue", async () => {
-				await new Promise((resolve) => setTimeout(resolve, 50));
-			});
-
-			// Add jobs without awaiting - check length immediately
-			const promises = [
-				manager.add("test-queue", "group1", { id: "job1" }),
-				manager.add("test-queue", "group2", { id: "job2" }),
-				manager.add("test-queue", "group3", { id: "job3" }),
-			];
-
-			// Check length immediately - at least some should be pending
-			const length = manager.getTotalLength("test-queue");
-			expect(length).toBeGreaterThanOrEqual(0);
-
-			// Wait for all to complete
-			await Promise.all(promises);
-			await new Promise((resolve) => setTimeout(resolve, 100));
-
-			expect(manager.getTotalLength("test-queue")).toBe(0);
-		});
-
-		it("should check if queue is idle", async () => {
-			manager.setHandler("test-queue", async () => {
-				await new Promise((resolve) => setTimeout(resolve, 50));
-			});
-
-			expect(manager.isIdle("test-queue")).toBe(true);
-
-			await manager.add("test-queue", "group1", { id: "job1" });
-
-			await new Promise((resolve) => setTimeout(resolve, 100));
-
-			expect(manager.isIdle("test-queue")).toBe(true);
-		});
-	});
-
-	describe("Queue lifecycle", () => {
-		it("should close a specific queue", async () => {
-			manager.setHandler("test-queue", async () => {
-				await new Promise((resolve) => setTimeout(resolve, 100));
-			});
-
-			// Add first job and wait a bit to ensure it starts processing
-			const job1Promise = manager.add("test-queue", "group1", { id: "job1" });
-			// Add second job without awaiting
-			const job2Promise = manager.add("test-queue", "group1", { id: "job2" });
-
-			// Wait a tiny bit to ensure job2 is queued
-			await new Promise((resolve) => setTimeout(resolve, 10));
-
-			// Close queue - job2 should be rejected
-			await manager.closeQueue("test-queue");
-
-			// Use Promise.allSettled to handle both promises properly
-			const results = await Promise.allSettled([job1Promise, job2Promise]);
-
-			// job1 might succeed or fail depending on timing
-			// job2 should be rejected
-			const job2Result = results[1];
-			if (job2Result.status === "rejected") {
-				expect(job2Result.reason.message).toBe("Queue closed");
-			}
-
-			expect(manager.getQueueNames()).not.toContain("test-queue");
-		});
-
-		it("should close all queues", async () => {
-			manager.setHandler("queue1", async () => {
-				await new Promise((resolve) => setTimeout(resolve, 100));
-			});
-			manager.setHandler("queue2", async () => {
-				await new Promise((resolve) => setTimeout(resolve, 100));
-			});
-
-			await manager.add("queue1", "group1", { id: "job1" });
-			await manager.add("queue2", "group1", { id: "job2" });
-
-			await manager.closeAll();
-
-			expect(manager.getQueueNames()).toHaveLength(0);
-		});
-
-		it("should get all queue names", () => {
-			manager.getQueue("queue1");
-			manager.getQueue("queue2");
-			manager.getQueue("queue3");
-
-			const names = manager.getQueueNames();
-			expect(names).toContain("queue1");
-			expect(names).toContain("queue2");
-			expect(names).toContain("queue3");
-			expect(names).toHaveLength(3);
-		});
-	});
-
-	describe("Multiple queues with different concurrency", () => {
-		it("should handle multiple queues with different concurrency settings", async () => {
-			const queue1Processed: string[] = [];
-			const queue2Processed: string[] = [];
-
-			// Create queues with specific concurrency FIRST, before setting handlers
-			const queue1 = manager.getQueue("queue1", 1);
-			const queue2 = manager.getQueue("queue2", 3);
-
-			// Verify concurrency is set correctly before proceeding
-			expect(queue1.getConcurrency()).toBe(1);
-			expect(queue2.getConcurrency()).toBe(3);
-
-			manager.setHandler("queue1", async (data: { id: string }) => {
-				await new Promise((resolve) => setTimeout(resolve, 50));
-				queue1Processed.push(data.id);
-			});
-
-			manager.setHandler("queue2", async (data: { id: string }) => {
-				await new Promise((resolve) => setTimeout(resolve, 50));
-				queue2Processed.push(data.id);
-			});
-
-			// Queue1 with concurrency 1 (sequential)
-			await Promise.all([
-				manager.add("queue1", "app1", { id: "job1" }),
-				manager.add("queue1", "app2", { id: "job2" }),
-			]);
-
-			// Queue2 with concurrency 3 (parallel)
-			await Promise.all([
-				manager.add("queue2", "app1", { id: "job1" }),
-				manager.add("queue2", "app2", { id: "job2" }),
-				manager.add("queue2", "app3", { id: "job3" }),
-			]);
-
-			await new Promise((resolve) => setTimeout(resolve, 200));
-
-			expect(queue1Processed).toHaveLength(2);
-			expect(queue2Processed).toHaveLength(3);
-
-			// Verify concurrency settings are still correct
-			expect(manager.getQueue("queue1").getConcurrency()).toBe(1);
-			expect(manager.getQueue("queue2").getConcurrency()).toBe(3);
-		});
-	});
-});

apps/dokploy/__test__/queues/queue-setup.test.ts

@@ -1,250 +0,0 @@
-import { beforeEach, describe, expect, it } from "vitest";
-import type { DeploymentJob } from "../../server/queues/queue-types";
-import {
-	getConcurrency,
-	myQueue,
-	setConcurrency,
-} from "../../server/queues/queueSetup";
-
-describe("queueSetup", () => {
-	beforeEach(() => {
-		// Reset concurrency to default (1) before each test
-		setConcurrency(1);
-		// Clear all pending tasks
-		myQueue.clearAllPendingTasks();
-	});
-
-	describe("getConcurrency", () => {
-		it("should return default concurrency of 1", () => {
-			const concurrency = getConcurrency();
-			expect(concurrency).toBe(1);
-		});
-
-		it("should return current concurrency after setting it", () => {
-			setConcurrency(3);
-			expect(getConcurrency()).toBe(3);
-
-			setConcurrency(5);
-			expect(getConcurrency()).toBe(5);
-		});
-	});
-
-	describe("setConcurrency", () => {
-		it("should set concurrency successfully", () => {
-			const clearedCount = setConcurrency(3);
-			expect(getConcurrency()).toBe(3);
-			expect(clearedCount).toBe(0); // No pending tasks to clear
-		});
-
-		it("should throw error for concurrency less than 1", () => {
-			expect(() => setConcurrency(0)).toThrow("Concurrency must be at least 1");
-			expect(() => setConcurrency(-1)).toThrow(
-				"Concurrency must be at least 1",
-			);
-		});
-
-		it("should return 0 cleared builds when no pending tasks", () => {
-			const clearedCount = setConcurrency(2);
-			expect(clearedCount).toBe(0);
-			expect(getConcurrency()).toBe(2);
-		});
-
-		it("should clear pending builds when concurrency changes", async () => {
-			const processed: string[] = [];
-
-			// Set handler
-			myQueue.setHandler(async (job: DeploymentJob) => {
-				await new Promise((resolve) => setTimeout(resolve, 100));
-				if (job.applicationType === "application") {
-					processed.push(job.applicationId);
-				} else if (job.applicationType === "compose") {
-					processed.push(job.composeId);
-				} else if (job.applicationType === "application-preview") {
-					processed.push(job.previewDeploymentId);
-				}
-			});
-
-			// Add jobs to different groups
-			const job1: DeploymentJob = {
-				applicationId: "app1",
-				titleLog: "Test",
-				descriptionLog: "Test",
-				type: "deploy",
-				applicationType: "application",
-				server: false,
-			};
-			const job2: DeploymentJob = {
-				applicationId: "app2",
-				titleLog: "Test",
-				descriptionLog: "Test",
-				type: "deploy",
-				applicationType: "application",
-				server: false,
-			};
-			const job3: DeploymentJob = {
-				applicationId: "app3",
-				titleLog: "Test",
-				descriptionLog: "Test",
-				type: "deploy",
-				applicationType: "application",
-				server: false,
-			};
-
-			// Add jobs without awaiting
-			const promise1 = myQueue.add("application:app1", job1);
-			const promise2 = myQueue.add("application:app2", job2);
-			const promise3 = myQueue.add("application:app3", job3);
-
-			// Wait for first job to start processing
-			await new Promise((resolve) => setTimeout(resolve, 10));
-
-			// Change concurrency - should clear pending builds
-			const clearedCount = setConcurrency(3);
-
-			// Should have cleared 2 pending builds (app2 and app3)
-			expect(clearedCount).toBe(2);
-			expect(getConcurrency()).toBe(3);
-
-			// Handle all promises - use allSettled to handle both resolved and rejected
-			const results = await Promise.allSettled([promise1, promise2, promise3]);
-
-			// job1 should succeed (it was processing), others should be rejected
-			const job1Result = results[0];
-			if (job1Result.status === "fulfilled") {
-				// Job1 completed successfully
-			}
-
-			// Pending jobs should be rejected
-			const job2Result = results[1];
-			const job3Result = results[2];
-			if (job2Result && job2Result.status === "rejected") {
-				expect(job2Result.reason.message).toBe(
-					"Concurrency changed - queue cleared",
-				);
-			}
-			if (job3Result && job3Result.status === "rejected") {
-				expect(job3Result.reason.message).toBe(
-					"Concurrency changed - queue cleared",
-				);
-			}
-
-			await new Promise((resolve) => setTimeout(resolve, 150));
-
-			// Only first job should have processed
-			expect(processed.length).toBeLessThanOrEqual(1);
-		});
-
-		it("should not clear builds when concurrency doesn't change", async () => {
-			// Set to 2
-			setConcurrency(2);
-			expect(getConcurrency()).toBe(2);
-
-			// Set to 2 again - should not clear anything
-			const clearedCount = setConcurrency(2);
-			expect(clearedCount).toBe(0);
-			expect(getConcurrency()).toBe(2);
-		});
-
-		it("should allow new jobs after concurrency change", async () => {
-			const processed: string[] = [];
-
-			myQueue.setHandler(async (job: DeploymentJob) => {
-				await new Promise((resolve) => setTimeout(resolve, 50));
-				if (job.applicationType === "application") {
-					processed.push(job.applicationId);
-				}
-			});
-
-			// Add job with concurrency 1
-			const job1: DeploymentJob = {
-				applicationId: "app1",
-				titleLog: "Test",
-				descriptionLog: "Test",
-				type: "deploy",
-				applicationType: "application",
-				server: false,
-			};
-			const job2: DeploymentJob = {
-				applicationId: "app2",
-				titleLog: "Test",
-				descriptionLog: "Test",
-				type: "deploy",
-				applicationType: "application",
-				server: false,
-			};
-
-			const promise1 = myQueue.add("application:app1", job1);
-			const promise2 = myQueue.add("application:app2", job2);
-
-			// Wait for first job to start
-			await new Promise((resolve) => setTimeout(resolve, 10));
-
-			// Change concurrency to 3
-			const clearedCount = setConcurrency(3);
-			expect(clearedCount).toBe(1); // app2 should be cleared
-
-			// Handle all promises - use allSettled to handle both resolved and rejected
-			const results = await Promise.allSettled([promise1, promise2]);
-
-			// job1 should succeed (it was processing)
-			const job1Result = results[0];
-			if (job1Result.status === "fulfilled") {
-				// Job1 completed successfully
-			}
-
-			// app2 should be rejected
-			const job2Result = results[1];
-			if (job2Result.status === "rejected") {
-				expect(job2Result.reason.message).toBe(
-					"Concurrency changed - queue cleared",
-				);
-			}
-
-			// Add new jobs after concurrency change - they should work
-			const job3: DeploymentJob = {
-				applicationId: "app3",
-				titleLog: "Test",
-				descriptionLog: "Test",
-				type: "deploy",
-				applicationType: "application",
-				server: false,
-			};
-			const job4: DeploymentJob = {
-				applicationId: "app4",
-				titleLog: "Test",
-				descriptionLog: "Test",
-				type: "deploy",
-				applicationType: "application",
-				server: false,
-			};
-
-			await Promise.all([
-				myQueue.add("application:app3", job3),
-				myQueue.add("application:app4", job4),
-			]);
-
-			await new Promise((resolve) => setTimeout(resolve, 150));
-
-			// app1, app3, and app4 should have processed
-			expect(processed.length).toBeGreaterThanOrEqual(2);
-			expect(processed).toContain("app1");
-		});
-
-		it("should handle multiple concurrency changes correctly", () => {
-			// Start at 1
-			expect(getConcurrency()).toBe(1);
-
-			// Change to 3
-			setConcurrency(3);
-			expect(getConcurrency()).toBe(3);
-
-			// Change to 5
-			setConcurrency(5);
-			expect(getConcurrency()).toBe(5);
-
-			// Change back to 1
-			setConcurrency(1);
-			expect(getConcurrency()).toBe(1);
-		});
-	});
-});

apps/dokploy/__test__/server/mechanizeDockerContainer.test.ts

@@ -4,7 +4,11 @@ import type { ApplicationNested } from "@dokploy/server/utils/builders";
 import { mechanizeDockerContainer } from "@dokploy/server/utils/builders";
 
 type MockCreateServiceOptions = {
-	StopGracePeriod?: number;
+	TaskTemplate?: {
+		ContainerSpec?: {
+			StopGracePeriod?: number;
+		};
+	};
 	[key: string]: unknown;
 };
 
@@ -82,8 +86,10 @@ describe("mechanizeDockerContainer", () => {
 			throw new Error("createServiceMock should have been called once");
 		}
 		const [settings] = call;
-		expect(settings.StopGracePeriod).toBe(0);
-		expect(typeof settings.StopGracePeriod).toBe("number");
+		expect(settings.TaskTemplate?.ContainerSpec?.StopGracePeriod).toBe(0);
+		expect(typeof settings.TaskTemplate?.ContainerSpec?.StopGracePeriod).toBe(
+			"number",
+		);
 	});
 
 	it("omits StopGracePeriod when stopGracePeriodSwarm is null", async () => {
@@ -97,6 +103,8 @@ describe("mechanizeDockerContainer", () => {
 			throw new Error("createServiceMock should have been called once");
 		}
 		const [settings] = call;
-		expect(settings).not.toHaveProperty("StopGracePeriod");
+		expect(settings.TaskTemplate?.ContainerSpec).not.toHaveProperty(
+			"StopGracePeriod",
+		);
 	});
 });

apps/dokploy/__test__/traefik/traefik.test.ts

@@ -11,8 +11,12 @@ const baseApp: ApplicationNested = {
 	giteaRepository: "",
 	giteaOwner: "",
 	giteaBranch: "",
+	buildServerId: "",
+	buildRegistryId: "",
+	buildRegistry: null,
 	giteaBuildPath: "",
 	giteaId: "",
+	args: [],
 	cleanCache: false,
 	applicationStatus: "done",
 	endpointSpecSwarm: null,

apps/dokploy/__test__/vitest.config.ts

@@ -13,7 +13,11 @@ export default defineConfig({
 			NODE: "test",
 		},
 	},
-	plugins: [tsconfigPaths()],
+	plugins: [
+		tsconfigPaths({
+			projects: [path.resolve(__dirname, "../tsconfig.json")],
+		}),
+	],
 	resolve: {
 		alias: {
 			"@dokploy/server": path.resolve(

apps/dokploy/components/dashboard/application/advanced/general/add-command.tsx

@@ -1,6 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
+import { Plus, Trash2 } from "lucide-react";
 import { useEffect } from "react";
-import { useForm } from "react-hook-form";
+import { useFieldArray, useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
 import { Button } from "@/components/ui/button";
@@ -28,6 +29,13 @@ interface Props {
 
 const AddRedirectSchema = z.object({
 	command: z.string(),
+	args: z
+		.array(
+			z.object({
+				value: z.string().min(1, "Argument cannot be empty"),
+			}),
+		)
+		.optional(),
 });
 
 type AddCommand = z.infer<typeof AddRedirectSchema>;
@@ -47,22 +55,30 @@ export const AddCommand = ({ applicationId }: Props) => {
 	const form = useForm<AddCommand>({
 		defaultValues: {
 			command: "",
+			args: [],
 		},
 		resolver: zodResolver(AddRedirectSchema),
 	});
 
+	const { fields, append, remove } = useFieldArray({
+		control: form.control,
+		name: "args",
+	});
+
 	useEffect(() => {
-		if (data?.command) {
+		if (data) {
 			form.reset({
 				command: data?.command || "",
+				args: data?.args?.map((arg) => ({ value: arg })) || [],
 			});
 		}
-	}, [form, form.reset, form.formState.isSubmitSuccessful, data?.command]);
+	}, [data, form]);
 
 	const onSubmit = async (data: AddCommand) => {
 		await mutateAsync({
 			applicationId,
 			command: data?.command,
+			args: data?.args?.map((arg) => arg.value).filter(Boolean),
 		})
 			.then(async () => {
 				toast.success("Command Updated");
@@ -100,13 +116,65 @@ export const AddCommand = ({ applicationId }: Props) => {
 									<FormItem>
 										<FormLabel>Command</FormLabel>
 										<FormControl>
-											<Input placeholder="Custom command" {...field} />
+											<Input placeholder="/bin/sh" {...field} />
 										</FormControl>
 
 										<FormMessage />
 									</FormItem>
 								)}
 							/>
+
+							<div className="space-y-2">
+								<div className="flex items-center justify-between">
+									<FormLabel>Arguments (Args)</FormLabel>
+									<Button
+										type="button"
+										variant="outline"
+										size="sm"
+										onClick={() => append({ value: "" })}
+									>
+										<Plus className="h-4 w-4 mr-1" />
+										Add Argument
+									</Button>
+								</div>
+
+								{fields.length === 0 && (
+									<p className="text-sm text-muted-foreground">
+										No arguments added yet. Click "Add Argument" to add one.
+									</p>
+								)}
+
+								{fields.map((field, index) => (
+									<FormField
+										key={field.id}
+										control={form.control}
+										name={`args.${index}.value`}
+										render={({ field }) => (
+											<FormItem>
+												<div className="flex gap-2">
+													<FormControl>
+														<Input
+															placeholder={
+																index === 0 ? "-c" : "echo Hello World"
+															}
+															{...field}
+														/>
+													</FormControl>
+													<Button
+														type="button"
+														variant="destructive"
+														size="icon"
+														onClick={() => remove(index)}
+													>
+														<Trash2 className="h-4 w-4" />
+													</Button>
+												</div>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+								))}
+							</div>
 						</div>
 						<div className="flex justify-end">
 							<Button isLoading={isLoading} type="submit" className="w-fit">

apps/dokploy/components/dashboard/application/advanced/show-build-server.tsx

@@ -0,0 +1,248 @@
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Server } from "lucide-react";
+import Link from "next/link";
+import { useEffect } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
+import { AlertBlock } from "@/components/shared/alert-block";
+import { Button } from "@/components/ui/button";
+import {
+	Card,
+	CardContent,
+	CardDescription,
+	CardHeader,
+	CardTitle,
+} from "@/components/ui/card";
+import {
+	Form,
+	FormControl,
+	FormDescription,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
+} from "@/components/ui/form";
+import {
+	Select,
+	SelectContent,
+	SelectGroup,
+	SelectItem,
+	SelectLabel,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
+import { api } from "@/utils/api";
+
+interface Props {
+	applicationId: string;
+}
+
+const schema = z.object({
+	buildServerId: z.string().min(1, "Build server is required"),
+	buildRegistryId: z.string().min(1, "Build registry is required"),
+});
+
+type Schema = z.infer<typeof schema>;
+
+export const ShowBuildServer = ({ applicationId }: Props) => {
+	const { data, refetch } = api.application.one.useQuery(
+		{ applicationId },
+		{ enabled: !!applicationId },
+	);
+	const { data: buildServers } = api.server.buildServers.useQuery();
+	const { data: registries } = api.registry.all.useQuery();
+
+	const { mutateAsync, isLoading } = api.application.update.useMutation();
+
+	const form = useForm<Schema>({
+		defaultValues: {
+			buildServerId: data?.buildServerId || "",
+			buildRegistryId: data?.buildRegistryId || "",
+		},
+		resolver: zodResolver(schema),
+	});
+
+	useEffect(() => {
+		if (data) {
+			form.reset({
+				buildServerId: data?.buildServerId || "",
+				buildRegistryId: data?.buildRegistryId || "",
+			});
+		}
+	}, [form, form.reset, data]);
+
+	const onSubmit = async (formData: Schema) => {
+		await mutateAsync({
+			applicationId,
+			buildServerId:
+				formData?.buildServerId === "none" || !formData?.buildServerId
+					? null
+					: formData?.buildServerId,
+			buildRegistryId:
+				formData?.buildRegistryId === "none" || !formData?.buildRegistryId
+					? null
+					: formData?.buildRegistryId,
+		})
+			.then(async () => {
+				toast.success("Build Server Settings Updated");
+				await refetch();
+			})
+			.catch(() => {
+				toast.error("Error updating build server settings");
+			});
+	};
+
+	return (
+		<Card className="bg-background">
+			<CardHeader>
+				<div className="flex flex-row items-center gap-2">
+					<Server className="size-6 text-muted-foreground" />
+					<div>
+						<CardTitle className="text-xl">Build Server</CardTitle>
+						<CardDescription>
+							Configure a dedicated server for building your application.
+						</CardDescription>
+					</div>
+				</div>
+			</CardHeader>
+			<CardContent className="flex flex-col gap-4">
+				<AlertBlock type="info">
+					Build servers offload the build process from your deployment servers.
+					Select a build server and registry to use for building your
+					application.
+				</AlertBlock>
+
+				<AlertBlock type="info">
+					📊 <strong>Important:</strong> Once the build finishes, you'll need to
+					wait a few seconds for the deployment server to download the image.
+					These download logs will <strong>NOT</strong> appear in the build
+					deployment logs. Check the <strong>Logs</strong> tab to see when the
+					container starts running.
+				</AlertBlock>
+
+				{!registries || registries.length === 0 ? (
+					<AlertBlock type="warning">
+						You need to add at least one registry to use build servers. Please
+						go to{" "}
+						<Link
+							href="/dashboard/settings/registry"
+							className="text-primary underline"
+						>
+							Settings
+						</Link>{" "}
+						to add a registry.
+					</AlertBlock>
+				) : null}
+
+				<Form {...form}>
+					<form
+						onSubmit={form.handleSubmit(onSubmit)}
+						className="grid w-full gap-4"
+					>
+						<FormField
+							control={form.control}
+							name="buildServerId"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Build Server</FormLabel>
+									<Select
+										onValueChange={field.onChange}
+										value={field.value || "none"}
+									>
+										<FormControl>
+											<SelectTrigger>
+												<SelectValue placeholder="Select a build server" />
+											</SelectTrigger>
+										</FormControl>
+										<SelectContent>
+											<SelectGroup>
+												<SelectItem value="none">
+													<span className="flex items-center gap-2">
+														<span>None</span>
+													</span>
+												</SelectItem>
+												{buildServers?.map((server) => (
+													<SelectItem
+														key={server.serverId}
+														value={server.serverId}
+													>
+														<span className="flex items-center gap-2 justify-between w-full">
+															<span>{server.name}</span>
+															<span className="text-muted-foreground text-xs">
+																{server.ipAddress}
+															</span>
+														</span>
+													</SelectItem>
+												))}
+												<SelectLabel>
+													Build Servers ({buildServers?.length || 0})
+												</SelectLabel>
+											</SelectGroup>
+										</SelectContent>
+									</Select>
+									<FormDescription>
+										Select a build server to handle the build process for this
+										application.
+									</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+
+						<FormField
+							control={form.control}
+							name="buildRegistryId"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Build Registry</FormLabel>
+									<Select
+										onValueChange={field.onChange}
+										value={field.value || "none"}
+									>
+										<FormControl>
+											<SelectTrigger>
+												<SelectValue placeholder="Select a registry" />
+											</SelectTrigger>
+										</FormControl>
+										<SelectContent>
+											<SelectGroup>
+												<SelectItem value="none">
+													<span className="flex items-center gap-2">
+														<span>None</span>
+													</span>
+												</SelectItem>
+												{registries?.map((registry) => (
+													<SelectItem
+														key={registry.registryId}
+														value={registry.registryId}
+													>
+														{registry.registryName}
+													</SelectItem>
+												))}
+												<SelectLabel>
+													Registries ({registries?.length || 0})
+												</SelectLabel>
+											</SelectGroup>
+										</SelectContent>
+									</Select>
+									<FormDescription>
+										Select a registry to store the built images from the build
+										server.
+									</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+
+						<div className="flex w-full justify-end">
+							<Button isLoading={isLoading} type="submit">
+								Save
+							</Button>
+						</div>
+					</form>
+				</Form>
+			</CardContent>
+		</Card>
+	);
+};

apps/dokploy/components/dashboard/application/deployments/kill-build.tsx

@@ -0,0 +1,65 @@
+import { Scissors } from "lucide-react";
+import { toast } from "sonner";
+import {
+	AlertDialog,
+	AlertDialogAction,
+	AlertDialogCancel,
+	AlertDialogContent,
+	AlertDialogDescription,
+	AlertDialogFooter,
+	AlertDialogHeader,
+	AlertDialogTitle,
+	AlertDialogTrigger,
+} from "@/components/ui/alert-dialog";
+import { Button } from "@/components/ui/button";
+import { api } from "@/utils/api";
+
+interface Props {
+	id: string;
+	type: "application" | "compose";
+}
+
+export const KillBuild = ({ id, type }: Props) => {
+	const { mutateAsync, isLoading } =
+		type === "application"
+			? api.application.killBuild.useMutation()
+			: api.compose.killBuild.useMutation();
+
+	return (
+		<AlertDialog>
+			<AlertDialogTrigger asChild>
+				<Button variant="outline" className="w-fit" isLoading={isLoading}>
+					Kill Build
+					<Scissors className="size-4" />
+				</Button>
+			</AlertDialogTrigger>
+			<AlertDialogContent>
+				<AlertDialogHeader>
+					<AlertDialogTitle>Are you sure to kill the build?</AlertDialogTitle>
+					<AlertDialogDescription>
+						This will kill the build process
+					</AlertDialogDescription>
+				</AlertDialogHeader>
+				<AlertDialogFooter>
+					<AlertDialogCancel>Cancel</AlertDialogCancel>
+					<AlertDialogAction
+						onClick={async () => {
+							await mutateAsync({
+								applicationId: id || "",
+								composeId: id || "",
+							})
+								.then(() => {
+									toast.success("Build killed successfully");
+								})
+								.catch((err) => {
+									toast.error(err.message);
+								});
+						}}
+					>
+						Confirm
+					</AlertDialogAction>
+				</AlertDialogFooter>
+			</AlertDialogContent>
+		</AlertDialog>
+	);
+};

apps/dokploy/components/dashboard/application/deployments/show-deployments.tsx

@@ -25,6 +25,7 @@ import {
 import { api, type RouterOutputs } from "@/utils/api";
 import { ShowRollbackSettings } from "../rollbacks/show-rollback-settings";
 import { CancelQueues } from "./cancel-queues";
+import { KillBuild } from "./kill-build";
 import { RefreshToken } from "./refresh-token";
 import { ShowDeployment } from "./show-deployment";
 
@@ -143,6 +144,9 @@ export const ShowDeployments = ({
 					</CardDescription>
 				</div>
 				<div className="flex flex-row items-center gap-2">
+					{(type === "application" || type === "compose") && (
+						<KillBuild id={id} type={type} />
+					)}
 					{(type === "application" || type === "compose") && (
 						<CancelQueues id={id} type={type} />
 					)}
@@ -403,7 +407,7 @@ export const ShowDeployments = ({
 					</div>
 				)}
 				<ShowDeployment
-					serverId={serverId}
+					serverId={activeLog?.buildServerId || serverId}
 					open={Boolean(activeLog && activeLog.logPath !== null)}
 					onClose={() => setActiveLog(null)}
 					logPath={activeLog?.logPath || ""}

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

@@ -46,7 +46,13 @@ export type CacheType = "fetch" | "cache";
 
 export const domain = z
 	.object({
-		host: z.string().min(1, { message: "Add a hostname" }),
+		host: z
+			.string()
+			.min(1, { message: "Add a hostname" })
+			.refine((val) => val === val.trim(), {
+				message: "Domain name cannot have leading or trailing spaces",
+			})
+			.transform((val) => val.trim()),
 		path: z.string().min(1).optional(),
 		internalPath: z.string().optional(),
 		stripPath: z.boolean().optional(),
@@ -299,6 +305,13 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 				</DialogHeader>
 				{isError && <AlertBlock type="error">{error?.message}</AlertBlock>}
 
+				{type === "compose" && (
+					<AlertBlock type="info" className="mb-4">
+						Whenever you make changes to domains, remember to redeploy your
+						compose to apply the changes.
+					</AlertBlock>
+				)}
+
 				<Form {...form}>
 					<form
 						id="hook-form"

apps/dokploy/components/dashboard/application/general/show.tsx

@@ -79,7 +79,7 @@ export const ShowGeneralApplication = ({ applicationId }: Props) => {
 						>
 							<Button
 								variant="default"
-								// isLoading={data?.applicationStatus === "running"}
+								isLoading={data?.applicationStatus === "running"}
 								className="flex items-center gap-1.5 group focus-visible:ring-2 focus-visible:ring-offset-2"
 							>
 								<Tooltip>

apps/dokploy/components/dashboard/application/preview-deployments/show-preview-deployments.tsx

@@ -182,7 +182,16 @@ export const ShowPreviewDeployments = ({ applicationId }: Props) => {
 															id={deployment.previewDeploymentId}
 															type="previewDeployment"
 															serverId={data?.serverId || ""}
-														/>
+														>
+															<Button
+																variant="outline"
+																size="sm"
+																className="gap-2"
+															>
+																<RocketIcon className="size-4" />
+																Deployments
+															</Button>
+														</ShowDeploymentsModal>
 
 														<AddPreviewDomain
 															previewDeploymentId={`${deployment.previewDeploymentId}`}

apps/dokploy/components/dashboard/application/volume-backups/show-volume-backups.tsx

@@ -86,7 +86,7 @@ export const ShowVolumeBackups = ({
 						</CardTitle>
 						<CardDescription>
 							Schedule volume backups to run automatically at specified
-							intervals.
+							intervals
 						</CardDescription>
 					</div>
 					<div className="flex items-center gap-2 flex-wrap">

apps/dokploy/components/dashboard/postgres/advanced/show-custom-command.tsx

@@ -1,6 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
+import { Plus, Trash2 } from "lucide-react";
 import { useEffect } from "react";
-import { useForm } from "react-hook-form";
+import { useFieldArray, useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
 import { Button } from "@/components/ui/button";
@@ -20,6 +21,13 @@ import type { ServiceType } from "../../application/advanced/show-resources";
 const addDockerImage = z.object({
 	dockerImage: z.string().min(1, "Docker image is required"),
 	command: z.string(),
+	args: z
+		.array(
+			z.object({
+				value: z.string().min(1, "Argument cannot be empty"),
+			}),
+		)
+		.optional(),
 });
 
 interface Props {
@@ -61,18 +69,25 @@ export const ShowCustomCommand = ({ id, type }: Props) => {
 		defaultValues: {
 			dockerImage: "",
 			command: "",
+			args: [],
 		},
 		resolver: zodResolver(addDockerImage),
 	});
 
+	const { fields, append, remove } = useFieldArray({
+		control: form.control,
+		name: "args",
+	});
+
 	useEffect(() => {
 		if (data) {
 			form.reset({
 				dockerImage: data.dockerImage,
 				command: data.command || "",
+				args: data.args?.map((arg) => ({ value: arg })) || [],
 			});
 		}
-	}, [data, form, form.reset]);
+	}, [data, form]);
 
 	const onSubmit = async (formData: AddDockerImage) => {
 		await mutateAsync({
@@ -83,6 +98,7 @@ export const ShowCustomCommand = ({ id, type }: Props) => {
 			mariadbId: id || "",
 			dockerImage: formData?.dockerImage,
 			command: formData?.command,
+			args: formData?.args?.map((arg) => arg.value).filter(Boolean),
 		})
 			.then(async () => {
 				toast.success("Custom Command Updated");
@@ -128,13 +144,68 @@ export const ShowCustomCommand = ({ id, type }: Props) => {
 										<FormItem>
 											<FormLabel>Command</FormLabel>
 											<FormControl>
-												<Input placeholder="Custom command" {...field} />
+												<Input placeholder="/bin/sh" {...field} />
 											</FormControl>
 
 											<FormMessage />
 										</FormItem>
 									)}
 								/>
+
+								<div className="space-y-2">
+									<div className="flex items-center justify-between">
+										<FormLabel>Arguments (Args)</FormLabel>
+										<Button
+											type="button"
+											variant="outline"
+											size="sm"
+											onClick={() => append({ value: "" })}
+										>
+											<Plus className="h-4 w-4 mr-1" />
+											Add Argument
+										</Button>
+									</div>
+
+									{fields.length === 0 && (
+										<p className="text-sm text-muted-foreground">
+											No arguments added yet. Click "Add Argument" to add one.
+										</p>
+									)}
+
+									{fields.map((field, index) => (
+										<FormField
+											key={field.id}
+											control={form.control}
+											name={`args.${index}.value`}
+											render={({ field }) => (
+												<FormItem>
+													<div className="flex gap-2">
+														<FormControl>
+															<Input
+																placeholder={
+																	index === 0
+																		? "-c"
+																		: "redis-server --port 6379"
+																}
+																{...field}
+															/>
+														</FormControl>
+														<Button
+															type="button"
+															variant="destructive"
+															size="icon"
+															onClick={() => remove(index)}
+														>
+															<Trash2 className="h-4 w-4" />
+														</Button>
+													</div>
+													<FormMessage />
+												</FormItem>
+											)}
+										/>
+									))}
+								</div>
+
 								<div className="flex w-full justify-end">
 									<Button isLoading={form.formState.isSubmitting} type="submit">
 										Save

apps/dokploy/components/dashboard/project/add-application.tsx

@@ -150,8 +150,8 @@ export const AddApplication = ({ environmentId, projectName }: Props) => {
 											placeholder="Frontend"
 											{...field}
 											onChange={(e) => {
-												const val = e.target.value?.trim() || "";
-												const serviceName = slugify(val);
+												const val = e.target.value || "";
+												const serviceName = slugify(val.trim());
 												form.setValue("appName", `${slug}-${serviceName}`);
 												field.onChange(val);
 											}}

apps/dokploy/components/dashboard/project/add-compose.tsx

@@ -161,8 +161,8 @@ export const AddCompose = ({ environmentId, projectName }: Props) => {
 												placeholder="Frontend"
 												{...field}
 												onChange={(e) => {
-													const val = e.target.value?.trim() || "";
-													const serviceName = slugify(val);
+													const val = e.target.value || "";
+													const serviceName = slugify(val.trim());
 													form.setValue("appName", `${slug}-${serviceName}`);
 													field.onChange(val);
 												}}

apps/dokploy/components/dashboard/project/add-database.tsx

@@ -395,8 +395,8 @@ export const AddDatabase = ({ environmentId, projectName }: Props) => {
 													placeholder="Name"
 													{...field}
 													onChange={(e) => {
-														const val = e.target.value?.trim() || "";
-														const serviceName = slugify(val);
+														const val = e.target.value || "";
+														const serviceName = slugify(val.trim());
 														form.setValue("appName", `${slug}-${serviceName}`);
 														field.onChange(val);
 													}}

apps/dokploy/components/dashboard/projects/show.tsx

@@ -138,7 +138,7 @@ export const ShowProjects = () => {
 				list={[{ name: "Projects", href: "/dashboard/projects" }]}
 			/>
 			{!isCloud && (
-				<div className="absolute top-5 right-5">
+				<div className="absolute top-4 right-4">
 					<TimeBadge />
 				</div>
 			)}

apps/dokploy/components/dashboard/requests/request-distribution-chart.tsx

@@ -49,51 +49,65 @@ export const RequestDistributionChart = ({
 	);
 
 	return (
-		<ResponsiveContainer width="100%" height={200}>
-			<ChartContainer config={chartConfig}>
-				<AreaChart
-					accessibilityLayer
-					data={stats || []}
-					margin={{
-						left: 12,
-						right: 12,
-					}}
-				>
-					<CartesianGrid vertical={false} />
-					<XAxis
-						dataKey="hour"
-						tickLine={false}
-						axisLine={false}
-						tickMargin={8}
-						tickFormatter={(value) =>
-							new Date(value).toLocaleTimeString([], {
-								hour: "2-digit",
-								minute: "2-digit",
-							})
-						}
-					/>
-					<YAxis tickLine={false} axisLine={false} tickMargin={8} />
-					<ChartTooltip
-						cursor={false}
-						content={<ChartTooltipContent indicator="line" />}
-						labelFormatter={(value) =>
-							new Date(value).toLocaleString([], {
-								month: "short",
-								day: "numeric",
-								hour: "2-digit",
-								minute: "2-digit",
-							})
-						}
-					/>
-					<Area
-						dataKey="count"
-						type="natural"
-						fill="hsl(var(--chart-1))"
-						fillOpacity={0.4}
-						stroke="hsl(var(--chart-1))"
-					/>
-				</AreaChart>
-			</ChartContainer>
-		</ResponsiveContainer>
+		<div className="w-full h-[200px] overflow-hidden">
+			<ResponsiveContainer
+				width="100%"
+				height="100%"
+				className="overflow-hidden"
+			>
+				<ChartContainer config={chartConfig}>
+					<AreaChart
+						accessibilityLayer
+						data={stats || []}
+						margin={{
+							top: 10,
+							left: 12,
+							right: 12,
+							bottom: 0,
+						}}
+					>
+						<CartesianGrid vertical={false} />
+						<XAxis
+							dataKey="hour"
+							tickLine={false}
+							axisLine={false}
+							tickMargin={8}
+							tickFormatter={(value) =>
+								new Date(value).toLocaleTimeString([], {
+									hour: "2-digit",
+									minute: "2-digit",
+								})
+							}
+						/>
+						<YAxis
+							tickLine={false}
+							axisLine={false}
+							tickMargin={8}
+							allowDataOverflow={false}
+							domain={[0, "auto"]}
+						/>
+						<ChartTooltip
+							cursor={false}
+							content={<ChartTooltipContent indicator="line" />}
+							labelFormatter={(value) =>
+								new Date(value).toLocaleString([], {
+									month: "short",
+									day: "numeric",
+									hour: "2-digit",
+									minute: "2-digit",
+								})
+							}
+						/>
+						<Area
+							dataKey="count"
+							type="monotone"
+							fill="hsl(var(--chart-1))"
+							fillOpacity={0.4}
+							stroke="hsl(var(--chart-1))"
+						/>
+					</AreaChart>
+				</ChartContainer>
+			</ResponsiveContainer>
+		</div>
 	);
 };

apps/dokploy/components/dashboard/requests/show-requests.tsx

@@ -51,13 +51,19 @@ export const ShowRequests = () => {
 	const { mutateAsync: updateLogCleanup } =
 		api.settings.updateLogCleanup.useMutation();
 	const [cronExpression, setCronExpression] = useState<string | null>(null);
+
+	// Set default date range to last 3 days
+	const getDefaultDateRange = () => {
+		const to = new Date();
+		const from = new Date();
+		from.setDate(from.getDate() - 3);
+		return { from, to };
+	};
+
 	const [dateRange, setDateRange] = useState<{
 		from: Date | undefined;
 		to: Date | undefined;
-	}>({
-		from: undefined,
-		to: undefined,
-	});
+	}>(getDefaultDateRange());
 
 	useEffect(() => {
 		if (logCleanupStatus) {
@@ -169,17 +175,13 @@ export const ShowRequests = () => {
 							{isActive ? (
 								<>
 									<div className="flex justify-end mb-4 gap-2">
-										{(dateRange.from || dateRange.to) && (
-											<Button
-												variant="outline"
-												onClick={() =>
-													setDateRange({ from: undefined, to: undefined })
-												}
-												className="px-3"
-											>
-												Clear dates
-											</Button>
-										)}
+										<Button
+											variant="outline"
+											onClick={() => setDateRange(getDefaultDateRange())}
+											className="px-3"
+										>
+											Reset to Last 3 Days
+										</Button>
 										<Popover>
 											<PopoverTrigger asChild>
 												<Button

apps/dokploy/components/dashboard/settings/git/show-git-providers.tsx

@@ -48,7 +48,7 @@ export const ShowGitProviders = () => {
 	) => {
 		const redirectUri = `${url}/api/providers/gitlab/callback?gitlabId=${gitlabId}`;
 		const scope = "api read_user read_repository";
-		const authUrl = `${gitlabUrl}/oauth/authorize?client_id=${clientId}&redirect_uri=${encodeURIComponent(redirectUri)}&response_type=code&scope=${encodeURIComponent(scope)}`;
+		const authUrl = `${gitlabUrl}/oauth/authorize?client_id=${clientId}&redirect_uri=${encodeURIComponent(redirectUri)}&response_type=code&scopes=${encodeURIComponent(scope)}`;
 		return authUrl;
 	};
 

apps/dokploy/components/dashboard/settings/handle-ai.tsx

@@ -1,12 +1,19 @@
 "use client";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { PenBoxIcon, PlusIcon } from "lucide-react";
+import { Check, ChevronDown, PenBoxIcon, PlusIcon } from "lucide-react";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { Button } from "@/components/ui/button";
+import {
+	Command,
+	CommandEmpty,
+	CommandInput,
+	CommandItem,
+	CommandList,
+} from "@/components/ui/command";
 import {
 	Dialog,
 	DialogContent,
@@ -26,13 +33,12 @@ import {
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
+	Popover,
+	PopoverContent,
+	PopoverTrigger,
+} from "@/components/ui/popover";
 import { Switch } from "@/components/ui/switch";
+import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
 
 const Schema = z.object({
@@ -53,6 +59,8 @@ export const HandleAi = ({ aiId }: Props) => {
 	const utils = api.useUtils();
 	const [error, setError] = useState<string | null>(null);
 	const [open, setOpen] = useState(false);
+	const [modelPopoverOpen, setModelPopoverOpen] = useState(false);
+	const [modelSearch, setModelSearch] = useState("");
 	const { data, refetch } = api.ai.one.useQuery(
 		{
 			aiId: aiId || "",
@@ -77,13 +85,17 @@ export const HandleAi = ({ aiId }: Props) => {
 	});
 
 	useEffect(() => {
-		form.reset({
-			name: data?.name ?? "",
-			apiUrl: data?.apiUrl ?? "https://api.openai.com/v1",
-			apiKey: data?.apiKey ?? "",
-			model: data?.model ?? "",
-			isEnabled: data?.isEnabled ?? true,
-		});
+		if (data) {
+			form.reset({
+				name: data?.name ?? "",
+				apiUrl: data?.apiUrl ?? "https://api.openai.com/v1",
+				apiKey: data?.apiKey ?? "",
+				model: data?.model ?? "",
+				isEnabled: data?.isEnabled ?? true,
+			});
+		}
+		setModelSearch("");
+		setModelPopoverOpen(false);
 	}, [aiId, form, data]);
 
 	const apiUrl = form.watch("apiUrl");
@@ -104,14 +116,6 @@ export const HandleAi = ({ aiId }: Props) => {
 			},
 		);
 
-	useEffect(() => {
-		const apiUrl = form.watch("apiUrl");
-		const apiKey = form.watch("apiKey");
-		if (apiUrl && apiKey) {
-			form.setValue("model", "");
-		}
-	}, [form.watch("apiUrl"), form.watch("apiKey")]);
-
 	const onSubmit = async (data: Schema) => {
 		try {
 			await mutateAsync({
@@ -131,7 +135,16 @@ export const HandleAi = ({ aiId }: Props) => {
 	};
 
 	return (
-		<Dialog open={open} onOpenChange={setOpen}>
+		<Dialog
+			open={open}
+			onOpenChange={(isOpen) => {
+				setOpen(isOpen);
+				if (!isOpen) {
+					setModelSearch("");
+					setModelPopoverOpen(false);
+				}
+			}}
+		>
 			<DialogTrigger className="" asChild>
 				{aiId ? (
 					<Button
@@ -182,7 +195,17 @@ export const HandleAi = ({ aiId }: Props) => {
 								<FormItem>
 									<FormLabel>API URL</FormLabel>
 									<FormControl>
-										<Input placeholder="https://api.openai.com/v1" {...field} />
+										<Input
+											placeholder="https://api.openai.com/v1"
+											{...field}
+											onChange={(e) => {
+												field.onChange(e);
+												// Reset model when user changes API URL
+												if (form.getValues("model")) {
+													form.setValue("model", "");
+												}
+											}}
+										/>
 									</FormControl>
 									<FormDescription>
 										The base URL for your AI provider's API
@@ -205,6 +228,13 @@ export const HandleAi = ({ aiId }: Props) => {
 												placeholder="sk-..."
 												autoComplete="one-time-code"
 												{...field}
+												onChange={(e) => {
+													field.onChange(e);
+													// Reset model when user changes API Key
+													if (form.getValues("model")) {
+														form.setValue("model", "");
+													}
+												}}
 											/>
 										</FormControl>
 										<FormDescription>
@@ -232,30 +262,89 @@ export const HandleAi = ({ aiId }: Props) => {
 							<FormField
 								control={form.control}
 								name="model"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Model</FormLabel>
-										<Select
-											onValueChange={field.onChange}
-											value={field.value || ""}
-										>
-											<FormControl>
-												<SelectTrigger>
-													<SelectValue placeholder="Select a model" />
-												</SelectTrigger>
-											</FormControl>
-											<SelectContent>
-												{models.map((model) => (
-													<SelectItem key={model.id} value={model.id}>
-														{model.id}
-													</SelectItem>
-												))}
-											</SelectContent>
-										</Select>
-										<FormDescription>Select an AI model to use</FormDescription>
-										<FormMessage />
-									</FormItem>
-								)}
+								render={({ field }) => {
+									const selectedModel = models.find(
+										(m) => m.id === field.value,
+									);
+									const filteredModels = models.filter((model) =>
+										model.id.toLowerCase().includes(modelSearch.toLowerCase()),
+									);
+
+									// Ensure selected model is always in the filtered list
+									const displayModels =
+										field.value &&
+										!filteredModels.find((m) => m.id === field.value) &&
+										selectedModel
+											? [selectedModel, ...filteredModels]
+											: filteredModels;
+
+									return (
+										<FormItem>
+											<FormLabel>Model</FormLabel>
+											<Popover
+												open={modelPopoverOpen}
+												onOpenChange={setModelPopoverOpen}
+											>
+												<PopoverTrigger asChild>
+													<FormControl>
+														<Button
+															variant="outline"
+															className={cn(
+																"w-full justify-between",
+																!field.value && "text-muted-foreground",
+															)}
+														>
+															{field.value
+																? (selectedModel?.id ?? field.value)
+																: "Select a model"}
+															<ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+														</Button>
+													</FormControl>
+												</PopoverTrigger>
+												<PopoverContent className="w-[400px] p-0" align="start">
+													<Command>
+														<CommandInput
+															placeholder="Search models..."
+															value={modelSearch}
+															onValueChange={setModelSearch}
+														/>
+														<CommandList>
+															<CommandEmpty>No models found.</CommandEmpty>
+															{displayModels.map((model) => {
+																const isSelected = field.value === model.id;
+																return (
+																	<CommandItem
+																		key={model.id}
+																		value={model.id}
+																		onSelect={() => {
+																			field.onChange(model.id);
+																			setModelPopoverOpen(false);
+																			setModelSearch("");
+																		}}
+																	>
+																		<Check
+																			className={cn(
+																				"mr-2 h-4 w-4",
+																				isSelected
+																					? "opacity-100"
+																					: "opacity-0",
+																			)}
+																		/>
+																		{model.id}
+																	</CommandItem>
+																);
+															})}
+														</CommandList>
+													</Command>
+												</PopoverContent>
+											</Popover>
+											<FormDescription>
+												Select an AI model to use
+											</FormDescription>
+											<FormMessage />
+										</FormItem>
+									);
+								}}
 							/>
 						)}
 

apps/dokploy/components/dashboard/settings/notifications/handle-notifications.tsx

@@ -103,7 +103,7 @@ export const notificationSchema = z.discriminatedUnion("type", [
 			type: z.literal("ntfy"),
 			serverUrl: z.string().min(1, { message: "Server URL is required" }),
 			topic: z.string().min(1, { message: "Topic is required" }),
-			accessToken: z.string().min(1, { message: "Access Token is required" }),
+			accessToken: z.string().optional(),
 			priority: z.number().min(1).max(5).default(3),
 		})
 		.merge(notificationBaseSchema),
@@ -303,7 +303,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 					dokployRestart: notification.dokployRestart,
 					databaseBackup: notification.databaseBackup,
 					type: notification.notificationType,
-					accessToken: notification.ntfy?.accessToken,
+					accessToken: notification.ntfy?.accessToken || "",
 					topic: notification.ntfy?.topic,
 					priority: notification.ntfy?.priority,
 					serverUrl: notification.ntfy?.serverUrl,
@@ -432,7 +432,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 				dokployRestart: dokployRestart,
 				databaseBackup: databaseBackup,
 				serverUrl: data.serverUrl,
-				accessToken: data.accessToken,
+				accessToken: data.accessToken || "",
 				topic: data.topic,
 				priority: data.priority,
 				name: data.name,
@@ -1001,8 +1001,12 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 														<Input
 															placeholder="AzxcvbnmKjhgfdsa..."
 															{...field}
+															value={field.value ?? ""}
 														/>
 													</FormControl>
+													<FormDescription>
+														Optional. Leave blank for public topics.
+													</FormDescription>
 													<FormMessage />
 												</FormItem>
 											)}
@@ -1214,55 +1218,63 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 								isLoadingLark
 							}
 							variant="secondary"
+							type="button"
 							onClick={async () => {
+								const isValid = await form.trigger();
+								if (!isValid) return;
+
+								const data = form.getValues();
+
 								try {
-									if (type === "slack") {
+									if (data.type === "slack") {
 										await testSlackConnection({
-											webhookUrl: form.getValues("webhookUrl"),
-											channel: form.getValues("channel"),
+											webhookUrl: data.webhookUrl,
+											channel: data.channel,
 										});
-									} else if (type === "telegram") {
+									} else if (data.type === "telegram") {
 										await testTelegramConnection({
-											botToken: form.getValues("botToken"),
-											chatId: form.getValues("chatId"),
-											messageThreadId: form.getValues("messageThreadId") || "",
+											botToken: data.botToken,
+											chatId: data.chatId,
+											messageThreadId: data.messageThreadId || "",
 										});
-									} else if (type === "discord") {
+									} else if (data.type === "discord") {
 										await testDiscordConnection({
-											webhookUrl: form.getValues("webhookUrl"),
-											decoration: form.getValues("decoration"),
+											webhookUrl: data.webhookUrl,
+											decoration: data.decoration,
 										});
-									} else if (type === "email") {
+									} else if (data.type === "email") {
 										await testEmailConnection({
-											smtpServer: form.getValues("smtpServer"),
-											smtpPort: form.getValues("smtpPort"),
-											username: form.getValues("username"),
-											password: form.getValues("password"),
-											toAddresses: form.getValues("toAddresses"),
-											fromAddress: form.getValues("fromAddress"),
+											smtpServer: data.smtpServer,
+											smtpPort: data.smtpPort,
+											username: data.username,
+											password: data.password,
+											fromAddress: data.fromAddress,
+											toAddresses: data.toAddresses,
 										});
-									} else if (type === "gotify") {
+									} else if (data.type === "gotify") {
 										await testGotifyConnection({
-											serverUrl: form.getValues("serverUrl"),
-											appToken: form.getValues("appToken"),
-											priority: form.getValues("priority"),
-											decoration: form.getValues("decoration"),
+											serverUrl: data.serverUrl,
+											appToken: data.appToken,
+											priority: data.priority,
+											decoration: data.decoration,
 										});
-									} else if (type === "ntfy") {
+									} else if (data.type === "ntfy") {
 										await testNtfyConnection({
-											serverUrl: form.getValues("serverUrl"),
-											topic: form.getValues("topic"),
-											accessToken: form.getValues("accessToken"),
-											priority: form.getValues("priority"),
+											serverUrl: data.serverUrl,
+											topic: data.topic,
+											accessToken: data.accessToken || "",
+											priority: data.priority,
 										});
-									} else if (type === "lark") {
+									} else if (data.type === "lark") {
 										await testLarkConnection({
-											webhookUrl: form.getValues("webhookUrl"),
+											webhookUrl: data.webhookUrl,
 										});
 									}
 									toast.success("Connection Success");
-								} catch {
-									toast.error("Error testing the provider");
+								} catch (error) {
+									toast.error(
+										`Error testing the provider: ${error instanceof Error ? error.message : "Unknown error"}`,
+									);
 								}
 							}}
 						>

apps/dokploy/components/dashboard/settings/servers/actions/show-dokploy-actions.tsx

@@ -15,7 +15,6 @@ import { api } from "@/utils/api";
 import { ShowModalLogs } from "../../web-server/show-modal-logs";
 import { TerminalModal } from "../../web-server/terminal-modal";
 import { GPUSupportModal } from "../gpu-support-modal";
-import { ChangeConcurrencyModal } from "../change-concurrency-modal";
 
 export const ShowDokployActions = () => {
 	const { t } = useTranslation("settings");
@@ -102,14 +101,6 @@ export const ShowDokployActions = () => {
 					>
 						Reload Redis
 					</DropdownMenuItem>
-					<ChangeConcurrencyModal>
-						<DropdownMenuItem
-							className="cursor-pointer"
-							onSelect={(e) => e.preventDefault()}
-						>
-							Change Concurrency
-						</DropdownMenuItem>
-					</ChangeConcurrencyModal>
 				</DropdownMenuGroup>
 			</DropdownMenuContent>
 		</DropdownMenu>

apps/dokploy/components/dashboard/settings/servers/actions/show-server-actions.tsx

@@ -7,11 +7,9 @@ import {
 	DialogTrigger,
 } from "@/components/ui/dialog";
 import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
-import { Button } from "@/components/ui/button";
 import { ShowStorageActions } from "./show-storage-actions";
 import { ShowTraefikActions } from "./show-traefik-actions";
 import { ToggleDockerCleanup } from "./toggle-docker-cleanup";
-import { ChangeConcurrencyModal } from "../change-concurrency-modal";
 
 interface Props {
 	serverId: string;
@@ -39,16 +37,6 @@ export const ShowServerActions = ({ serverId }: Props) => {
 					<ShowTraefikActions serverId={serverId} />
 					<ShowStorageActions serverId={serverId} />
 					<ToggleDockerCleanup serverId={serverId} />
-					<div className="col-span-2">
-						<ChangeConcurrencyModal
-							serverId={serverId}
-							trigger={
-								<Button variant="outline" className="w-full">
-									Change Concurrency
-								</Button>
-							}
-						/>
-					</div>
 				</div>
 			</DialogContent>
 		</Dialog>

apps/dokploy/components/dashboard/settings/servers/change-concurrency-modal.tsx

@@ -1,180 +0,0 @@
-"use client";
-
-import { InfoIcon, Loader2 } from "lucide-react";
-import { useState } from "react";
-import { toast } from "sonner";
-import { Alert, AlertDescription } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogFooter,
-	DialogHeader,
-	DialogTitle,
-	DialogTrigger,
-} from "@/components/ui/dialog";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { api } from "@/utils/api";
-
-interface Props {
-	serverId?: string;
-	trigger?: React.ReactNode;
-}
-
-export const ChangeConcurrencyModal = ({ serverId, trigger }: Props) => {
-	const [isOpen, setIsOpen] = useState(false);
-	const [concurrency, setConcurrency] = useState<number | "">("");
-
-	const { data, isLoading: isLoadingCurrent } =
-		api.settings.getDeploymentConcurrency.useQuery(
-			{ serverId },
-			{
-				enabled: isOpen,
-				onSuccess: (data) => {
-					if (concurrency === "") {
-						setConcurrency(data.concurrency);
-					}
-				},
-			},
-		);
-
-	const { mutateAsync, isLoading } =
-		api.settings.setDeploymentConcurrency.useMutation();
-
-	const handleSubmit = async (e: React.FormEvent) => {
-		e.preventDefault();
-		if (
-			typeof concurrency !== "number" ||
-			concurrency < 1 ||
-			concurrency > 20
-		) {
-			toast.error("Concurrency must be between 1 and 20");
-			return;
-		}
-
-		try {
-			const result = await mutateAsync({ concurrency, serverId });
-			if (result.clearedBuilds > 0) {
-				toast.warning(
-					`Concurrency updated. ${result.clearedBuilds} pending build${result.clearedBuilds > 1 ? "s were" : " was"} cancelled.`,
-				);
-			} else {
-				toast.success("Concurrency updated successfully");
-			}
-			setIsOpen(false);
-		} catch (error) {
-			toast.error("Failed to update concurrency");
-		}
-	};
-
-	const serverType = serverId ? "Remote Server" : "Dokploy Server";
-
-	return (
-		<Dialog open={isOpen} onOpenChange={setIsOpen}>
-			<DialogTrigger asChild>
-				{trigger || (
-					<Button variant="outline" size="sm">
-						Change Concurrency
-					</Button>
-				)}
-			</DialogTrigger>
-			<DialogContent className="sm:max-w-md">
-				<DialogHeader>
-					<DialogTitle>Deployment Concurrency - {serverType}</DialogTitle>
-					<DialogDescription>
-						Configure how many deployments can run simultaneously on this
-						server.
-					</DialogDescription>
-				</DialogHeader>
-				<form onSubmit={handleSubmit} className="space-y-4">
-					<div className="space-y-2">
-						<Label htmlFor="concurrency">Concurrency</Label>
-						<Input
-							id="concurrency"
-							type="number"
-							min={1}
-							max={20}
-							value={concurrency}
-							onChange={(e) => {
-								const value = e.target.value;
-								setConcurrency(value === "" ? "" : Number.parseInt(value, 10));
-							}}
-							placeholder="Enter concurrency (1-20)"
-							disabled={isLoading || isLoadingCurrent}
-						/>
-						{isLoadingCurrent && (
-							<div className="flex items-center gap-2 text-sm text-muted-foreground">
-								<Loader2 className="h-4 w-4 animate-spin" />
-								Loading current concurrency...
-							</div>
-						)}
-						{!isLoadingCurrent && data && (
-							<p className="text-sm text-muted-foreground">
-								Current: {data.concurrency}
-							</p>
-						)}
-					</div>
-
-					<div className="space-y-3">
-						<Alert>
-							<InfoIcon className="h-4 w-4" />
-							<AlertDescription className="text-sm">
-								<div className="space-y-1 mt-1">
-									<p>
-										<strong>Default:</strong> 1 deployment at a time
-										(sequential)
-									</p>
-									<p>
-										<strong>Higher values:</strong> More deployments in
-										parallel, but will use more RAM and CPU resources.
-									</p>
-									{serverId && (
-										<p className="text-muted-foreground text-xs mt-2">
-											This setting applies to deployments on this remote server.
-										</p>
-									)}
-									{!serverId && (
-										<p className="text-muted-foreground text-xs mt-2">
-											This setting applies to deployments on the Dokploy server.
-										</p>
-									)}
-								</div>
-							</AlertDescription>
-						</Alert>
-						<Alert variant="destructive">
-							<InfoIcon className="h-4 w-4" />
-							<AlertDescription className="text-sm font-medium">
-								⚠️ <strong>Warning:</strong> Changing concurrency will cancel all
-								pending builds. Currently running builds will continue, but
-								queued builds will be cancelled.
-							</AlertDescription>
-						</Alert>
-					</div>
-
-					<DialogFooter>
-						<Button
-							type="button"
-							variant="outline"
-							onClick={() => setIsOpen(false)}
-							disabled={isLoading}
-						>
-							Cancel
-						</Button>
-						<Button type="submit" disabled={isLoading || isLoadingCurrent}>
-							{isLoading ? (
-								<>
-									<Loader2 className="mr-2 h-4 w-4 animate-spin" />
-									Updating...
-								</>
-							) : (
-								"Update Concurrency"
-							)}
-						</Button>
-					</DialogFooter>
-				</form>
-			</DialogContent>
-		</Dialog>
-	);
-};

apps/dokploy/components/dashboard/settings/servers/handle-servers.tsx

@@ -52,6 +52,7 @@ const Schema = z.object({
 	sshKeyId: z.string().min(1, {
 		message: "SSH Key is required",
 	}),
+	serverType: z.enum(["deploy", "build"]).default("deploy"),
 });
 
 type Schema = z.infer<typeof Schema>;
@@ -89,6 +90,7 @@ export const HandleServers = ({ serverId }: Props) => {
 			port: 22,
 			username: "root",
 			sshKeyId: "",
+			serverType: "deploy",
 		},
 		resolver: zodResolver(Schema),
 	});
@@ -101,6 +103,7 @@ export const HandleServers = ({ serverId }: Props) => {
 			port: data?.port || 22,
 			username: data?.username || "root",
 			sshKeyId: data?.sshKeyId || "",
+			serverType: data?.serverType || "deploy",
 		});
 	}, [form, form.reset, form.formState.isSubmitSuccessful, data]);
 
@@ -116,6 +119,7 @@ export const HandleServers = ({ serverId }: Props) => {
 			port: data.port || 22,
 			username: data.username || "root",
 			sshKeyId: data.sshKeyId || "",
+			serverType: data.serverType || "deploy",
 			serverId: serverId || "",
 		})
 			.then(async (_data) => {
@@ -266,6 +270,50 @@ export const HandleServers = ({ serverId }: Props) => {
 								</FormItem>
 							)}
 						/>
+						<FormField
+							control={form.control}
+							name="serverType"
+							render={({ field }) => {
+								const serverTypeValue = form.watch("serverType");
+								return (
+									<FormItem>
+										<FormLabel>Server Type</FormLabel>
+										<Select
+											onValueChange={field.onChange}
+											defaultValue={field.value}
+										>
+											<SelectTrigger>
+												<SelectValue placeholder="Select a server type" />
+											</SelectTrigger>
+											<SelectContent>
+												<SelectGroup>
+													<SelectItem value="deploy">Deploy Server</SelectItem>
+													<SelectItem value="build">Build Server</SelectItem>
+													<SelectLabel>Server Type</SelectLabel>
+												</SelectGroup>
+											</SelectContent>
+										</Select>
+										<FormMessage />
+										{serverTypeValue === "deploy" && (
+											<AlertBlock type="info" className="mt-2">
+												Deploy servers are used to run your applications,
+												databases, and services. They handle the deployment and
+												execution of your projects.
+											</AlertBlock>
+										)}
+										{serverTypeValue === "build" && (
+											<AlertBlock type="info" className="mt-2">
+												Build servers are dedicated to building your
+												applications. They handle the compilation and build
+												process, offloading this work from your deployment
+												servers. Build servers won't appear in deployment
+												options.
+											</AlertBlock>
+										)}
+									</FormItem>
+								);
+							}}
+						/>
 						<FormField
 							control={form.control}
 							name="sshKeyId"

apps/dokploy/components/dashboard/settings/servers/setup-server.tsx

@@ -51,6 +51,7 @@ export const SetupServer = ({ serverId }: Props) => {
 
 	const [activeLog, setActiveLog] = useState<string | null>(null);
 	const { data: isCloud } = api.settings.isCloud.useQuery();
+	const isBuildServer = server?.serverType === "build";
 	const [isDrawerOpen, setIsDrawerOpen] = useState(false);
 	const [filteredLogs, setFilteredLogs] = useState<LogLine[]>([]);
 	const [isDeploying, setIsDeploying] = useState(false);
@@ -117,17 +118,26 @@ export const SetupServer = ({ serverId }: Props) => {
 							<TabsList
 								className={cn(
 									"grid  w-[700px]",
-									isCloud ? "grid-cols-6" : "grid-cols-5",
+									isBuildServer
+										? "grid-cols-3"
+										: isCloud
+											? "grid-cols-6"
+											: "grid-cols-5",
 								)}
 							>
 								<TabsTrigger value="ssh-keys">SSH Keys</TabsTrigger>
 								<TabsTrigger value="deployments">Deployments</TabsTrigger>
 								<TabsTrigger value="validate">Validate</TabsTrigger>
-								<TabsTrigger value="audit">Security</TabsTrigger>
-								{isCloud && (
-									<TabsTrigger value="monitoring">Monitoring</TabsTrigger>
+
+								{!isBuildServer && (
+									<>
+										<TabsTrigger value="audit">Security</TabsTrigger>
+										{isCloud && (
+											<TabsTrigger value="monitoring">Monitoring</TabsTrigger>
+										)}
+										<TabsTrigger value="gpu-setup">GPU Setup</TabsTrigger>
+									</>
 								)}
-								<TabsTrigger value="gpu-setup">GPU Setup</TabsTrigger>
 							</TabsList>
 							<TabsContent
 								value="ssh-keys"
@@ -311,32 +321,36 @@ export const SetupServer = ({ serverId }: Props) => {
 									<ValidateServer serverId={serverId} />
 								</div>
 							</TabsContent>
-							<TabsContent
-								value="audit"
-								className="outline-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0"
-							>
-								<div className="flex flex-col gap-2 text-sm text-muted-foreground pt-3">
-									<SecurityAudit serverId={serverId} />
-								</div>
-							</TabsContent>
-							<TabsContent
-								value="monitoring"
-								className="outline-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0"
-							>
-								<div className="flex flex-col gap-2 text-sm pt-3">
-									<div className="rounded-xl bg-background shadow-md border">
-										<SetupMonitoring serverId={serverId} />
-									</div>
-								</div>
-							</TabsContent>
-							<TabsContent
-								value="gpu-setup"
-								className="outline-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0"
-							>
-								<div className="flex flex-col gap-2 text-sm text-muted-foreground pt-3">
-									<GPUSupport serverId={serverId} />
-								</div>
-							</TabsContent>
+							{!isBuildServer && (
+								<>
+									<TabsContent
+										value="audit"
+										className="outline-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0"
+									>
+										<div className="flex flex-col gap-2 text-sm text-muted-foreground pt-3">
+											<SecurityAudit serverId={serverId} />
+										</div>
+									</TabsContent>
+									<TabsContent
+										value="monitoring"
+										className="outline-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0"
+									>
+										<div className="flex flex-col gap-2 text-sm pt-3">
+											<div className="rounded-xl bg-background shadow-md border">
+												<SetupMonitoring serverId={serverId} />
+											</div>
+										</div>
+									</TabsContent>
+									<TabsContent
+										value="gpu-setup"
+										className="outline-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0"
+									>
+										<div className="flex flex-col gap-2 text-sm text-muted-foreground pt-3">
+											<GPUSupport serverId={serverId} />
+										</div>
+									</TabsContent>
+								</>
+							)}
 						</Tabs>
 					</div>
 				)}

apps/dokploy/components/dashboard/settings/servers/show-servers.tsx

@@ -129,6 +129,9 @@ export const ShowServers = () => {
 																	Status
 																</TableHead>
 															)}
+															<TableHead className="text-center">
+																Type
+															</TableHead>
 															<TableHead className="text-center">
 																IP Address
 															</TableHead>
@@ -153,6 +156,8 @@ export const ShowServers = () => {
 														{data?.map((server) => {
 															const canDelete = server.totalSum === 0;
 															const isActive = server.serverStatus === "active";
+															const isBuildServer =
+																server.serverType === "build";
 															return (
 																<TableRow key={server.serverId}>
 																	<TableCell className="text-left">
@@ -171,6 +176,15 @@ export const ShowServers = () => {
 																			</Badge>
 																		</TableHead>
 																	)}
+																	<TableCell className="text-center">
+																		<Badge
+																			variant={
+																				isBuildServer ? "secondary" : "default"
+																			}
+																		>
+																			{server.serverType}
+																		</Badge>
+																	</TableCell>
 																	<TableCell className="text-center">
 																		<Badge>{server.ipAddress}</Badge>
 																	</TableCell>
@@ -233,11 +247,12 @@ export const ShowServers = () => {
 																							serverId={server.serverId}
 																						/>
 
-																						{server.sshKeyId && (
-																							<ShowServerActions
-																								serverId={server.serverId}
-																							/>
-																						)}
+																						{server.sshKeyId &&
+																							!isBuildServer && (
+																								<ShowServerActions
+																									serverId={server.serverId}
+																								/>
+																							)}
 																					</>
 																				)}
 
@@ -286,41 +301,43 @@ export const ShowServers = () => {
 																					</DropdownMenuItem>
 																				</DialogAction>
 
-																				{isActive && server.sshKeyId && (
-																					<>
-																						<DropdownMenuSeparator />
-																						<DropdownMenuLabel>
-																							Extra
-																						</DropdownMenuLabel>
+																				{isActive &&
+																					server.sshKeyId &&
+																					!isBuildServer && (
+																						<>
+																							<DropdownMenuSeparator />
+																							<DropdownMenuLabel>
+																								Extra
+																							</DropdownMenuLabel>
 
-																						<ShowTraefikFileSystemModal
-																							serverId={server.serverId}
-																						/>
-																						<ShowDockerContainersModal
-																							serverId={server.serverId}
-																						/>
-																						{isCloud && (
-																							<ShowMonitoringModal
-																								url={`http://${server.ipAddress}:${server?.metricsConfig?.server?.port}/metrics`}
-																								token={
-																									server?.metricsConfig?.server
-																										?.token
-																								}
+																							<ShowTraefikFileSystemModal
+																								serverId={server.serverId}
 																							/>
-																						)}
+																							<ShowDockerContainersModal
+																								serverId={server.serverId}
+																							/>
+																							{isCloud && (
+																								<ShowMonitoringModal
+																									url={`http://${server.ipAddress}:${server?.metricsConfig?.server?.port}/metrics`}
+																									token={
+																										server?.metricsConfig
+																											?.server?.token
+																									}
+																								/>
+																							)}
 
-																						<ShowSwarmOverviewModal
-																							serverId={server.serverId}
-																						/>
-																						<ShowNodesModal
-																							serverId={server.serverId}
-																						/>
+																							<ShowSwarmOverviewModal
+																								serverId={server.serverId}
+																							/>
+																							<ShowNodesModal
+																								serverId={server.serverId}
+																							/>
 
-																						<ShowSchedulesModal
-																							serverId={server.serverId}
-																						/>
-																					</>
-																				)}
+																							<ShowSchedulesModal
+																								serverId={server.serverId}
+																							/>
+																						</>
+																					)}
 																			</DropdownMenuContent>
 																		</DropdownMenu>
 																	</TableCell>

apps/dokploy/components/dashboard/settings/servers/validate-server.tsx

@@ -25,6 +25,13 @@ export const ValidateServer = ({ serverId }: Props) => {
 				enabled: !!serverId,
 			},
 		);
+	const { data: server } = api.server.one.useQuery(
+		{ serverId },
+		{
+			enabled: !!serverId,
+		},
+	);
+	const isBuildServer = server?.serverType === "build";
 	const _utils = api.useUtils();
 	return (
 		<CardContent className="p-0">
@@ -73,7 +80,9 @@ export const ValidateServer = ({ serverId }: Props) => {
 								<div className="border rounded-lg p-4">
 									<h3 className="text-lg font-semibold mb-1">Status</h3>
 									<p className="text-sm text-muted-foreground mb-4">
-										Shows the server configuration status
+										{isBuildServer
+											? "Shows the build server configuration status"
+											: "Shows the server configuration status"}
 									</p>
 									<div className="grid gap-2.5">
 										<StatusRow
@@ -85,15 +94,17 @@ export const ValidateServer = ({ serverId }: Props) => {
 													: undefined
 											}
 										/>
-										<StatusRow
-											label="RClone Installed"
-											isEnabled={data?.rclone?.enabled}
-											description={
-												data?.rclone?.enabled
-													? `Installed: ${data?.rclone?.version}`
-													: undefined
-											}
-										/>
+										{!isBuildServer && (
+											<StatusRow
+												label="RClone Installed"
+												isEnabled={data?.rclone?.enabled}
+												description={
+													data?.rclone?.enabled
+														? `Installed: ${data?.rclone?.version}`
+														: undefined
+												}
+											/>
+										)}
 										<StatusRow
 											label="Nixpacks Installed"
 											isEnabled={data?.nixpacks?.enabled}
@@ -113,23 +124,36 @@ export const ValidateServer = ({ serverId }: Props) => {
 											}
 										/>
 										<StatusRow
-											label="Docker Swarm Initialized"
-											isEnabled={data?.isSwarmInstalled}
+											label="Railpack Installed"
+											isEnabled={data?.railpack?.enabled}
 											description={
-												data?.isSwarmInstalled
-													? "Initialized"
-													: "Not Initialized"
-											}
-										/>
-										<StatusRow
-											label="Dokploy Network Created"
-											isEnabled={data?.isDokployNetworkInstalled}
-											description={
-												data?.isDokployNetworkInstalled
-													? "Created"
-													: "Not Created"
+												data?.railpack?.enabled
+													? `Installed: ${data?.railpack?.version}`
+													: undefined
 											}
 										/>
+										{!isBuildServer && (
+											<>
+												<StatusRow
+													label="Docker Swarm Initialized"
+													isEnabled={data?.isSwarmInstalled}
+													description={
+														data?.isSwarmInstalled
+															? "Initialized"
+															: "Not Initialized"
+													}
+												/>
+												<StatusRow
+													label="Dokploy Network Created"
+													isEnabled={data?.isDokployNetworkInstalled}
+													description={
+														data?.isDokployNetworkInstalled
+															? "Created"
+															: "Not Created"
+													}
+												/>
+											</>
+										)}
 										<StatusRow
 											label="Main Directory Created"
 											isEnabled={data?.isMainDirectoryInstalled}
@@ -139,15 +163,6 @@ export const ValidateServer = ({ serverId }: Props) => {
 													: "Not Created"
 											}
 										/>
-										<StatusRow
-											label="Railpack Installed"
-											isEnabled={data?.railpack?.enabled}
-											description={
-												data?.railpack?.enabled
-													? `Installed: ${data?.railpack?.version}`
-													: undefined
-											}
-										/>
 									</div>
 								</div>
 							</div>

apps/dokploy/components/dashboard/settings/servers/welcome-stripe/create-server.tsx

@@ -95,6 +95,7 @@ export const CreateServer = ({ stepper }: Props) => {
 			port: data.port || 22,
 			username: data.username || "root",
 			sshKeyId: data.sshKeyId || "",
+			serverType: "deploy",
 		})
 			.then(async (_data) => {
 				toast.success("Server Created");

apps/dokploy/components/dashboard/settings/users/show-users.tsx

@@ -21,7 +21,6 @@ import {
 import {
 	Table,
 	TableBody,
-	TableCaption,
 	TableCell,
 	TableHead,
 	TableHeader,
@@ -68,7 +67,6 @@ export const ShowUsers = () => {
 								) : (
 									<div className="flex flex-col gap-4  min-h-[25vh]">
 										<Table>
-											<TableCaption>See all users</TableCaption>
 											<TableHeader>
 												<TableRow>
 													<TableHead className="w-[100px]">Email</TableHead>
@@ -111,35 +109,75 @@ export const ShowUsers = () => {
 															</TableCell>
 
 															<TableCell className="text-right flex justify-end">
-																<DropdownMenu>
-																	<DropdownMenuTrigger asChild>
-																		<Button
-																			variant="ghost"
-																			className="h-8 w-8 p-0"
-																		>
-																			<span className="sr-only">Open menu</span>
-																			<MoreHorizontal className="h-4 w-4" />
-																		</Button>
-																	</DropdownMenuTrigger>
-																	<DropdownMenuContent align="end">
-																		<DropdownMenuLabel>
-																			Actions
-																		</DropdownMenuLabel>
+																{member.role !== "owner" && (
+																	<DropdownMenu>
+																		<DropdownMenuTrigger asChild>
+																			<Button
+																				variant="ghost"
+																				className="h-8 w-8 p-0"
+																			>
+																				<span className="sr-only">
+																					Open menu
+																				</span>
+																				<MoreHorizontal className="h-4 w-4" />
+																			</Button>
+																		</DropdownMenuTrigger>
+																		<DropdownMenuContent align="end">
+																			<DropdownMenuLabel>
+																				Actions
+																			</DropdownMenuLabel>
 
-																		{member.role !== "owner" && (
 																			<AddUserPermissions
 																				userId={member.user.id}
 																			/>
-																		)}
 
-																		{member.role !== "owner" && (
-																			<>
-																				{!isCloud && (
-																					<DialogAction
-																						title="Delete User"
-																						description="Are you sure you want to delete this user?"
-																						type="destructive"
-																						onClick={async () => {
+																			{!isCloud && (
+																				<DialogAction
+																					title="Delete User"
+																					description="Are you sure you want to delete this user?"
+																					type="destructive"
+																					onClick={async () => {
+																						await mutateAsync({
+																							userId: member.user.id,
+																						})
+																							.then(() => {
+																								toast.success(
+																									"User deleted successfully",
+																								);
+																								refetch();
+																							})
+																							.catch(() => {
+																								toast.error(
+																									"Error deleting destination",
+																								);
+																							});
+																					}}
+																				>
+																					<DropdownMenuItem
+																						className="w-full cursor-pointer text-red-500 hover:!text-red-600"
+																						onSelect={(e) => e.preventDefault()}
+																					>
+																						Delete User
+																					</DropdownMenuItem>
+																				</DialogAction>
+																			)}
+
+																			<DialogAction
+																				title="Unlink User"
+																				description="Are you sure you want to unlink this user?"
+																				type="destructive"
+																				onClick={async () => {
+																					if (!isCloud) {
+																						const orgCount =
+																							await utils.user.checkUserOrganizations.fetch(
+																								{
+																									userId: member.user.id,
+																								},
+																							);
+
+																						console.log(orgCount);
+
+																						if (orgCount === 1) {
 																							await mutateAsync({
 																								userId: member.user.id,
 																							})
@@ -151,86 +189,40 @@ export const ShowUsers = () => {
 																								})
 																								.catch(() => {
 																									toast.error(
-																										"Error deleting destination",
+																										"Error deleting user",
 																									);
 																								});
-																						}}
-																					>
-																						<DropdownMenuItem
-																							className="w-full cursor-pointer text-red-500 hover:!text-red-600"
-																							onSelect={(e) =>
-																								e.preventDefault()
-																							}
-																						>
-																							Delete User
-																						</DropdownMenuItem>
-																					</DialogAction>
-																				)}
-
-																				<DialogAction
-																					title="Unlink User"
-																					description="Are you sure you want to unlink this user?"
-																					type="destructive"
-																					onClick={async () => {
-																						if (!isCloud) {
-																							const orgCount =
-																								await utils.user.checkUserOrganizations.fetch(
-																									{
-																										userId: member.user.id,
-																									},
-																								);
-
-																							console.log(orgCount);
-
-																							if (orgCount === 1) {
-																								await mutateAsync({
-																									userId: member.user.id,
-																								})
-																									.then(() => {
-																										toast.success(
-																											"User deleted successfully",
-																										);
-																										refetch();
-																									})
-																									.catch(() => {
-																										toast.error(
-																											"Error deleting user",
-																										);
-																									});
-																								return;
-																							}
+																							return;
 																						}
+																					}
 
-																						const { error } =
-																							await authClient.organization.removeMember(
-																								{
-																									memberIdOrEmail: member.id,
-																								},
-																							);
+																					const { error } =
+																						await authClient.organization.removeMember(
+																							{
+																								memberIdOrEmail: member.id,
+																							},
+																						);
 
-																						if (!error) {
-																							toast.success(
-																								"User unlinked successfully",
-																							);
-																							refetch();
-																						} else {
-																							toast.error(
-																								"Error unlinking user",
-																							);
-																						}
-																					}}
+																					if (!error) {
+																						toast.success(
+																							"User unlinked successfully",
+																						);
+																						refetch();
+																					} else {
+																						toast.error("Error unlinking user");
+																					}
+																				}}
+																			>
+																				<DropdownMenuItem
+																					className="w-full cursor-pointer text-red-500 hover:!text-red-600"
+																					onSelect={(e) => e.preventDefault()}
 																				>
-																					<DropdownMenuItem
-																						className="w-full cursor-pointer text-red-500 hover:!text-red-600"
-																						onSelect={(e) => e.preventDefault()}
-																					>
-																						Unlink User
-																					</DropdownMenuItem>
-																				</DialogAction>
-																			</>
-																		)}
-																	</DropdownMenuContent>
-																</DropdownMenu>
+																					Unlink User
+																				</DropdownMenuItem>
+																			</DialogAction>
+																		</DropdownMenuContent>
+																	</DropdownMenu>
+																)}
 															</TableCell>
 														</TableRow>
 													);

apps/dokploy/components/ui/time-badge.tsx

@@ -44,14 +44,20 @@ export function TimeBadge() {
 			.padStart(2, "0")}`;
 	};
 
+	const formattedTime = new Intl.DateTimeFormat("en-US", {
+		timeZone: serverTime.timezone,
+		timeStyle: "medium",
+		hour12: false,
+	}).format(time);
+
 	return (
-		<div className="inline-flex items-center gap-2 rounded-md border px-2 py-1 text-xs sm:text-sm whitespace-nowrap max-w-full overflow-hidden">
-			<span className="hidden sm:inline">Server Time:</span>
-			<span className="font-medium tabular-nums">
-				{time.toLocaleTimeString()}
-			</span>
-			<span className="hidden sm:inline text-muted-foreground">
-				({serverTime.timezone} | {getUtcOffset(serverTime.timezone)})
+		<div className="inline-flex items-center rounded-full border p-1 text-xs whitespace-nowrap max-w-full overflow-hidden gap-1">
+			<div className="inline-flex items-center px-1 gap-1">
+				<span className="hidden sm:inline">Server Time:</span>
+				<span className="font-medium tabular-nums">{formattedTime}</span>
+			</div>
+			<span className="hidden sm:inline text-primary/70 border rounded-full bg-foreground/5 px-1.5 py-0.5">
+				{serverTime.timezone} | {getUtcOffset(serverTime.timezone)}
 			</span>
 		</div>
 	);

apps/dokploy/drizzle/0121_rainy_cargill.sql

@@ -0,0 +1,9 @@
+-- Fix inconsistent date formats in environment.createdAt field
+-- Convert PostgreSQL timestamp format to ISO 8601 format
+-- This addresses issue #2992 where old environments have PostgreSQL timestamp format
+-- while new ones have ISO 8601 format
+
+UPDATE "environment"
+SET "createdAt" = to_char("createdAt"::timestamptz, 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"')
+WHERE "createdAt" NOT LIKE '%T%';
+

apps/dokploy/drizzle/0122_absent_frightful_four.sql

@@ -0,0 +1,8 @@
+CREATE TYPE "public"."serverType" AS ENUM('deploy', 'build');--> statement-breakpoint
+ALTER TABLE "application" ADD COLUMN "buildServerId" text;--> statement-breakpoint
+ALTER TABLE "application" ADD COLUMN "buildRegistryId" text;--> statement-breakpoint
+ALTER TABLE "deployment" ADD COLUMN "buildServerId" text;--> statement-breakpoint
+ALTER TABLE "server" ADD COLUMN "serverType" "serverType" DEFAULT 'deploy' NOT NULL;--> statement-breakpoint
+ALTER TABLE "application" ADD CONSTRAINT "application_buildServerId_server_serverId_fk" FOREIGN KEY ("buildServerId") REFERENCES "public"."server"("serverId") ON DELETE set null ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "application" ADD CONSTRAINT "application_buildRegistryId_registry_registryId_fk" FOREIGN KEY ("buildRegistryId") REFERENCES "public"."registry"("registryId") ON DELETE set null ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "deployment" ADD CONSTRAINT "deployment_buildServerId_server_serverId_fk" FOREIGN KEY ("buildServerId") REFERENCES "public"."server"("serverId") ON DELETE cascade ON UPDATE no action;

apps/dokploy/drizzle/0123_cloudy_piledriver.sql

@@ -0,0 +1,6 @@
+ALTER TABLE "application" ADD COLUMN "args" text[];--> statement-breakpoint
+ALTER TABLE "mariadb" ADD COLUMN "args" text[];--> statement-breakpoint
+ALTER TABLE "mongo" ADD COLUMN "args" text[];--> statement-breakpoint
+ALTER TABLE "mysql" ADD COLUMN "args" text[];--> statement-breakpoint
+ALTER TABLE "postgres" ADD COLUMN "args" text[];--> statement-breakpoint
+ALTER TABLE "redis" ADD COLUMN "args" text[];

apps/dokploy/drizzle/0124_certain_cloak.sql

@@ -0,0 +1 @@
+ALTER TABLE "ntfy" ALTER COLUMN "accessToken" DROP NOT NULL;

apps/dokploy/drizzle/meta/_journal.json

@@ -848,6 +848,34 @@
       "when": 1762632540024,
       "tag": "0120_lame_captain_midlands",
       "breakpoints": true
+    },
+    {
+      "idx": 121,
+      "version": "7",
+      "when": 1763755037033,
+      "tag": "0121_rainy_cargill",
+      "breakpoints": true
+    },
+    {
+      "idx": 122,
+      "version": "7",
+      "when": 1764479387555,
+      "tag": "0122_absent_frightful_four",
+      "breakpoints": true
+    },
+    {
+      "idx": 123,
+      "version": "7",
+      "when": 1764525308939,
+      "tag": "0123_cloudy_piledriver",
+      "breakpoints": true
+    },
+    {
+      "idx": 124,
+      "version": "7",
+      "when": 1764571454170,
+      "tag": "0124_certain_cloak",
+      "breakpoints": true
     }
   ]
 }

apps/dokploy/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dokploy",
-	"version": "v0.25.6",
+	"version": "v0.25.11",
 	"private": true,
 	"license": "Apache-2.0",
 	"type": "module",
@@ -34,7 +34,8 @@
 		"docker:build:canary": "./docker/build.sh canary",
 		"docker:push:canary": "./docker/push.sh canary",
 		"version": "echo $(node -p \"require('./package.json').version\")",
-		"test": "vitest --config __test__/vitest.config.ts"
+		"test": "vitest --config __test__/vitest.config.ts",
+		"generate:openapi": "tsx -r dotenv/config scripts/generate-openapi.ts"
 	},
 	"dependencies": {
 		"@ai-sdk/anthropic": "^2.0.5",
@@ -98,6 +99,7 @@
 		"bl": "6.0.11",
 		"boxen": "^7.1.1",
 		"bullmq": "5.4.2",
+		"shell-quote": "^1.8.1",
 		"class-variance-authority": "^0.7.1",
 		"clsx": "^2.1.1",
 		"cmdk": "^0.2.1",
@@ -112,7 +114,6 @@
 		"i18next": "^23.16.8",
 		"input-otp": "^1.4.2",
 		"js-cookie": "^3.0.5",
-		"yaml": "2.8.1",
 		"lodash": "4.17.21",
 		"lucide-react": "^0.469.0",
 		"micromatch": "4.0.8",
@@ -120,6 +121,7 @@
 		"next": "^15.3.2",
 		"next-i18next": "^15.4.2",
 		"next-themes": "^0.2.1",
+		"nextjs-toploader": "^3.9.17",
 		"node-os-utils": "2.0.1",
 		"node-pty": "1.0.0",
 		"node-schedule": "2.1.1",
@@ -153,10 +155,12 @@
 		"use-resize-observer": "9.1.0",
 		"ws": "8.16.0",
 		"xterm-addon-fit": "^0.8.0",
+		"yaml": "2.8.1",
 		"zod": "^3.25.32",
 		"zod-form-data": "^2.0.7"
 	},
 	"devDependencies": {
+		"@types/shell-quote": "^1.7.5",
 		"@types/adm-zip": "^0.5.7",
 		"@types/bcrypt": "5.0.2",
 		"@types/js-cookie": "^3.0.6",

apps/dokploy/pages/_app.tsx

@@ -7,6 +7,7 @@ import Head from "next/head";
 import Script from "next/script";
 import { appWithTranslation } from "next-i18next";
 import { ThemeProvider } from "next-themes";
+import NextTopLoader from "nextjs-toploader";
 import type { ReactElement, ReactNode } from "react";
 import { SearchCommand } from "@/components/dashboard/search-command";
 import { Toaster } from "@/components/ui/sonner";
@@ -57,6 +58,7 @@ const MyApp = ({
 				disableTransitionOnChange
 				forcedTheme={Component.theme}
 			>
+				<NextTopLoader color="hsl(var(--sidebar-ring))" />
 				<Toaster richColors />
 				<SearchCommand />
 				{getLayout(<Component {...pageProps} />)}

apps/dokploy/pages/api/deploy/[refreshToken].ts

@@ -253,8 +253,12 @@ export default async function handler(
 				return true;
 			}
 			await myQueue.add(
-				`application:${jobData.applicationId}`,
-				jobData,
+				"deployments",
+				{ ...jobData },
+				{
+					removeOnComplete: true,
+					removeOnFail: true,
+				},
 			);
 		} catch (error) {
 			res.status(400).json({ message: "Error deploying Application", error });

apps/dokploy/pages/api/deploy/compose/[refreshToken].ts

@@ -183,8 +183,12 @@ export default async function handler(
 				return true;
 			}
 			await myQueue.add(
-				`compose:${jobData.composeId}`,
-				jobData,
+				"deployments",
+				{ ...jobData },
+				{
+					removeOnComplete: true,
+					removeOnFail: true,
+				},
 			);
 		} catch (error) {
 			res.status(400).json({ message: "Error deploying Compose", error });

apps/dokploy/pages/api/deploy/github.ts

@@ -132,8 +132,12 @@ export default async function handler(
 					continue;
 				}
 				await myQueue.add(
-					`application:${jobData.applicationId}`,
-					jobData,
+					"deployments",
+					{ ...jobData },
+					{
+						removeOnComplete: true,
+						removeOnFail: true,
+					},
 				);
 			}
 
@@ -166,8 +170,12 @@ export default async function handler(
 				}
 
 				await myQueue.add(
-					`compose:${jobData.composeId}`,
-					jobData,
+					"deployments",
+					{ ...jobData },
+					{
+						removeOnComplete: true,
+						removeOnFail: true,
+					},
 				);
 			}
 
@@ -242,8 +250,12 @@ export default async function handler(
 					continue;
 				}
 				await myQueue.add(
-					`application:${jobData.applicationId}`,
-					jobData,
+					"deployments",
+					{ ...jobData },
+					{
+						removeOnComplete: true,
+						removeOnFail: true,
+					},
 				);
 			}
 
@@ -284,8 +296,12 @@ export default async function handler(
 				}
 
 				await myQueue.add(
-					`compose:${jobData.composeId}`,
-					jobData,
+					"deployments",
+					{ ...jobData },
+					{
+						removeOnComplete: true,
+						removeOnFail: true,
+					},
 				);
 			}
 
@@ -479,8 +495,12 @@ export default async function handler(
 					continue;
 				}
 				await myQueue.add(
-					`preview:${jobData.previewDeploymentId}`,
-					jobData,
+					"deployments",
+					{ ...jobData },
+					{
+						removeOnComplete: true,
+						removeOnFail: true,
+					},
 				);
 			}
 			return res.status(200).json({ message: "Apps Deployed" });

apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/application/[applicationId].tsx

@@ -17,6 +17,7 @@ import { AddCommand } from "@/components/dashboard/application/advanced/general/
 import { ShowPorts } from "@/components/dashboard/application/advanced/ports/show-port";
 import { ShowRedirects } from "@/components/dashboard/application/advanced/redirects/show-redirects";
 import { ShowSecurity } from "@/components/dashboard/application/advanced/security/show-security";
+import { ShowBuildServer } from "@/components/dashboard/application/advanced/show-build-server";
 import { ShowResources } from "@/components/dashboard/application/advanced/show-resources";
 import { ShowTraefikConfig } from "@/components/dashboard/application/advanced/traefik/show-traefik-config";
 import { ShowVolumes } from "@/components/dashboard/application/advanced/volumes/show-volumes";
@@ -353,7 +354,7 @@ const Service = (
 												id={applicationId}
 												type="application"
 											/>
-
+											<ShowBuildServer applicationId={applicationId} />
 											<ShowResources id={applicationId} type="application" />
 											<ShowVolumes id={applicationId} type="application" />
 											<ShowRedirects applicationId={applicationId} />

apps/dokploy/scripts/generate-openapi.ts

@@ -0,0 +1,132 @@
+#!/usr/bin/env tsx
+
+/**
+ * Script to generate OpenAPI specification locally
+ * This runs in CI/CD to generate the openapi.json file
+ * which can then be consumed by the documentation website
+ */
+
+import { writeFileSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { generateOpenApiDocument } from "@dokploy/trpc-openapi";
+import { appRouter } from "../server/api/root";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+async function generateOpenAPI() {
+	try {
+		console.log("🔄 Generating OpenAPI specification...");
+
+		const openApiDocument = generateOpenApiDocument(appRouter, {
+			title: "Dokploy API",
+			version: "1.0.0",
+			baseUrl: "https://your-dokploy-instance.com/api",
+			docsUrl: "https://docs.dokploy.com/api",
+			tags: [
+				"admin",
+				"docker",
+				"compose",
+				"registry",
+				"cluster",
+				"user",
+				"domain",
+				"destination",
+				"backup",
+				"deployment",
+				"mounts",
+				"certificates",
+				"settings",
+				"security",
+				"redirects",
+				"port",
+				"project",
+				"application",
+				"mysql",
+				"postgres",
+				"redis",
+				"mongo",
+				"mariadb",
+				"sshRouter",
+				"gitProvider",
+				"bitbucket",
+				"github",
+				"gitlab",
+				"gitea",
+				"server",
+				"swarm",
+				"ai",
+				"organization",
+				"schedule",
+				"rollback",
+				"volumeBackups",
+				"environment",
+			],
+		});
+
+		// Enhance metadata
+		openApiDocument.info = {
+			title: "Dokploy API",
+			description:
+				"Complete API documentation for Dokploy - Deploy applications, manage databases, and orchestrate your infrastructure. This API allows you to programmatically manage all aspects of your Dokploy instance.",
+			version: "1.0.0",
+			contact: {
+				name: "Dokploy Team",
+				url: "https://dokploy.com",
+			},
+			license: {
+				name: "Apache 2.0",
+				url: "https://github.com/dokploy/dokploy/blob/canary/LICENSE",
+			},
+		};
+
+		// Add security schemes
+		openApiDocument.components = {
+			...openApiDocument.components,
+			securitySchemes: {
+				apiKey: {
+					type: "apiKey",
+					in: "header",
+					name: "x-api-key",
+					description:
+						"API key authentication. Generate an API key from your Dokploy dashboard under Settings > API Keys.",
+				},
+			},
+		};
+
+		// Apply global security
+		openApiDocument.security = [
+			{
+				apiKey: [],
+			},
+		];
+
+		// Add external docs
+		openApiDocument.externalDocs = {
+			description: "Full documentation",
+			url: "https://docs.dokploy.com",
+		};
+
+		// Write to root of repo
+		const outputPath = resolve(__dirname, "../../../openapi.json");
+		writeFileSync(
+			outputPath,
+			JSON.stringify(openApiDocument, null, 2),
+			"utf-8",
+		);
+
+		console.log("✅ OpenAPI specification generated successfully!");
+		console.log(`📄 Output: ${outputPath}`);
+		console.log(
+			`📊 Endpoints: ${Object.keys(openApiDocument.paths || {}).length}`,
+		);
+	} catch (error) {
+		console.error("❌ Error generating OpenAPI specification:", error);
+		process.exit(1);
+	} finally {
+		process.exit(0);
+	}
+}
+
+generateOpenAPI();

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

@@ -59,8 +59,9 @@ import {
 } from "@/server/db/schema";
 import type { DeploymentJob } from "@/server/queues/queue-types";
 import {
-	addJobAsync,
 	cleanQueuesByApplication,
+	killDockerBuild,
+	myQueue,
 } from "@/server/queues/queueSetup";
 import { cancelDeployment, deploy } from "@/server/utils/deploy";
 import { uploadFileSchema } from "@/utils/schema";
@@ -338,9 +339,14 @@ export const applicationRouter = createTRPCRouter({
 				await deploy(jobData);
 				return true;
 			}
-			// Fire and forget - UI doesn't wait for deployment to complete
-			addJobAsync(`application:${jobData.applicationId}`, jobData);
-			return { success: true, message: "Deployment queued" };
+			await myQueue.add(
+				"deployments",
+				{ ...jobData },
+				{
+					removeOnComplete: true,
+					removeOnFail: true,
+				},
+			);
 		}),
 	saveEnvironment: protectedProcedure
 		.input(apiSaveEnvironmentVariables)
@@ -698,8 +704,14 @@ export const applicationRouter = createTRPCRouter({
 
 				return true;
 			}
-			addJobAsync(`application:${jobData.applicationId}`, jobData);
-			return { success: true, message: "Deployment queued" };
+			await myQueue.add(
+				"deployments",
+				{ ...jobData },
+				{
+					removeOnComplete: true,
+					removeOnFail: true,
+				},
+			);
 		}),
 
 	cleanQueues: protectedProcedure
@@ -717,7 +729,21 @@ export const applicationRouter = createTRPCRouter({
 			}
 			await cleanQueuesByApplication(input.applicationId);
 		}),
-
+	killBuild: protectedProcedure
+		.input(apiFindOneApplication)
+		.mutation(async ({ input, ctx }) => {
+			const application = await findApplicationById(input.applicationId);
+			if (
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
+				throw new TRPCError({
+					code: "UNAUTHORIZED",
+					message: "You are not authorized to kill this build",
+				});
+			}
+			await killDockerBuild("application", application.serverId);
+		}),
 	readTraefikConfig: protectedProcedure
 		.input(apiFindOneApplication)
 		.query(async ({ input, ctx }) => {
@@ -790,8 +816,14 @@ export const applicationRouter = createTRPCRouter({
 				return true;
 			}
 
-			// Fire and forget - UI doesn't wait for deployment to complete
-			addJobAsync(`application:${jobData.applicationId}`, jobData);
+			await myQueue.add(
+				"deployments",
+				{ ...jobData },
+				{
+					removeOnComplete: true,
+					removeOnFail: true,
+				},
+			);
 			return true;
 		}),
 	updateTraefikConfig: protectedProcedure

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

@@ -59,7 +59,11 @@ import {
 	compose as composeTable,
 } from "@/server/db/schema";
 import type { DeploymentJob } from "@/server/queues/queue-types";
-import { addJobAsync, cleanQueuesByCompose } from "@/server/queues/queueSetup";
+import {
+	cleanQueuesByCompose,
+	killDockerBuild,
+	myQueue,
+} from "@/server/queues/queueSetup";
 import { cancelDeployment, deploy } from "@/server/utils/deploy";
 import { generatePassword } from "@/templates/utils";
 import { createTRPCRouter, protectedProcedure, publicProcedure } from "../trpc";
@@ -248,6 +252,21 @@ export const composeRouter = createTRPCRouter({
 			await cleanQueuesByCompose(input.composeId);
 			return { success: true, message: "Queues cleaned successfully" };
 		}),
+	killBuild: protectedProcedure
+		.input(apiFindCompose)
+		.mutation(async ({ input, ctx }) => {
+			const compose = await findComposeById(input.composeId);
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
+				throw new TRPCError({
+					code: "UNAUTHORIZED",
+					message: "You are not authorized to kill this build",
+				});
+			}
+			await killDockerBuild("compose", compose.serverId);
+		}),
 
 	loadServices: protectedProcedure
 		.input(apiFetchServices)
@@ -401,7 +420,14 @@ export const composeRouter = createTRPCRouter({
 				await deploy(jobData);
 				return true;
 			}
-			addJobAsync(`compose:${jobData.composeId}`, jobData);
+			await myQueue.add(
+				"deployments",
+				{ ...jobData },
+				{
+					removeOnComplete: true,
+					removeOnFail: true,
+				},
+			);
 			return { success: true, message: "Deployment queued" };
 		}),
 	redeploy: protectedProcedure
@@ -430,7 +456,14 @@ export const composeRouter = createTRPCRouter({
 				await deploy(jobData);
 				return true;
 			}
-			addJobAsync(`compose:${jobData.composeId}`, jobData);
+			await myQueue.add(
+				"deployments",
+				{ ...jobData },
+				{
+					removeOnComplete: true,
+					removeOnFail: true,
+				},
+			);
 			return { success: true, message: "Redeployment queued" };
 		}),
 	stop: protectedProcedure

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

@@ -47,15 +47,19 @@ export const destinationRouter = createTRPCRouter({
 				input;
 			try {
 				const rcloneFlags = [
-					`--s3-access-key-id=${accessKey}`,
-					`--s3-secret-access-key=${secretAccessKey}`,
-					`--s3-region=${region}`,
-					`--s3-endpoint=${endpoint}`,
+					`--s3-access-key-id="${accessKey}"`,
+					`--s3-secret-access-key="${secretAccessKey}"`,
+					`--s3-region="${region}"`,
+					`--s3-endpoint="${endpoint}"`,
 					"--s3-no-check-bucket",
 					"--s3-force-path-style",
+					"--retries 1",
+					"--low-level-retries 1",
+					"--timeout 10s",
+					"--contimeout 5s",
 				];
 				if (provider) {
-					rcloneFlags.unshift(`--s3-provider=${provider}`);
+					rcloneFlags.unshift(`--s3-provider="${provider}"`);
 				}
 				const rcloneDestination = `:s3:${bucket}`;
 				const rcloneCommand = `rclone ls ${rcloneFlags.join(" ")} "${rcloneDestination}"`;

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

@@ -111,7 +111,7 @@ export const notificationRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error testing the notification",
+					message: `${error instanceof Error ? error.message : "Unknown error"}`,
 					cause: error,
 				});
 			}
@@ -228,7 +228,7 @@ export const notificationRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error testing the notification",
+					message: `${error instanceof Error ? error.message : "Unknown error"}`,
 					cause: error,
 				});
 			}
@@ -285,7 +285,7 @@ export const notificationRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error testing the notification",
+					message: `${error instanceof Error ? error.message : "Unknown error"}`,
 					cause: error,
 				});
 			}

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

@@ -8,6 +8,7 @@ import {
 	findEnvironmentById,
 	findPostgresById,
 	findProjectById,
+	getMountPath,
 	IS_CLOUD,
 	rebuildDatabase,
 	removePostgresById,
@@ -37,6 +38,7 @@ import {
 	postgres as postgresTable,
 } from "@/server/db/schema";
 import { cancelJobs } from "@/server/utils/backup";
+
 export const postgresRouter = createTRPCRouter({
 	create: protectedProcedure
 		.input(apiCreatePostgres)
@@ -79,11 +81,13 @@ export const postgresRouter = createTRPCRouter({
 					);
 				}
 
+				const mountPath = getMountPath(input.dockerImage);
+
 				await createMount({
 					serviceId: newPostgres.postgresId,
 					serviceType: "postgres",
 					volumeName: `${newPostgres.appName}-data`,
-					mountPath: "/var/lib/postgresql/data",
+					mountPath: mountPath,
 					type: "volume",
 				});
 
@@ -282,12 +286,16 @@ export const postgresRouter = createTRPCRouter({
 			const backups = await findBackupsByDbId(input.postgresId, "postgres");
 
 			const cleanupOperations = [
-				removeService(postgres.appName, postgres.serverId),
-				cancelJobs(backups),
-				removePostgresById(input.postgresId),
+				async () => await removeService(postgres?.appName, postgres.serverId),
+				async () => await cancelJobs(backups),
+				async () => await removePostgresById(input.postgresId),
 			];
 
-			await Promise.allSettled(cleanupOperations);
+			for (const operation of cleanupOperations) {
+				try {
+					await operation();
+				} catch (_) {}
+			}
 
 			return postgres;
 		}),
@@ -363,6 +371,7 @@ export const postgresRouter = createTRPCRouter({
 					message: "You are not authorized to update this Postgres",
 				});
 			}
+
 			const service = await updatePostgresById(postgresId, {
 				...rest,
 			});

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

@@ -81,8 +81,10 @@ export const serverRouter = createTRPCRouter({
 		}),
 	getDefaultCommand: protectedProcedure
 		.input(apiFindOneServer)
-		.query(async () => {
-			return defaultCommand();
+		.query(async ({ input }) => {
+			const server = await findServerById(input.serverId);
+			const isBuildServer = server.serverType === "build";
+			return defaultCommand(isBuildServer);
 		}),
 	all: protectedProcedure.query(async ({ ctx }) => {
 		const result = await db
@@ -124,10 +126,30 @@ export const serverRouter = createTRPCRouter({
 						isNotNull(server.sshKeyId),
 						eq(server.organizationId, ctx.session.activeOrganizationId),
 						eq(server.serverStatus, "active"),
+						eq(server.serverType, "deploy"),
 					)
 				: and(
 						isNotNull(server.sshKeyId),
 						eq(server.organizationId, ctx.session.activeOrganizationId),
+						eq(server.serverType, "deploy"),
+					),
+		});
+		return result;
+	}),
+	buildServers: protectedProcedure.query(async ({ ctx }) => {
+		const result = await db.query.server.findMany({
+			orderBy: desc(server.createdAt),
+			where: IS_CLOUD
+				? and(
+						isNotNull(server.sshKeyId),
+						eq(server.organizationId, ctx.session.activeOrganizationId),
+						eq(server.serverStatus, "active"),
+						eq(server.serverType, "build"),
+					)
+				: and(
+						isNotNull(server.sshKeyId),
+						eq(server.organizationId, ctx.session.activeOrganizationId),
+						eq(server.serverType, "build"),
 					),
 		});
 		return result;

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

@@ -587,7 +587,7 @@ export const settingsRouter = createTRPCRouter({
 			return ports.some((port) => port.targetPort === 8080);
 		}),
 
-	readStatsLogs: adminProcedure
+	readStatsLogs: protectedProcedure
 		.meta({
 			openapi: {
 				path: "/read-stats-logs",
@@ -650,7 +650,7 @@ export const settingsRouter = createTRPCRouter({
 			const processedLogs = processLogs(rawConfig as string, input?.dateRange);
 			return processedLogs || [];
 		}),
-	haveActivateRequests: adminProcedure.query(async () => {
+	haveActivateRequests: protectedProcedure.query(async () => {
 		if (IS_CLOUD) {
 			return true;
 		}
@@ -665,7 +665,7 @@ export const settingsRouter = createTRPCRouter({
 
 		return !!parsedConfig?.accessLog?.filePath;
 	}),
-	toggleRequests: adminProcedure
+	toggleRequests: protectedProcedure
 		.input(
 			z.object({
 				enable: z.boolean(),
@@ -835,7 +835,7 @@ export const settingsRouter = createTRPCRouter({
 			const ports = await readPorts("dokploy-traefik", input?.serverId);
 			return ports;
 		}),
-	updateLogCleanup: adminProcedure
+	updateLogCleanup: protectedProcedure
 		.input(
 			z.object({
 				cronExpression: z.string().nullable(),
@@ -851,7 +851,7 @@ export const settingsRouter = createTRPCRouter({
 			return stopLogCleanup();
 		}),
 
-	getLogCleanupStatus: adminProcedure.query(async () => {
+	getLogCleanupStatus: protectedProcedure.query(async () => {
 		return getLogCleanupStatus();
 	}),
 
@@ -862,49 +862,4 @@ export const settingsRouter = createTRPCRouter({
 		const ips = process.env.DOKPLOY_CLOUD_IPS?.split(",");
 		return ips;
 	}),
-	getDeploymentConcurrency: adminProcedure
-		.input(
-			z.object({
-				serverId: z.string().optional(),
-			}),
-		)
-		.query(async ({ input }) => {
-			// For now, remote servers use the same queue as dokploy server
-			// In the future, we could implement per-server queues
-			const { getConcurrency } = await import("@/server/queues/queueSetup");
-			return {
-				concurrency: getConcurrency(),
-				serverId: input.serverId,
-			};
-		}),
-	setDeploymentConcurrency: adminProcedure
-		.input(
-			z.object({
-				concurrency: z.number().int().min(1).max(20),
-				serverId: z.string().optional(),
-			}),
-		)
-		.mutation(async ({ input }) => {
-			// For now, remote servers use the same queue as dokploy server
-			// In the future, we could implement per-server queues
-			const { setConcurrency, getConcurrency } = await import(
-				"@/server/queues/queueSetup"
-			);
-			const currentConcurrency = getConcurrency();
-			const clearedCount = setConcurrency(input.concurrency);
-			const serverType = input.serverId ? "remote server" : "Dokploy server";
-
-			let message = `${serverType} deployment concurrency updated from ${currentConcurrency} to ${input.concurrency}. Changes take effect immediately.`;
-			if (clearedCount > 0) {
-				message += ` ${clearedCount} pending build${clearedCount > 1 ? "s were" : " was"} cancelled due to concurrency change.`;
-			}
-
-			return {
-				success: true,
-				message,
-				concurrency: input.concurrency,
-				serverId: input.serverId,
-				clearedBuilds: clearedCount,
-			};
-		}),
 });

apps/dokploy/server/db/validations/domain.ts

@@ -2,7 +2,13 @@ import { z } from "zod";
 
 export const domain = z
 	.object({
-		host: z.string().min(1, { message: "Add a hostname" }),
+		host: z
+			.string()
+			.min(1, { message: "Add a hostname" })
+			.refine((val) => val === val.trim(), {
+				message: "Domain name cannot have leading or trailing spaces",
+			})
+			.transform((val) => val.trim()),
 		path: z.string().min(1).optional(),
 		port: z
 			.number()
@@ -33,7 +39,13 @@ export const domain = z
 
 export const domainCompose = z
 	.object({
-		host: z.string().min(1, { message: "Host is required" }),
+		host: z
+			.string()
+			.min(1, { message: "Add a hostname" })
+			.refine((val) => val === val.trim(), {
+				message: "Domain name cannot have leading or trailing spaces",
+			})
+			.transform((val) => val.trim()),
 		path: z.string().min(1).optional(),
 		port: z
 			.number()

apps/dokploy/server/queues/deployments-queue.ts

@@ -8,77 +8,67 @@ import {
 	updateCompose,
 	updatePreviewDeployment,
 } from "@dokploy/server";
+import { type Job, Worker } from "bullmq";
 import type { DeploymentJob } from "./queue-types";
-import { myQueue } from "./queueSetup";
+import { redisConfig } from "./redis-connection";
 
-// Set the handler for processing deployment jobs
-console.log("Setting deployment queue handler");
-myQueue.setHandler(async (job: DeploymentJob) => {
-	const jobId =
-		job.applicationType === "application"
-			? job.applicationId
-			: job.applicationType === "compose"
-				? job.composeId
-				: job.previewDeploymentId;
-	console.log("Handler called with job:", job.applicationType, jobId);
-	try {
-		if (job.applicationType === "application") {
-			await updateApplicationStatus(job.applicationId, "running");
+export const deploymentWorker = new Worker(
+	"deployments",
+	async (job: Job<DeploymentJob>) => {
+		try {
+			if (job.data.applicationType === "application") {
+				await updateApplicationStatus(job.data.applicationId, "running");
 
-			if (job.type === "redeploy") {
-				await rebuildApplication({
-					applicationId: job.applicationId,
-					titleLog: job.titleLog,
-					descriptionLog: job.descriptionLog,
+				if (job.data.type === "redeploy") {
+					await rebuildApplication({
+						applicationId: job.data.applicationId,
+						titleLog: job.data.titleLog,
+						descriptionLog: job.data.descriptionLog,
+					});
+				} else if (job.data.type === "deploy") {
+					await deployApplication({
+						applicationId: job.data.applicationId,
+						titleLog: job.data.titleLog,
+						descriptionLog: job.data.descriptionLog,
+					});
+				}
+			} else if (job.data.applicationType === "compose") {
+				await updateCompose(job.data.composeId, {
+					composeStatus: "running",
 				});
-			} else if (job.type === "deploy") {
-				await deployApplication({
-					applicationId: job.applicationId,
-					titleLog: job.titleLog,
-					descriptionLog: job.descriptionLog,
+				if (job.data.type === "deploy") {
+					await deployCompose({
+						composeId: job.data.composeId,
+						titleLog: job.data.titleLog,
+						descriptionLog: job.data.descriptionLog,
+					});
+				} else if (job.data.type === "redeploy") {
+					await rebuildCompose({
+						composeId: job.data.composeId,
+						titleLog: job.data.titleLog,
+						descriptionLog: job.data.descriptionLog,
+					});
+				}
+			} else if (job.data.applicationType === "application-preview") {
+				await updatePreviewDeployment(job.data.previewDeploymentId, {
+					previewStatus: "running",
 				});
-			}
-		} else if (job.applicationType === "compose") {
-			await updateCompose(job.composeId, {
-				composeStatus: "running",
-			});
-			if (job.type === "deploy") {
-				await deployCompose({
-					composeId: job.composeId,
-					titleLog: job.titleLog,
-					descriptionLog: job.descriptionLog,
-				});
-			} else if (job.type === "redeploy") {
-				await rebuildCompose({
-					composeId: job.composeId,
-					titleLog: job.titleLog,
-					descriptionLog: job.descriptionLog,
-				});
-			}
-		} else if (job.applicationType === "application-preview") {
-			await updatePreviewDeployment(job.previewDeploymentId, {
-				previewStatus: "running",
-			});
 
-			if (job.type === "deploy") {
-				await deployPreviewApplication({
-					applicationId: job.applicationId,
-					titleLog: job.titleLog,
-					descriptionLog: job.descriptionLog,
-					previewDeploymentId: job.previewDeploymentId,
-				});
+				if (job.data.type === "deploy") {
+					await deployPreviewApplication({
+						applicationId: job.data.applicationId,
+						titleLog: job.data.titleLog,
+						descriptionLog: job.data.descriptionLog,
+						previewDeploymentId: job.data.previewDeploymentId,
+					});
+				}
 			}
+		} catch (error) {
+			console.log("Error", error);
 		}
-	} catch (error) {
-		console.log("Error processing deployment job", error);
-		throw error; // Re-throw to let the queue handle retries if needed
-	}
-});
-
-// Export for compatibility (no longer needed but kept for imports)
-export const deploymentWorker = {
-	run: () => {
-		// Queue starts processing automatically when jobs are added
-		console.log("Deployment queue handler initialized");
 	},
-};
+	{
+		autorun: false,
+		connection: redisConfig,
+	},
+);

apps/dokploy/server/queues/grouped-queue-wrapper.ts

@@ -1,256 +0,0 @@
-/**
- * In-memory grouped queue implementation
- * Each group processes one job at a time (FIFO per group)
- * Multiple groups can process in parallel
- */
-
-type Task<T> = {
-	data: T;
-	resolve: () => void;
-	reject: (error: Error) => void;
-};
-
-type GroupQueue<T> = {
-	tasks: Task<T>[];
-	processing: boolean;
-};
-
-export class GroupedQueue<T> {
-	private groups: Map<string, GroupQueue<T>> = new Map();
-	private handler?: (data: T) => Promise<void>;
-	private concurrency: number;
-	private activeGroups: Set<string> = new Set();
-
-	constructor(concurrency = 4) {
-		this.concurrency = concurrency;
-	}
-
-	/**
-	 * Set the handler function that processes each job
-	 */
-	setHandler(handler: (data: T) => Promise<void>) {
-		this.handler = handler;
-	}
-
-	/**
-	 * Add a job to a group queue
-	 */
-	async add(groupId: string, data: T): Promise<void> {
-		if (process.env.NODE_ENV !== "test") {
-			console.log(
-				`Adding job to group ${groupId}, handler set: ${!!this.handler}`,
-			);
-		}
-		return new Promise((resolve, reject) => {
-			if (!this.groups.has(groupId)) {
-				this.groups.set(groupId, {
-					tasks: [],
-					processing: false,
-				});
-			}
-
-			const group = this.groups.get(groupId)!;
-			group.tasks.push({
-				data,
-				resolve,
-				reject,
-			});
-
-			// Start processing if not already processing and under concurrency limit
-			if (!group.processing && this.activeGroups.size < this.concurrency) {
-				this.processGroup(groupId);
-			}
-		});
-	}
-
-	/**
-	 * Process jobs in a group queue
-	 */
-	private async processGroup(groupId: string): Promise<void> {
-		const group = this.groups.get(groupId);
-		if (!group || group.processing) {
-			return;
-		}
-
-		// Wait for handler to be set if not available
-		if (!this.handler) {
-			if (process.env.NODE_ENV !== "test") {
-				console.log(`Handler not set yet for group ${groupId}, waiting...`);
-			}
-			// Retry after a short delay
-			setTimeout(() => {
-				if (this.handler && group.tasks.length > 0) {
-					this.processGroup(groupId);
-				}
-			}, 100);
-			return;
-		}
-
-		// Check concurrency limit
-		if (this.activeGroups.size >= this.concurrency) {
-			return;
-		}
-
-		group.processing = true;
-		this.activeGroups.add(groupId);
-		if (process.env.NODE_ENV !== "test") {
-			console.log(`Processing group ${groupId}, tasks: ${group.tasks.length}`);
-		}
-
-		while (group.tasks.length > 0) {
-			const task = group.tasks.shift()!;
-
-			try {
-				if (process.env.NODE_ENV !== "test") {
-					console.log(`Executing handler for group ${groupId}`);
-				}
-				await this.handler!(task.data);
-				task.resolve();
-				if (process.env.NODE_ENV !== "test") {
-					console.log(`Handler completed for group ${groupId}`);
-				}
-			} catch (error) {
-				if (process.env.NODE_ENV !== "test") {
-					console.error(`Handler error for group ${groupId}:`, error);
-				}
-				task.reject(error instanceof Error ? error : new Error(String(error)));
-			}
-		}
-
-		group.processing = false;
-		this.activeGroups.delete(groupId);
-
-		// Try to process another group if there are waiting groups
-		this.processNextGroup();
-	}
-
-	/**
-	 * Process the next available group
-	 */
-	private processNextGroup(): void {
-		if (this.activeGroups.size >= this.concurrency) {
-			return;
-		}
-
-		// Find a group with pending tasks that's not currently processing
-		for (const [groupId, group] of this.groups.entries()) {
-			if (
-				!group.processing &&
-				group.tasks.length > 0 &&
-				!this.activeGroups.has(groupId)
-			) {
-				this.processGroup(groupId);
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Remove all tasks for a specific group
-	 */
-	clearGroup(groupId: string): void {
-		const group = this.groups.get(groupId);
-		if (group) {
-			// Reject all pending tasks
-			for (const task of group.tasks) {
-				task.reject(new Error("Queue cleared"));
-			}
-			group.tasks = [];
-		}
-	}
-
-	/**
-	 * Clear all pending tasks across all groups
-	 * This is useful when changing concurrency settings
-	 * Note: This only clears tasks in the queue, not the currently executing task
-	 */
-	clearAllPendingTasks(): number {
-		let clearedCount = 0;
-		for (const [groupId, group] of this.groups.entries()) {
-			// Clear all pending tasks in the queue
-			// The currently executing task is not in group.tasks (it was already shifted)
-			if (group.tasks.length > 0) {
-				clearedCount += group.tasks.length;
-				for (const task of group.tasks) {
-					task.reject(new Error("Concurrency changed - queue cleared"));
-				}
-				group.tasks = [];
-			}
-		}
-		return clearedCount;
-	}
-
-	/**
-	 * Get the number of pending tasks for a group
-	 */
-	getGroupLength(groupId: string): number {
-		return this.groups.get(groupId)?.tasks.length ?? 0;
-	}
-
-	/**
-	 * Get total number of pending tasks across all groups
-	 */
-	getTotalLength(): number {
-		let total = 0;
-		for (const group of this.groups.values()) {
-			total += group.tasks.length;
-		}
-		return total;
-	}
-
-	/**
-	 * Check if queue is idle (no active processing)
-	 */
-	isIdle(): boolean {
-		return this.activeGroups.size === 0;
-	}
-
-	/**
-	 * Get the number of active groups (for testing)
-	 */
-	getActiveGroupsCount(): number {
-		return this.activeGroups.size;
-	}
-
-	/**
-	 * Get the concurrency limit
-	 */
-	getConcurrency(): number {
-		return this.concurrency;
-	}
-
-	/**
-	 * Set the concurrency limit dynamically
-	 * This allows changing concurrency without recreating the queue
-	 * WARNING: This will clear all pending tasks when concurrency changes
-	 */
-	setConcurrency(concurrency: number): void {
-		if (concurrency < 1) {
-			throw new Error("Concurrency must be at least 1");
-		}
-		const concurrencyChanged = this.concurrency !== concurrency;
-		this.concurrency = concurrency;
-
-		// If concurrency changed, clear all pending tasks
-		if (concurrencyChanged) {
-			this.clearAllPendingTasks();
-		}
-
-		// Process next group if we now have capacity
-		this.processNextGroup();
-	}
-
-	/**
-	 * Close the queue and reject all pending tasks
-	 */
-	async close(): Promise<void> {
-		for (const [groupId, group] of this.groups.entries()) {
-			for (const task of group.tasks) {
-				task.reject(new Error("Queue closed"));
-			}
-			group.tasks = [];
-		}
-		this.groups.clear();
-		this.activeGroups.clear();
-	}
-}

apps/dokploy/server/queues/queue-manager.ts

@@ -1,112 +0,0 @@
-/**
- * Queue Manager - Manages multiple dynamic queues
- * Each queue can have its own concurrency configuration
- */
-
-import { GroupedQueue } from "./grouped-queue-wrapper";
-
-export class QueueManager {
-	private queues: Map<string, GroupedQueue<any>> = new Map();
-
-	/**
-	 * Get or create a queue with the specified name and concurrency
-	 * Note: If queue already exists, concurrency parameter is ignored
-	 */
-	getQueue<T>(name: string, concurrency = 1): GroupedQueue<T> {
-		if (!this.queues.has(name)) {
-			this.queues.set(name, new GroupedQueue<T>(concurrency));
-		}
-		return this.queues.get(name) as GroupedQueue<T>;
-	}
-
-	/**
-	 * Set handler for a specific queue
-	 */
-	setHandler<T>(queueName: string, handler: (data: T) => Promise<void>): void {
-		const queue = this.getQueue<T>(queueName);
-		queue.setHandler(handler);
-	}
-
-	/**
-	 * Add a job to a specific queue and group
-	 * If concurrency is provided and queue doesn't exist, creates it with that concurrency
-	 */
-	async add<T>(
-		queueName: string,
-		groupId: string,
-		data: T,
-		concurrency?: number,
-	): Promise<void> {
-		// If concurrency is provided and queue doesn't exist, create with that concurrency
-		if (concurrency !== undefined && !this.queues.has(queueName)) {
-			this.queues.set(queueName, new GroupedQueue<T>(concurrency));
-		}
-		const queue = this.getQueue<T>(queueName);
-		return queue.add(groupId, data);
-	}
-
-	/**
-	 * Clear all tasks for a specific group in a queue
-	 */
-	clearGroup(queueName: string, groupId: string): void {
-		const queue = this.queues.get(queueName);
-		if (queue) {
-			queue.clearGroup(groupId);
-		}
-	}
-
-	/**
-	 * Get the number of pending tasks for a group in a queue
-	 */
-	getGroupLength(queueName: string, groupId: string): number {
-		const queue = this.queues.get(queueName);
-		return queue ? queue.getGroupLength(groupId) : 0;
-	}
-
-	/**
-	 * Get total number of pending tasks across all groups in a queue
-	 */
-	getTotalLength(queueName: string): number {
-		const queue = this.queues.get(queueName);
-		return queue ? queue.getTotalLength() : 0;
-	}
-
-	/**
-	 * Check if a queue is idle
-	 */
-	isIdle(queueName: string): boolean {
-		const queue = this.queues.get(queueName);
-		return queue ? queue.isIdle() : true;
-	}
-
-	/**
-	 * Close a specific queue
-	 */
-	async closeQueue(queueName: string): Promise<void> {
-		const queue = this.queues.get(queueName);
-		if (queue) {
-			await queue.close();
-			this.queues.delete(queueName);
-		}
-	}
-
-	/**
-	 * Close all queues
-	 */
-	async closeAll(): Promise<void> {
-		const promises = Array.from(this.queues.keys()).map((name) =>
-			this.closeQueue(name),
-		);
-		await Promise.all(promises);
-	}
-
-	/**
-	 * Get all queue names
-	 */
-	getQueueNames(): string[] {
-		return Array.from(this.queues.keys());
-	}
-}
-
-// Singleton instance
-export const queueManager = new QueueManager();

apps/dokploy/server/queues/queueSetup.ts

@@ -1,110 +1,75 @@
-import { GroupedQueue } from "./grouped-queue-wrapper";
-import type { DeploymentJob } from "./queue-types";
+import {
+	execAsync,
+	execAsyncRemote,
+} from "@dokploy/server/utils/process/execAsync";
+import { Queue } from "bullmq";
+import { redisConfig } from "./redis-connection";
 
-// In-memory grouped queue: processes one job per group at a time
-// Multiple groups can process in parallel (up to concurrency limit)
-// Concurrency can be configured via DEPLOYMENT_QUEUE_CONCURRENCY env var (default: 1)
-// or dynamically via setConcurrency() function
-let DEPLOYMENT_CONCURRENCY = Number.parseInt(
-	process.env.DEPLOYMENT_QUEUE_CONCURRENCY || "1",
-	10,
-);
+const myQueue = new Queue("deployments", {
+	connection: redisConfig,
+});
 
-// Validate concurrency is at least 1
-if (DEPLOYMENT_CONCURRENCY < 1) {
-	DEPLOYMENT_CONCURRENCY = 1;
-}
-
-const myQueue = new GroupedQueue<DeploymentJob>(DEPLOYMENT_CONCURRENCY);
-
-// Initialize handler when this module is imported
-// Use dynamic import to avoid circular dependency
-// The handler will be set when deployments-queue.ts is imported
-let handlerInitialized = false;
-const initializeHandler = async () => {
-	if (!handlerInitialized) {
-		handlerInitialized = true;
-		// This will set the handler
-		await import("./deployments-queue");
-	}
-};
-
-// Initialize handler immediately (non-blocking)
-void initializeHandler();
-
-process.on("SIGTERM", async () => {
-	await myQueue.close();
+process.on("SIGTERM", () => {
+	myQueue.close();
 	process.exit(0);
 });
 
+myQueue.on("error", (error) => {
+	if ((error as any).code === "ECONNREFUSED") {
+		console.error(
+			"Make sure you have installed Redis and it is running.",
+			error,
+		);
+	}
+});
+
 export const cleanQueuesByApplication = async (applicationId: string) => {
-	const groupId = `application:${applicationId}`;
-	myQueue.clearGroup(groupId);
-	console.log(`Cleared queue for application ${applicationId}`);
+	const jobs = await myQueue.getJobs(["waiting", "delayed"]);
+
+	for (const job of jobs) {
+		if (job?.data?.applicationId === applicationId) {
+			await job.remove();
+			console.log(`Removed job ${job.id} for application ${applicationId}`);
+		}
+	}
 };
 
 export const cleanQueuesByCompose = async (composeId: string) => {
-	const groupId = `compose:${composeId}`;
-	myQueue.clearGroup(groupId);
-	console.log(`Cleared queue for compose ${composeId}`);
-};
+	const jobs = await myQueue.getJobs(["waiting", "delayed"]);
 
-/**
- * Add a job to the queue without awaiting (fire-and-forget)
- * This allows the API to return immediately while the job processes in the background
- * Errors are logged but don't block the response
- */
-export const addJobAsync = (groupId: string, data: DeploymentJob): void => {
-	// Fire and forget - don't await, but handle errors
-	myQueue.add(groupId, data).catch((error) => {
-		console.error(`Failed to queue job for group ${groupId}:`, error);
-	});
-};
-
-/**
- * Get the current deployment queue concurrency
- */
-export const getConcurrency = (): number => {
-	return myQueue.getConcurrency();
-};
-
-/**
- * Set the deployment queue concurrency dynamically
- * This updates the queue's concurrency setting immediately
- * WARNING: This will clear all pending builds when concurrency changes
- * @returns The number of pending builds that were cleared
- */
-export const setConcurrency = (concurrency: number): number => {
-	if (concurrency < 1) {
-		throw new Error("Concurrency must be at least 1");
-	}
-
-	const currentConcurrency = myQueue.getConcurrency();
-	const concurrencyChanged = currentConcurrency !== concurrency;
-
-	// Get count of pending tasks before clearing (setConcurrency will clear them)
-	let clearedCount = 0;
-	if (concurrencyChanged) {
-		// Get the count before setConcurrency clears them
-		clearedCount = myQueue.getTotalLength();
-		if (process.env.NODE_ENV !== "test") {
-			console.log(
-				`Concurrency changing from ${currentConcurrency} to ${concurrency}. Will clear ${clearedCount} pending builds.`,
-			);
+	for (const job of jobs) {
+		if (job?.data?.composeId === composeId) {
+			await job.remove();
+			console.log(`Removed job ${job.id} for compose ${composeId}`);
 		}
 	}
+};
 
-	// Update the stored concurrency value
-	DEPLOYMENT_CONCURRENCY = concurrency;
+export const killDockerBuild = async (
+	type: "application" | "compose",
+	serverId: string | null,
+) => {
+	try {
+		if (type === "application") {
+			const command = `pkill -2 -f "docker build"`;
 
-	// Update the queue's concurrency dynamically (this will clear pending tasks)
-	myQueue.setConcurrency(concurrency);
+			if (serverId) {
+				await execAsyncRemote(serverId, command);
+			} else {
+				await execAsync(command);
+			}
+		} else if (type === "compose") {
+			const command = `pkill -2 -f "docker compose"`;
 
-	if (process.env.NODE_ENV !== "test") {
-		console.log(`Deployment queue concurrency updated to ${concurrency}`);
+			if (serverId) {
+				await execAsyncRemote(serverId, command);
+			} else {
+				await execAsync(command);
+			}
+		}
+	} catch (error) {
+		console.error(error);
 	}
-
-	return clearedCount;
 };
 
 export { myQueue };

apps/dokploy/server/server.ts

@@ -4,11 +4,11 @@ import {
 	createDefaultServerTraefikConfig,
 	createDefaultTraefikConfig,
 	IS_CLOUD,
-	initCancelDeployments,
 	initCronJobs,
 	initializeNetwork,
 	initSchedules,
 	initVolumeBackupsCronJobs,
+	initCancelDeployments,
 	sendDokployRestartNotifications,
 	setupDirectories,
 } from "@dokploy/server";
@@ -66,8 +66,6 @@ void app.prepare().then(async () => {
 		console.log(`Server Started on: http://${HOST}:${PORT}`);
 		if (!IS_CLOUD) {
 			console.log("Starting Deployment Worker");
-			// Import the handler module to ensure it's initialized
-			await import("./queues/deployments-queue");
 			const { deploymentWorker } = await import("./queues/deployments-queue");
 			await deploymentWorker.run();
 		}

apps/dokploy/server/wss/docker-container-logs.ts

@@ -46,6 +46,14 @@ export const setupDockerContainerLogsWebSocketServer = (
 			ws.close();
 			return;
 		}
+
+		// Set up keep-alive ping mechanism to prevent timeout
+		// Send ping every 45 seconds to keep connection alive
+		const pingInterval = setInterval(() => {
+			if (ws.readyState === ws.OPEN) {
+				ws.ping();
+			}
+		}, 45000); // 45 seconds
 		try {
 			if (serverId) {
 				const server = await findServerById(serverId);
@@ -86,6 +94,7 @@ export const setupDockerContainerLogsWebSocketServer = (
 					.on("error", (err) => {
 						console.error("SSH connection error:", err);
 						ws.send(`SSH error: ${err.message}`);
+						clearInterval(pingInterval);
 						ws.close(); // Cierra el WebSocket si hay un error con SSH
 						client.end();
 					})
@@ -96,6 +105,7 @@ export const setupDockerContainerLogsWebSocketServer = (
 						privateKey: server.sshKey?.privateKey,
 					});
 				ws.on("close", () => {
+					clearInterval(pingInterval);
 					client.end();
 				});
 			} else {
@@ -121,6 +131,7 @@ export const setupDockerContainerLogsWebSocketServer = (
 					ws.send(data);
 				});
 				ws.on("close", () => {
+					clearInterval(pingInterval);
 					ptyProcess.kill();
 				});
 				ws.on("message", (message) => {

package.json

@@ -20,7 +20,8 @@
 		"build": "pnpm -r run build",
 		"format-and-lint": "biome check .",
 		"check": "biome check --write --no-errors-on-unmatched --files-ignore-unknown=true",
-		"format-and-lint:fix": "biome check . --write"
+		"format-and-lint:fix": "biome check . --write",
+		"generate:openapi": "pnpm --filter=dokploy run generate:openapi"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.1.1",

packages/server/package.json

@@ -75,6 +75,7 @@
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "rotating-file-stream": "3.2.3",
+    "shell-quote": "^1.8.1",
     "slugify": "^1.6.6",
     "ssh2": "1.15.0",
     "toml": "3.0.0",
@@ -93,6 +94,7 @@
     "@types/qrcode": "^1.5.5",
     "@types/react": "^18.3.5",
     "@types/react-dom": "^18.3.0",
+    "@types/shell-quote": "^1.7.5",
     "@types/ssh2": "1.15.1",
     "@types/ws": "8.5.10",
     "drizzle-kit": "^0.30.6",

packages/server/src/db/schema/application.ts

@@ -111,6 +111,7 @@ export const applications = pgTable("application", {
 	enabled: boolean("enabled"),
 	subtitle: text("subtitle"),
 	command: text("command"),
+	args: text("args").array(),
 	refreshToken: text("refreshToken").$defaultFn(() => nanoid()),
 	sourceType: sourceType("sourceType").notNull().default("github"),
 	cleanCache: boolean("cleanCache").default(false),
@@ -204,6 +205,15 @@ export const applications = pgTable("application", {
 	serverId: text("serverId").references(() => server.serverId, {
 		onDelete: "cascade",
 	}),
+	buildServerId: text("buildServerId").references(() => server.serverId, {
+		onDelete: "set null",
+	}),
+	buildRegistryId: text("buildRegistryId").references(
+		() => registry.registryId,
+		{
+			onDelete: "set null",
+		},
+	),
 });
 
 export const applicationsRelations = relations(
@@ -226,6 +236,7 @@ export const applicationsRelations = relations(
 		registry: one(registry, {
 			fields: [applications.registryId],
 			references: [registry.registryId],
+			relationName: "applicationRegistry",
 		}),
 		github: one(github, {
 			fields: [applications.githubId],
@@ -246,6 +257,17 @@ export const applicationsRelations = relations(
 		server: one(server, {
 			fields: [applications.serverId],
 			references: [server.serverId],
+			relationName: "applicationServer",
+		}),
+		buildServer: one(server, {
+			fields: [applications.buildServerId],
+			references: [server.serverId],
+			relationName: "applicationBuildServer",
+		}),
+		buildRegistry: one(registry, {
+			fields: [applications.buildRegistryId],
+			references: [registry.registryId],
+			relationName: "applicationBuildRegistry",
 		}),
 		previewDeployments: many(previewDeployments),
 	}),
@@ -272,6 +294,7 @@ const createSchema = createInsertSchema(applications, {
 	username: z.string().optional(),
 	isPreviewDeploymentsActive: z.boolean().optional(),
 	password: z.string().optional(),
+	args: z.array(z.string()).optional(),
 	registryUrl: z.string().optional(),
 	customGitSSHKeyId: z.string().optional(),
 	repository: z.string().optional(),

packages/server/src/db/schema/deployment.ts

@@ -70,6 +70,9 @@ export const deployments = pgTable("deployment", {
 		(): AnyPgColumn => volumeBackups.volumeBackupId,
 		{ onDelete: "cascade" },
 	),
+	buildServerId: text("buildServerId").references(() => server.serverId, {
+		onDelete: "cascade",
+	}),
 });
 
 export const deploymentsRelations = relations(deployments, ({ one }) => ({
@@ -84,6 +87,12 @@ export const deploymentsRelations = relations(deployments, ({ one }) => ({
 	server: one(server, {
 		fields: [deployments.serverId],
 		references: [server.serverId],
+		relationName: "deploymentServer",
+	}),
+	buildServer: one(server, {
+		fields: [deployments.buildServerId],
+		references: [server.serverId],
+		relationName: "deploymentBuildServer",
 	}),
 	previewDeployment: one(previewDeployments, {
 		fields: [deployments.previewDeploymentId],
@@ -115,6 +124,7 @@ const schema = createInsertSchema(deployments, {
 	composeId: z.string(),
 	description: z.string().optional(),
 	previewDeploymentId: z.string(),
+	buildServerId: z.string(),
 });
 
 export const apiCreateDeployment = schema

packages/server/src/db/schema/mariadb.ts

@@ -45,6 +45,7 @@ export const mariadb = pgTable("mariadb", {
 	databaseRootPassword: text("rootPassword").notNull(),
 	dockerImage: text("dockerImage").notNull(),
 	command: text("command"),
+	args: text("args").array(),
 	env: text("env"),
 	// RESOURCES
 	memoryReservation: text("memoryReservation"),
@@ -114,6 +115,7 @@ const createSchema = createInsertSchema(mariadb, {
 		.optional(),
 	dockerImage: z.string().default("mariadb:6"),
 	command: z.string().optional(),
+	args: z.array(z.string()).optional(),
 	env: z.string().optional(),
 	memoryReservation: z.string().optional(),
 	memoryLimit: z.string().optional(),

packages/server/src/db/schema/mongo.ts

@@ -50,6 +50,7 @@ export const mongo = pgTable("mongo", {
 	databasePassword: text("databasePassword").notNull(),
 	dockerImage: text("dockerImage").notNull(),
 	command: text("command"),
+	args: text("args").array(),
 	env: text("env"),
 	memoryReservation: text("memoryReservation"),
 	memoryLimit: text("memoryLimit"),
@@ -110,6 +111,7 @@ const createSchema = createInsertSchema(mongo, {
 	databaseUser: z.string().min(1),
 	dockerImage: z.string().default("mongo:15"),
 	command: z.string().optional(),
+	args: z.array(z.string()).optional(),
 	env: z.string().optional(),
 	memoryReservation: z.string().optional(),
 	memoryLimit: z.string().optional(),

packages/server/src/db/schema/mysql.ts

@@ -45,6 +45,7 @@ export const mysql = pgTable("mysql", {
 	databaseRootPassword: text("rootPassword").notNull(),
 	dockerImage: text("dockerImage").notNull(),
 	command: text("command"),
+	args: text("args").array(),
 	env: text("env"),
 	memoryReservation: text("memoryReservation"),
 	memoryLimit: text("memoryLimit"),
@@ -112,6 +113,7 @@ const createSchema = createInsertSchema(mysql, {
 		.optional(),
 	dockerImage: z.string().default("mysql:8"),
 	command: z.string().optional(),
+	args: z.array(z.string()).optional(),
 	env: z.string().optional(),
 	memoryReservation: z.string().optional(),
 	memoryLimit: z.string().optional(),

packages/server/src/db/schema/notification.ts

@@ -116,7 +116,7 @@ export const ntfy = pgTable("ntfy", {
 		.$defaultFn(() => nanoid()),
 	serverUrl: text("serverUrl").notNull(),
 	topic: text("topic").notNull(),
-	accessToken: text("accessToken").notNull(),
+	accessToken: text("accessToken"),
 	priority: integer("priority").notNull().default(3),
 });
 
@@ -331,7 +331,7 @@ export const apiCreateNtfy = notificationsSchema
 	.extend({
 		serverUrl: z.string().min(1),
 		topic: z.string().min(1),
-		accessToken: z.string().min(1),
+		accessToken: z.string().optional(),
 		priority: z.number().min(1),
 	})
 	.required();
@@ -395,7 +395,7 @@ export const apiSendTest = notificationsSchema
 		serverUrl: z.string(),
 		topic: z.string(),
 		appToken: z.string(),
-		accessToken: z.string(),
+		accessToken: z.string().optional(),
 		priority: z.number(),
 	})
 	.partial();

packages/server/src/db/schema/postgres.ts

@@ -44,6 +44,7 @@ export const postgres = pgTable("postgres", {
 	description: text("description"),
 	dockerImage: text("dockerImage").notNull(),
 	command: text("command"),
+	args: text("args").array(),
 	env: text("env"),
 	memoryReservation: text("memoryReservation"),
 	externalPort: integer("externalPort"),
@@ -103,6 +104,7 @@ const createSchema = createInsertSchema(postgres, {
 	databaseUser: z.string().min(1),
 	dockerImage: z.string().default("postgres:15"),
 	command: z.string().optional(),
+	args: z.array(z.string()).optional(),
 	env: z.string().optional(),
 	memoryReservation: z.string().optional(),
 	memoryLimit: z.string().optional(),

packages/server/src/db/schema/redis.ts

@@ -41,6 +41,7 @@ export const redis = pgTable("redis", {
 	databasePassword: text("password").notNull(),
 	dockerImage: text("dockerImage").notNull(),
 	command: text("command"),
+	args: text("args").array(),
 	env: text("env"),
 	memoryReservation: text("memoryReservation"),
 	memoryLimit: text("memoryLimit"),
@@ -93,6 +94,7 @@ const createSchema = createInsertSchema(redis, {
 	databasePassword: z.string(),
 	dockerImage: z.string().default("redis:8"),
 	command: z.string().optional(),
+	args: z.array(z.string()).optional(),
 	env: z.string().optional(),
 	memoryReservation: z.string().optional(),
 	memoryLimit: z.string().optional(),

packages/server/src/db/schema/registry.ts

@@ -33,7 +33,12 @@ export const registry = pgTable("registry", {
 });
 
 export const registryRelations = relations(registry, ({ many }) => ({
-	applications: many(applications),
+	applications: many(applications, {
+		relationName: "applicationRegistry",
+	}),
+	buildApplications: many(applications, {
+		relationName: "applicationBuildRegistry",
+	}),
 }));
 
 const createSchema = createInsertSchema(registry, {

packages/server/src/db/schema/server.ts

@@ -24,6 +24,7 @@ import { schedules } from "./schedule";
 import { sshKeys } from "./ssh-key";
 import { generateAppName } from "./utils";
 export const serverStatus = pgEnum("serverStatus", ["active", "inactive"]);
+export const serverType = pgEnum("serverType", ["deploy", "build"]);
 
 export const server = pgTable("server", {
 	serverId: text("serverId")
@@ -44,6 +45,7 @@ export const server = pgTable("server", {
 		.notNull()
 		.references(() => organization.id, { onDelete: "cascade" }),
 	serverStatus: serverStatus("serverStatus").notNull().default("active"),
+	serverType: serverType("serverType").notNull().default("deploy"),
 	command: text("command").notNull().default(""),
 	sshKeyId: text("sshKeyId").references(() => sshKeys.sshKeyId, {
 		onDelete: "set null",
@@ -97,12 +99,22 @@ export const server = pgTable("server", {
 });
 
 export const serverRelations = relations(server, ({ one, many }) => ({
-	deployments: many(deployments),
+	deployments: many(deployments, {
+		relationName: "deploymentServer",
+	}),
+	buildDeployments: many(deployments, {
+		relationName: "deploymentBuildServer",
+	}),
 	sshKey: one(sshKeys, {
 		fields: [server.sshKeyId],
 		references: [sshKeys.sshKeyId],
 	}),
-	applications: many(applications),
+	applications: many(applications, {
+		relationName: "applicationServer",
+	}),
+	buildApplications: many(applications, {
+		relationName: "applicationBuildServer",
+	}),
 	compose: many(compose),
 	redis: many(redis),
 	mariadb: many(mariadb),
@@ -131,6 +143,7 @@ export const apiCreateServer = createSchema
 		port: true,
 		username: true,
 		sshKeyId: true,
+		serverType: true,
 	})
 	.required();
 
@@ -155,6 +168,7 @@ export const apiUpdateServer = createSchema
 		port: true,
 		username: true,
 		sshKeyId: true,
+		serverType: true,
 	})
 	.required()
 	.extend({

packages/server/src/db/validations/domain.ts

@@ -2,7 +2,13 @@ import { z } from "zod";
 
 export const domain = z
 	.object({
-		host: z.string().min(1, { message: "Add a hostname" }),
+		host: z
+			.string()
+			.min(1, { message: "Add a hostname" })
+			.refine((val) => val === val.trim(), {
+				message: "Domain name cannot have leading or trailing spaces",
+			})
+			.transform((val) => val.trim()),
 		path: z.string().min(1).optional(),
 		internalPath: z.string().optional(),
 		stripPath: z.boolean().optional(),
@@ -58,7 +64,13 @@ export const domain = z
 
 export const domainCompose = z
 	.object({
-		host: z.string().min(1, { message: "Host is required" }),
+		host: z
+			.string()
+			.min(1, { message: "Add a hostname" })
+			.refine((val) => val === val.trim(), {
+				message: "Domain name cannot have leading or trailing spaces",
+			})
+			.transform((val) => val.trim()),
 		path: z.string().min(1).optional(),
 		internalPath: z.string().optional(),
 		stripPath: z.boolean().optional(),

packages/server/src/emails/emails/build-success.tsx

@@ -19,6 +19,7 @@ export type TemplateProps = {
 	applicationType: string;
 	buildLink: string;
 	date: string;
+	environmentName: string;
 };
 
 export const BuildSuccessEmail = ({
@@ -27,6 +28,7 @@ export const BuildSuccessEmail = ({
 	applicationType = "application",
 	buildLink = "https://dokploy.com/projects/dokploy-test/applications/dokploy-test",
 	date = "2023-05-01T00:00:00.000Z",
+	environmentName = "production",
 }: TemplateProps) => {
 	const previewText = `Build success for ${applicationName}`;
 	return (
@@ -74,6 +76,9 @@ export const BuildSuccessEmail = ({
 							<Text className="!leading-3">
 								Application Name: <strong>{applicationName}</strong>
 							</Text>
+							<Text className="!leading-3">
+								Environment: <strong>{environmentName}</strong>
+							</Text>
 							<Text className="!leading-3">
 								Application Type: <strong>{applicationType}</strong>
 							</Text>

packages/server/src/services/application.ts

@@ -13,6 +13,7 @@ import {
 import { sendBuildErrorNotifications } from "@dokploy/server/utils/notifications/build-error";
 import { sendBuildSuccessNotifications } from "@dokploy/server/utils/notifications/build-success";
 import {
+	ExecError,
 	execAsync,
 	execAsyncRemote,
 } from "@dokploy/server/utils/process/execAsync";
@@ -28,6 +29,7 @@ import { cloneGitlabRepository } from "@dokploy/server/utils/providers/gitlab";
 import { createTraefikConfig } from "@dokploy/server/utils/traefik/application";
 import { TRPCError } from "@trpc/server";
 import { eq } from "drizzle-orm";
+import { encodeBase64 } from "../utils/docker/utils";
 import { getDokployUrl } from "./admin";
 import {
 	createDeployment,
@@ -110,6 +112,7 @@ export const findApplicationById = async (applicationId: string) => {
 			gitea: true,
 			server: true,
 			previewDeployments: true,
+			buildRegistry: true,
 		},
 	});
 	if (!application) {
@@ -170,6 +173,7 @@ export const deployApplication = async ({
 	descriptionLog: string;
 }) => {
 	const application = await findApplicationById(applicationId);
+	const serverId = application.buildServerId || application.serverId;
 
 	const buildLink = `${await getDokployUrl()}/dashboard/project/${application.environment.projectId}/environment/${application.environmentId}/services/application/${application.applicationId}?tab=deployments`;
 	const deployment = await createDeployment({
@@ -197,8 +201,8 @@ export const deployApplication = async ({
 		command += getBuildCommand(application);
 
 		const commandWithLog = `(${command}) >> ${deployment.logPath} 2>&1`;
-		if (application.serverId) {
-			await execAsyncRemote(application.serverId, commandWithLog);
+		if (serverId) {
+			await execAsyncRemote(serverId, commandWithLog);
 		} else {
 			await execAsync(commandWithLog);
 		}
@@ -225,11 +229,21 @@ export const deployApplication = async ({
 			buildLink,
 			organizationId: application.environment.project.organizationId,
 			domains: application.domains,
+			environmentName: application.environment.name,
 		});
 	} catch (error) {
-		const command = `echo "Error occurred ❌, check the logs for details." >> ${deployment.logPath};`;
-		if (application.serverId) {
-			await execAsyncRemote(application.serverId, command);
+		let command = "";
+
+		// Only log details for non-ExecError errors
+		if (!(error instanceof ExecError)) {
+			const message = error instanceof Error ? error.message : String(error);
+			const encodedMessage = encodeBase64(message);
+			command += `echo "${encodedMessage}" | base64 -d >> "${deployment.logPath}";`;
+		}
+
+		command += `echo "\nError occurred ❌, check the logs for details." >> ${deployment.logPath};`;
+		if (serverId) {
+			await execAsyncRemote(serverId, command);
 		} else {
 			await execAsync(command);
 		}
@@ -273,6 +287,8 @@ export const rebuildApplication = async ({
 	descriptionLog: string;
 }) => {
 	const application = await findApplicationById(applicationId);
+	const serverId = application.buildServerId || application.serverId;
+	const buildLink = `${await getDokployUrl()}/dashboard/project/${application.environment.projectId}/environment/${application.environmentId}/services/application/${application.applicationId}?tab=deployments`;
 
 	const deployment = await createDeployment({
 		applicationId: applicationId,
@@ -285,15 +301,51 @@ export const rebuildApplication = async ({
 		// Check case for docker only
 		command += getBuildCommand(application);
 		const commandWithLog = `(${command}) >> ${deployment.logPath} 2>&1`;
-		if (application.serverId) {
-			await execAsyncRemote(application.serverId, commandWithLog);
+		if (serverId) {
+			await execAsyncRemote(serverId, commandWithLog);
 		} else {
 			await execAsync(commandWithLog);
 		}
 		await mechanizeDockerContainer(application);
 		await updateDeploymentStatus(deployment.deploymentId, "done");
 		await updateApplicationStatus(applicationId, "done");
+
+		if (application.rollbackActive) {
+			const tagImage =
+				application.sourceType === "docker"
+					? application.dockerImage
+					: application.appName;
+			await createRollback({
+				appName: tagImage || "",
+				deploymentId: deployment.deploymentId,
+			});
+		}
+
+		await sendBuildSuccessNotifications({
+			projectName: application.environment.project.name,
+			applicationName: application.name,
+			applicationType: "application",
+			buildLink,
+			organizationId: application.environment.project.organizationId,
+			domains: application.domains,
+			environmentName: application.environment.name,
+		});
 	} catch (error) {
+		let command = "";
+
+		// Only log details for non-ExecError errors
+		if (!(error instanceof ExecError)) {
+			const message = error instanceof Error ? error.message : String(error);
+			const encodedMessage = encodeBase64(message);
+			command += `echo "${encodedMessage}" | base64 -d >> "${deployment.logPath}";`;
+		}
+
+		command += `echo "\nError occurred ❌, check the logs for details." >> ${deployment.logPath};`;
+		if (serverId) {
+			await execAsyncRemote(serverId, command);
+		} else {
+			await execAsync(command);
+		}
 		await updateDeploymentStatus(deployment.deploymentId, "error");
 		await updateApplicationStatus(applicationId, "error");
 		throw error;

packages/server/src/services/cdn.ts

@@ -78,7 +78,6 @@ const BUNNY_CDN_IPS = new Set([
 	"89.187.188.227",
 	"89.187.188.228",
 	"139.180.134.196",
-	"89.38.96.158",
 	"89.187.162.249",
 	"89.187.162.242",
 	"185.102.217.65",
@@ -106,12 +105,9 @@ const BUNNY_CDN_IPS = new Set([
 	"200.25.38.69",
 	"200.25.42.70",
 	"200.25.36.166",
-	"195.206.229.106",
 	"194.242.11.186",
-	"185.164.35.8",
 	"94.20.154.22",
 	"185.93.1.244",
-	"156.59.145.154",
 	"143.244.49.177",
 	"138.199.46.66",
 	"138.199.37.227",
@@ -136,7 +132,6 @@ const BUNNY_CDN_IPS = new Set([
 	"84.17.59.115",
 	"89.187.165.194",
 	"138.199.15.193",
-	"89.35.237.170",
 	"37.19.216.130",
 	"185.93.1.247",
 	"185.93.3.244",
@@ -150,6 +145,7 @@ const BUNNY_CDN_IPS = new Set([
 	"84.17.63.178",
 	"200.25.32.131",
 	"37.19.207.34",
+	"37.19.207.38",
 	"192.189.65.146",
 	"143.244.45.177",
 	"185.93.1.249",
@@ -168,9 +164,7 @@ const BUNNY_CDN_IPS = new Set([
 	"129.227.217.178",
 	"129.227.217.179",
 	"200.25.69.94",
-	"128.1.52.179",
 	"200.25.16.103",
-	"15.235.54.226",
 	"102.67.138.155",
 	"156.146.43.65",
 	"195.181.163.203",
@@ -278,13 +272,11 @@ const BUNNY_CDN_IPS = new Set([
 	"107.155.47.146",
 	"193.201.190.174",
 	"156.59.95.218",
-	"213.170.143.139",
 	"129.227.186.154",
 	"195.238.127.98",
 	"200.25.22.6",
 	"204.16.244.92",
 	"200.25.70.101",
-	"200.25.66.100",
 	"139.180.209.182",
 	"103.108.231.41",
 	"103.108.229.5",
@@ -387,46 +379,13 @@ const BUNNY_CDN_IPS = new Set([
 	"38.54.5.37",
 	"38.54.3.92",
 	"185.165.170.74",
-	"207.121.80.118",
-	"207.121.46.228",
-	"207.121.46.236",
-	"207.121.46.244",
-	"207.121.46.252",
-	"216.202.235.164",
-	"207.121.46.220",
 	"207.121.75.132",
 	"207.121.80.12",
 	"207.121.80.172",
 	"207.121.90.60",
-	"207.121.90.68",
-	"207.121.97.204",
-	"207.121.90.252",
-	"207.121.97.236",
-	"207.121.99.12",
 	"138.199.24.219",
 	"185.93.2.251",
 	"138.199.46.65",
-	"207.121.41.196",
-	"207.121.99.20",
-	"207.121.99.36",
-	"207.121.99.44",
-	"207.121.99.52",
-	"207.121.99.60",
-	"207.121.23.68",
-	"207.121.23.124",
-	"207.121.23.244",
-	"207.121.23.180",
-	"207.121.23.188",
-	"207.121.23.196",
-	"207.121.23.204",
-	"207.121.24.52",
-	"207.121.24.60",
-	"207.121.24.68",
-	"207.121.24.76",
-	"207.121.24.92",
-	"207.121.24.100",
-	"207.121.24.108",
-	"207.121.24.116",
 	"154.95.86.76",
 	"5.9.99.73",
 	"78.46.92.118",
@@ -434,14 +393,52 @@ const BUNNY_CDN_IPS = new Set([
 	"78.46.156.89",
 	"88.198.9.155",
 	"144.76.79.22",
-	"103.1.215.93",
-	"103.137.12.33",
-	"103.107.196.31",
-	"116.90.72.155",
-	"103.137.14.5",
-	"116.90.75.65",
 	"37.19.207.37",
 	"208.83.234.224",
+	"79.127.237.104",
+	"79.127.243.187",
+	"45.156.248.73",
+	"79.127.134.225",
+	"79.127.134.226",
+	"79.127.134.227",
+	"79.127.134.228",
+	"79.127.134.229",
+	"79.127.134.230",
+	"79.127.134.231",
+	"79.127.134.130",
+	"79.127.134.131",
+	"79.127.134.132",
+	"79.127.134.234",
+	"79.127.134.235",
+	"185.111.111.154",
+	"185.111.111.155",
+	"185.111.111.156",
+	"185.111.111.157",
+	"185.111.111.158",
+	"185.111.111.159",
+	"185.111.111.160",
+	"141.227.142.242",
+	"94.128.254.166",
+	"195.206.229.69",
+	"200.25.86.90",
+	"148.113.190.161",
+	"46.151.194.242",
+	"46.151.194.243",
+	"212.102.40.120",
+	"213.170.143.100",
+	"154.93.86.71",
+	"143.244.60.196",
+	"143.244.60.197",
+	"143.244.60.195",
+	"79.127.134.129",
+	"79.127.134.133",
+	"152.233.22.97",
+	"152.233.22.98",
+	"152.233.22.100",
+	"152.233.22.99",
+	"152.233.22.101",
+	"152.233.22.102",
+	"152.233.22.103",
 	"116.202.155.146",
 	"116.202.193.178",
 	"116.202.224.168",
@@ -502,6 +499,12 @@ const BUNNY_CDN_IPS = new Set([
 	"103.60.15.166",
 	"103.60.15.167",
 	"103.60.15.168",
+	"176.9.139.94",
+	"148.251.129.132",
+	"148.251.131.73",
+	"148.251.131.74",
+	"136.243.70.170",
+	"148.251.131.238",
 	"109.248.43.116",
 	"109.248.43.117",
 	"109.248.43.162",
@@ -527,7 +530,9 @@ const BUNNY_CDN_IPS = new Set([
 	"139.180.129.216",
 	"139.99.174.7",
 	"89.187.169.18",
+	"143.244.38.133",
 	"89.187.179.7",
+	"169.150.213.50",
 	"143.244.62.213",
 	"185.93.3.246",
 	"195.181.163.198",
@@ -535,7 +540,6 @@ const BUNNY_CDN_IPS = new Set([
 	"84.17.37.211",
 	"212.102.50.54",
 	"212.102.46.115",
-	"143.244.38.135",
 	"169.150.238.21",
 	"169.150.207.51",
 	"169.150.207.49",
@@ -546,7 +550,6 @@ const BUNNY_CDN_IPS = new Set([
 	"169.150.247.139",
 	"169.150.247.177",
 	"169.150.247.178",
-	"169.150.213.49",
 	"212.102.46.119",
 	"84.17.38.234",
 	"84.17.38.233",
@@ -558,7 +561,6 @@ const BUNNY_CDN_IPS = new Set([
 	"169.150.247.138",
 	"169.150.247.184",
 	"169.150.247.185",
-	"156.146.58.83",
 	"212.102.43.88",
 	"89.187.169.26",
 	"109.61.89.57",
@@ -587,6 +589,17 @@ const BUNNY_CDN_IPS = new Set([
 	"138.199.4.177",
 	"37.19.222.34",
 	"46.151.193.85",
+	"79.127.237.99",
+	"212.104.158.30",
+	"212.104.158.31",
+	"212.104.158.32",
+	"212.104.158.33",
+	"212.104.158.34",
+	"212.104.158.28",
+	"212.104.158.29",
+	"212.104.158.35",
+	"212.104.158.36",
+	"212.104.158.37",
 	"212.104.158.17",
 	"212.104.158.18",
 	"212.104.158.19",
@@ -595,12 +608,20 @@ const BUNNY_CDN_IPS = new Set([
 	"212.104.158.22",
 	"212.104.158.24",
 	"212.104.158.26",
-	"79.127.237.134",
 	"89.187.184.177",
 	"89.187.184.179",
 	"89.187.184.173",
 	"89.187.184.178",
 	"89.187.184.176",
+	"212.104.158.25",
+	"212.104.158.27",
+	"212.104.158.67",
+	"212.104.158.10",
+	"212.104.158.12",
+	"212.104.158.64",
+	"212.104.158.16",
+	"212.104.158.23",
+	"212.104.158.54",
 ]);
 
 // Arvancloud IP ranges

packages/server/src/services/compose.ts

@@ -18,6 +18,7 @@ import type { ComposeSpecification } from "@dokploy/server/utils/docker/types";
 import { sendBuildErrorNotifications } from "@dokploy/server/utils/notifications/build-error";
 import { sendBuildSuccessNotifications } from "@dokploy/server/utils/notifications/build-success";
 import {
+	ExecError,
 	execAsync,
 	execAsyncRemote,
 } from "@dokploy/server/utils/process/execAsync";
@@ -32,6 +33,7 @@ import { cloneGitlabRepository } from "@dokploy/server/utils/providers/gitlab";
 import { getCreateComposeFileCommand } from "@dokploy/server/utils/providers/raw";
 import { TRPCError } from "@trpc/server";
 import { eq } from "drizzle-orm";
+import { encodeBase64 } from "../utils/docker/utils";
 import { getDokployUrl } from "./admin";
 import {
 	createDeploymentCompose,
@@ -267,8 +269,24 @@ export const deployCompose = async ({
 			buildLink,
 			organizationId: compose.environment.project.organizationId,
 			domains: compose.domains,
+			environmentName: compose.environment.name,
 		});
 	} catch (error) {
+		let command = "";
+
+		// Only log details for non-ExecError errors
+		if (!(error instanceof ExecError)) {
+			const message = error instanceof Error ? error.message : String(error);
+			const encodedMessage = encodeBase64(message);
+			command += `echo "${encodedMessage}" | base64 -d >> "${deployment.logPath}";`;
+		}
+
+		command += `echo "\nError occurred ❌, check the logs for details." >> ${deployment.logPath};`;
+		if (compose.serverId) {
+			await execAsyncRemote(compose.serverId, command);
+		} else {
+			await execAsync(command);
+		}
 		await updateDeploymentStatus(deployment.deploymentId, "error");
 		await updateCompose(composeId, {
 			composeStatus: "error",
@@ -341,6 +359,21 @@ export const rebuildCompose = async ({
 			composeStatus: "done",
 		});
 	} catch (error) {
+		let command = "";
+
+		// Only log details for non-ExecError errors
+		if (!(error instanceof ExecError)) {
+			const message = error instanceof Error ? error.message : String(error);
+			const encodedMessage = encodeBase64(message);
+			command += `echo "${encodedMessage}" | base64 -d >> "${deployment.logPath}";`;
+		}
+
+		command += `echo "\nError occurred ❌, check the logs for details." >> ${deployment.logPath};`;
+		if (compose.serverId) {
+			await execAsyncRemote(compose.serverId, command);
+		} else {
+			await execAsync(command);
+		}
 		await updateDeploymentStatus(deployment.deploymentId, "error");
 		await updateCompose(composeId, {
 			composeStatus: "error",
@@ -375,7 +408,7 @@ export const removeCompose = async (
 		} else {
 			const command = `
 			 docker network disconnect ${compose.appName} dokploy-traefik;
-			cd ${projectPath} && docker compose -p ${compose.appName} down ${
+			cd ${projectPath} && env -i PATH="$PATH" docker compose -p ${compose.appName} down ${
 				deleteVolumes ? "--volumes" : ""
 			} && rm -rf ${projectPath}`;
 
@@ -402,7 +435,7 @@ export const startCompose = async (composeId: string) => {
 		const projectPath = join(COMPOSE_PATH, compose.appName, "code");
 		const path =
 			compose.sourceType === "raw" ? "docker-compose.yml" : compose.composePath;
-		const baseCommand = `docker compose -p ${compose.appName} -f ${path} up -d`;
+		const baseCommand = `env -i PATH="$PATH" docker compose -p ${compose.appName} -f ${path} up -d`;
 		if (compose.composeType === "docker-compose") {
 			if (compose.serverId) {
 				await execAsyncRemote(
@@ -437,14 +470,17 @@ export const stopCompose = async (composeId: string) => {
 			if (compose.serverId) {
 				await execAsyncRemote(
 					compose.serverId,
-					`cd ${join(COMPOSE_PATH, compose.appName)} && docker compose -p ${
+					`cd ${join(COMPOSE_PATH, compose.appName)} && env -i PATH="$PATH" docker compose -p ${
 						compose.appName
 					} stop`,
 				);
 			} else {
-				await execAsync(`docker compose -p ${compose.appName} stop`, {
-					cwd: join(COMPOSE_PATH, compose.appName),
-				});
+				await execAsync(
+					`env -i PATH="$PATH" docker compose -p ${compose.appName} stop`,
+					{
+						cwd: join(COMPOSE_PATH, compose.appName),
+					},
+				);
 			}
 		}
 

packages/server/src/services/deployment.ts

@@ -80,7 +80,7 @@ export const createDeployment = async (
 			"application",
 			application.serverId,
 		);
-		const serverId = application.serverId;
+		const serverId = application.buildServerId || application.serverId;
 
 		const { LOGS_PATH } = paths(!!serverId);
 		const formattedDateTime = format(new Date(), "yyyy-MM-dd:HH:mm:ss");
@@ -93,6 +93,7 @@ export const createDeployment = async (
 			const command = `
 				mkdir -p ${LOGS_PATH}/${application.appName};
             	echo "Initializing deployment" >> ${logFilePath};
+			    echo "Building on ${serverId ? "Build Server" : "Dokploy Server"}" >> ${logFilePath};
 			`;
 
 			await execAsyncRemote(server.serverId, command);
@@ -112,6 +113,9 @@ export const createDeployment = async (
 				logPath: logFilePath,
 				description: deployment.description || "",
 				startedAt: new Date().toISOString(),
+				...(application.buildServerId && {
+					buildServerId: application.buildServerId,
+				}),
 			})
 			.returning();
 		if (deploymentCreate.length === 0 || !deploymentCreate[0]) {

packages/server/src/services/domain.ts

@@ -19,6 +19,7 @@ export const createDomain = async (input: typeof apiCreateDomain._type) => {
 			.insert(domains)
 			.values({
 				...input,
+				host: input.host?.trim(),
 			})
 			.returning()
 			.then((response) => response[0]);
@@ -120,6 +121,7 @@ export const updateDomainById = async (
 		.update(domains)
 		.set({
 			...domainData,
+			...(domainData.host && { host: domainData.host.trim() }),
 		})
 		.where(eq(domains.domainId, domainId))
 		.returning();

packages/server/src/services/notification.ts

@@ -498,7 +498,7 @@ export const createNtfyNotification = async (
 			.values({
 				serverUrl: input.serverUrl,
 				topic: input.topic,
-				accessToken: input.accessToken,
+				accessToken: input.accessToken ?? null,
 				priority: input.priority,
 			})
 			.returning()
@@ -569,7 +569,7 @@ export const updateNtfyNotification = async (
 			.set({
 				serverUrl: input.serverUrl,
 				topic: input.topic,
-				accessToken: input.accessToken,
+				accessToken: input.accessToken ?? null,
 				priority: input.priority,
 			})
 			.where(eq(ntfy.ntfyId, input.ntfyId));

packages/server/src/services/postgres.ts

@@ -13,6 +13,18 @@ import { TRPCError } from "@trpc/server";
 import { eq, getTableColumns } from "drizzle-orm";
 import { validUniqueServerAppName } from "./project";
 
+export function getMountPath(dockerImage: string): string {
+	const versionMatch = dockerImage.match(/postgres:(\d+)/);
+
+	if (versionMatch?.[1]) {
+		const version = Number.parseInt(versionMatch[1], 10);
+		if (version >= 18) {
+			return `/var/lib/postgresql/${version}/data`;
+		}
+	}
+	return "/var/lib/postgresql/data";
+}
+
 export type Postgres = typeof postgres.$inferSelect;
 
 export const createPostgres = async (input: typeof apiCreatePostgres._type) => {

packages/server/src/services/settings.ts

@@ -59,10 +59,8 @@ export const getUpdateData = async (): Promise<IUpdateData> => {
 	let currentDigest: string;
 	try {
 		currentDigest = await getServiceImageDigest();
-	} catch {
-		// Docker service might not exist locally
-		// You can run the # Installation command for docker service create mentioned in the below docs to test it locally:
-		// https://docs.dokploy.com/docs/core/manual-installation
+	} catch (error) {
+		// TODO: Docker versions 29.0.0 change the way to get the service image digest, so we need to update this in the future we upgrade to that version.
 		return DEFAULT_UPDATE_DATA;
 	}
 

packages/server/src/setup/postgres-setup.ts

@@ -17,7 +17,7 @@ export const initializePostgres = async () => {
 				Mounts: [
 					{
 						Type: "volume",
-						Source: "dokploy-postgres-database",
+						Source: "dokploy-postgres",
 						Target: "/var/lib/postgresql/data",
 					},
 				],

packages/server/src/setup/redis-setup.ts

@@ -14,7 +14,7 @@ export const initializeRedis = async () => {
 				Mounts: [
 					{
 						Type: "volume",
-						Source: "redis-data-volume",
+						Source: "dokploy-redis",
 						Target: "/data",
 					},
 				],

packages/server/src/setup/server-setup.ts

@@ -51,7 +51,12 @@ export const serverSetup = async (
 	});
 
 	try {
-		onData?.("\nInstalling Server Dependencies: ✅\n");
+		const isBuildServer = server.serverType === "build";
+		onData?.(
+			isBuildServer
+				? "\nInstalling Build Server Dependencies: ✅\n"
+				: "\nInstalling Server Dependencies: ✅\n",
+		);
 		await installRequirements(serverId, onData);
 
 		await updateDeploymentStatus(deployment.deploymentId, "done");
@@ -65,7 +70,7 @@ export const serverSetup = async (
 	}
 };
 
-export const defaultCommand = () => {
+export const defaultCommand = (isBuildServer = false) => {
 	const bashCommand = `
 set -e;
 DOCKER_VERSION=27.0.3
@@ -126,6 +131,7 @@ echo -e "---------------------------------------------"
 echo "| CPU Architecture  | $SYS_ARCH"
 echo "| Operating System  | $OS_TYPE $OS_VERSION"
 echo "| Docker            | $DOCKER_VERSION"
+${isBuildServer ? 'echo "| Server Type       | Build Server"' : ""}
 echo -e "---------------------------------------------\n"
 echo -e "1. Installing required packages (curl, wget, git, jq, openssl). "
 
@@ -135,6 +141,9 @@ command_exists() {
 
 ${installUtilities()}
 
+${
+	!isBuildServer
+		? `
 echo -e "2. Validating ports. "
 ${validatePorts()}
 
@@ -173,6 +182,25 @@ ${installBuildpacks()}
 
 echo -e "13. Installing Railpack"
 ${installRailpack()}
+`
+		: `
+echo -e "2. Installing Docker. "
+${installDocker()}
+
+echo -e "3. Setting up Directories"
+${setupMainDirectory()}
+${setupDirectories()}
+
+echo -e "4. Installing Nixpacks"
+${installNixpacks()}
+
+echo -e "5. Installing Buildpacks"
+${installBuildpacks()}
+
+echo -e "6. Installing Railpack"
+${installRailpack()}
+`
+}
 				`;
 
 	return bashCommand;
@@ -189,10 +217,12 @@ const installRequirements = async (
 		throw new Error("No SSH Key found");
 	}
 
+	const isBuildServer = server.serverType === "build";
+
 	return new Promise<void>((resolve, reject) => {
 		client
 			.once("ready", () => {
-				const command = server.command || defaultCommand();
+				const command = server.command || defaultCommand(isBuildServer);
 				client.exec(command, (err, stream) => {
 					if (err) {
 						onData?.(err.message);

packages/server/src/utils/builders/compose.ts

@@ -2,7 +2,8 @@ import { dirname, join } from "node:path";
 import { paths } from "@dokploy/server/constants";
 import type { InferResultType } from "@dokploy/server/types/with";
 import boxen from "boxen";
-import { writeDomainsToComposeRemote } from "../docker/domain";
+import { quote } from "shell-quote";
+import { writeDomainsToCompose } from "../docker/domain";
 import {
 	encodeBase64,
 	getEnviromentVariablesObject,
@@ -22,7 +23,7 @@ export const getBuildComposeCommand = async (compose: ComposeNested) => {
 	const projectPath = join(COMPOSE_PATH, compose.appName, "code");
 	const exportEnvCommand = getExportEnvCommand(compose);
 
-	const newCompose = await writeDomainsToComposeRemote(compose, domains);
+	const newCompose = await writeDomainsToCompose(compose, domains);
 	const logContent = `
 App Name: ${appName}
 Build Compose 🐳
@@ -52,9 +53,8 @@ Compose Type: ${composeType} ✅`;
 	
 		cd "${projectPath}";
 
-        ${exportEnvCommand}
 		${compose.isolatedDeployment ? `docker network inspect ${compose.appName} >/dev/null 2>&1 || docker network create --attachable ${compose.appName}` : ""}
-		docker ${command.split(" ").join(" ")} 2>&1 || { echo "Error: ❌ Docker command failed"; exit 1; }
+		env -i PATH="$PATH" ${exportEnvCommand} docker ${command.split(" ").join(" ")} 2>&1 || { echo "Error: ❌ Docker command failed"; exit 1; }
 		${compose.isolatedDeployment ? `docker network connect ${compose.appName} $(docker ps --filter "name=dokploy-traefik" -q) >/dev/null 2>&1` : ""}
 	
 		echo "Docker Compose Deployed: ✅";
@@ -65,7 +65,6 @@ Compose Type: ${composeType} ✅`;
 	`;
 
 	return bashCommand;
-	// return await execAsyncRemote(compose.serverId, bashCommand);
 };
 
 const sanitizeCommand = (command: string) => {
@@ -137,8 +136,8 @@ const getExportEnvCommand = (compose: ComposeNested) => {
 		compose.environment.project.env,
 	);
 	const exports = Object.entries(envVars)
-		.map(([key, value]) => `export ${key}=${JSON.stringify(value)}`)
-		.join("\n");
+		.map(([key, value]) => `${key}=${quote([value])}`)
+		.join(" ");
 
-	return exports ? `\n# Export environment variables\n${exports}\n` : "";
+	return exports ? `${exports}` : "";
 };