Improve: Use consistent ExecOptions type and proper fallback for maxBuffer

Co-authored-by: Siumauricio <47042324+Siumauricio@users.noreply.github.com>

.github/workflows/pull-request.yml

@@ -24,14 +24,14 @@ jobs:
       - name: Install Nixpacks
         if: matrix.job == 'test'
         run:  |
-          export NIXPACKS_VERSION=1.41.0
+          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.4
+          export RAILPACK_VERSION=0.15.0
           curl -sSL https://railpack.com/install.sh | bash
           echo "Railpack installed $RAILPACK_VERSION"
       

.gitignore

@@ -43,7 +43,4 @@ yarn-error.log*
 *.pem
 
 
-.db
-
-# Development environment
-.devcontainer
+.db

CONTRIBUTING.md

@@ -148,7 +148,7 @@ curl -sSL https://railpack.com/install.sh | sh
 
 ```bash
 # Install Buildpacks
-curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.39.1/pack-v0.39.1-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack
+curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.35.0/pack-v0.35.0-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack
 ```
 
 ## Pull Request

Dockerfile

@@ -51,18 +51,18 @@ RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh --ver
 # Install Nixpacks and tsx
 # | VERBOSE=1 VERSION=1.21.0 bash
 
-ARG NIXPACKS_VERSION=1.41.0
+ARG NIXPACKS_VERSION=1.39.0
 RUN curl -sSL https://nixpacks.com/install.sh -o install.sh \
     && chmod +x install.sh \
     && ./install.sh \
     && pnpm install -g tsx
 
 # Install Railpack
-ARG RAILPACK_VERSION=0.15.4
+ARG RAILPACK_VERSION=0.2.2
 RUN curl -sSL https://railpack.com/install.sh | bash
 
 # Install buildpacks
-COPY --from=buildpacksio/pack:0.39.1 /usr/local/bin/pack /usr/local/bin/pack
+COPY --from=buildpacksio/pack:0.35.0 /usr/local/bin/pack /usr/local/bin/pack
 
 EXPOSE 3000
 CMD [ "pnpm", "start" ]

Dockerfile.cloud

@@ -60,4 +60,4 @@ RUN curl https://rclone.org/install.sh | bash
 RUN pnpm install -g tsx
 
 EXPOSE 3000
-CMD [ "pnpm", "start" ]
+CMD [ "pnpm", "start" ]

Dockerfile.schedule

@@ -35,5 +35,4 @@ COPY --from=build /prod/schedules/dist ./dist
 COPY --from=build /prod/schedules/package.json ./package.json
 COPY --from=build /prod/schedules/node_modules ./node_modules
 
-ENV HOSTNAME=0.0.0.0
-CMD ["pnpm", "start"]
+CMD HOSTNAME=0.0.0.0 && pnpm start

Dockerfile.server

@@ -35,5 +35,4 @@ COPY --from=build /prod/api/dist ./dist
 COPY --from=build /prod/api/package.json ./package.json
 COPY --from=build /prod/api/node_modules ./node_modules
 
-ENV HOSTNAME=0.0.0.0
-CMD ["pnpm", "start"]
+CMD HOSTNAME=0.0.0.0 && pnpm start

LICENSE.MD

@@ -1,13 +1,8 @@
-Copyright 2026-present Dokploy Technology, Inc.
+# License
 
-Portions of this software are licensed as follows:
+## Core License (Apache License 2.0)
 
-* All content that resides under a "/proprietary" directory of this repository, if that directory exists, is licensed under the license defined in "LICENSE_PROPRIETARY".
-* Content outside of the above mentioned directories or restrictions above is available under the "Apache License 2.0" license as defined below.
-
-## Apache License 2.0
-
-Copyright 2026-present Dokploy Technology, Inc.
+Copyright 2025 Mauricio Siu.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,4 +15,12 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and limitations under the License.
 
+## Additional Terms for Specific Features
 
+The following additional terms apply to the multi-node support, Docker Compose file, Preview Deployments and Multi Server features of Dokploy. In the event of a conflict, these provisions shall take precedence over those in the Apache License:
+
+- **Self-Hosted Version Free**: All features of Dokploy, including multi-node support, Docker Compose file support, Schedules, Preview Deployments and Multi Server, will always be free to use in the self-hosted version.
+- **Restriction on Resale**: The multi-node support, Docker Compose file support, Schedules, Preview Deployments and Multi Server features cannot be sold or offered as a service by any party other than the copyright holder without prior written consent.
+- **Modification Distribution**: Any modifications to the multi-node support, Docker Compose file support, Schedules, Preview Deployments and Multi Server features must be distributed freely and cannot be sold or offered as a service.
+
+For further inquiries or permissions, please contact us directly.

LICENSE_PROPRIETARY.md

@@ -1,11 +0,0 @@
-The Dokploy Source Available license (DSAL) version 1.0
-
-Copyright (c) 2026-present Dokploy Technology, Inc.
-
-With regard to the Dokploy Software:This software and associated documentation files (the "Software") may only beused in production, if you (and any entity that you represent) have agreed to, and are in compliance with, a valid commercial agreement from Dokploy.Subject to the foregoing sentence, you are free to modify this Software and publish patches to the Software. You agree that Dokploy and/or its licensors (as applicable) retain all right, title and interest in and to all such modifications and/or patches, and all such modifications and/or patches may only be used, copied, modified, displayed, distributed, or otherwise exploited with a valid Dokploy Source Available License.  Notwithstanding the foregoing, you may copy and modify the Software for development and testing purposes, without requiring a subscription.  You agree that Dokploy and/or its licensors (as applicable) retain all right, title and interest in and to all such modifications.  You are not granted any other rights beyond what is expressly stated herein.  Subject to theforegoing, it is forbidden to copy, merge, publish, distribute, sublicense,and/or sell the Software.
-
-This Dokploy Source Available license applies only to the part of this Software that is in a /proprietary folder. The full text of this License shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ORIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THEAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHERLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THESOFTWARE.
-
-For all third party components incorporated into the Dokploy Software, thosecomponents are licensed under the original license provided by the owner of the applicable component.

README.md

@@ -68,21 +68,53 @@ For detailed documentation, visit [docs.dokploy.com](https://docs.dokploy.com).
 
 [Github Sponsors](https://github.com/sponsors/Siumauricio)
 
-## Sponsors
+<!-- Hero Sponsors 🎖 -->
 
-| Sponsor | Logo | Supporter Level |
-|---------|:----:|----------------|
-| [Hostinger](https://www.hostinger.com/vps-hosting?ref=dokploy) | <img src=".github/sponsors/hostinger.jpg" alt="Hostinger" width="200"/> | 🎖 Hero Sponsor |
-| [LX Aer](https://www.lxaer.com/?ref=dokploy) | <img src=".github/sponsors/lxaer.png" alt="LX Aer" width="100"/> | 🎖 Hero Sponsor |
-| [LinkDR](https://linkdr.com/?ref=dokploy) | <img src="https://dokploy.com/linkdr-logo.svg" alt="LinkDR" width="100"/> | 🎖 Hero Sponsor |
-| [LambdaTest](https://www.lambdatest.com/?utm_source=dokploy&utm_medium=sponsor) | <img src="https://www.lambdatest.com/blue-logo.png" alt="LambdaTest" width="200"/> | 🎖 Hero Sponsor |
-| [Awesome Tools](https://awesome.tools/) | <img src=".github/sponsors/awesome.png" alt="Awesome Tools" width="100"/> | 🎖 Hero Sponsor |
-| [Supafort](https://supafort.com/?ref=dokploy) | <img src="https://supafort.com/build/q-4Ht4rBZR.webp" alt="Supafort.com" width="200"/> | 🥇 Premium Supporter |
-| [Agentdock](https://agentdock.ai/?ref=dokploy) | <img src=".github/sponsors/agentdock.png" alt="agentdock.ai" width="100"/> | 🥇 Premium Supporter |
-| [AmericanCloud](https://americancloud.com/?ref=dokploy) | <img src=".github/sponsors/american-cloud.png" alt="AmericanCloud" width="200"/> | 🥈 Elite Contributor |
-| [Tolgee](https://tolgee.io/?utm_source=github_dokploy&utm_medium=banner&utm_campaign=dokploy) | <img src="https://dokploy.com/tolgee-logo.png" alt="Tolgee" width="100"/> | 🥈 Elite Contributor |
-| [Cloudblast](https://cloudblast.io/?ref=dokploy) | <img src="https://cloudblast.io/img/logo-icon.193cf13e.svg" alt="Cloudblast.io" width="150"/> | 🥉 Supporting Member |
-| [Synexa](https://synexa.ai/?ref=dokploy) | <img src=".github/sponsors/synexa.png" alt="Synexa" width="100"/> | 🥉 Supporting Member |
+<!-- Add Hero Sponsors here -->
+
+### Hero Sponsors 🎖
+
+<div>
+  <a href="https://www.hostinger.com/vps-hosting?ref=dokploy"><img src=".github/sponsors/hostinger.jpg" alt="Hostinger" width="300"/></a>
+  <a href="https://www.lxaer.com/?ref=dokploy"><img src=".github/sponsors/lxaer.png" alt="LX Aer" width="100"/></a>
+        <a href="https://www.lambdatest.com/?utm_source=dokploy&utm_medium=sponsor" target="_blank">
+            <img src="https://www.lambdatest.com/blue-logo.png"  width="450" height="100" />
+        </a>
+        <a href="https://awesome.tools/" target="_blank">
+            <img src=".github/sponsors/awesome.png"  width="200" height="150" />
+        </a>
+</div>
+
+<!-- Premium Supporters 🥇 -->
+
+<!-- Add Premium Supporters here -->
+
+### Premium Supporters 🥇
+
+<div>
+  <a href="https://supafort.com/?ref=dokploy"><img src="https://supafort.com/build/q-4Ht4rBZR.webp" alt="Supafort.com" width="300"/></a>
+  <a href="https://agentdock.ai/?ref=dokploy"><img src=".github/sponsors/agentdock.png" alt="agentdock.ai" width="100"/></a>
+</div>
+
+<!-- Elite Contributors 🥈 -->
+
+<!-- Add Elite Contributors here -->
+
+### Elite Contributors 🥈
+
+<div>
+  <a href="https://americancloud.com/?ref=dokploy"><img src=".github/sponsors/american-cloud.png" alt="AmericanCloud" width="300"/></a>
+  <a href="https://tolgee.io/?utm_source=github_dokploy&utm_medium=banner&utm_campaign=dokploy"><img src="https://dokploy.com/tolgee-logo.png" alt="Tolgee" width="100"/></a>
+</div>
+
+### Supporting Members 🥉
+
+<div>
+
+  <a href="https://cloudblast.io/?ref=dokploy"><img src="https://cloudblast.io/img/logo-icon.193cf13e.svg" width="250px" alt="Cloudblast.io"/></a>
+
+  <a href="https://synexa.ai/?ref=dokploy"><img src=".github/sponsors/synexa.png" width="65px" alt="Synexa"/></a>
+</div>
 
 ### Community Backers 🤝
 

apps/api/package.json

@@ -13,6 +13,7 @@
 		"@dokploy/server": "workspace:*",
 		"@hono/node-server": "^1.14.3",
 		"@hono/zod-validator": "0.3.0",
+		"@nerimity/mimiqueue": "1.2.3",
 		"dotenv": "^16.4.5",
 		"hono": "^4.7.10",
 		"pino": "9.4.0",

apps/api/src/schema.ts

@@ -25,7 +25,7 @@ export const deployJobSchema = z.discriminatedUnion("applicationType", [
 		titleLog: z.string().optional(),
 		descriptionLog: z.string().optional(),
 		server: z.boolean().optional(),
-		type: z.enum(["deploy", "redeploy"]),
+		type: z.enum(["deploy"]),
 		applicationType: z.literal("application-preview"),
 		serverId: z.string().min(1),
 	}),

apps/api/src/utils.ts

@@ -4,7 +4,6 @@ import {
 	deployPreviewApplication,
 	rebuildApplication,
 	rebuildCompose,
-	rebuildPreviewApplication,
 	updateApplicationStatus,
 	updateCompose,
 	updatePreviewDeployment,
@@ -55,14 +54,7 @@ export const deploy = async (job: DeployJob) => {
 				previewStatus: "running",
 			});
 			if (job.server) {
-				if (job.type === "redeploy") {
-					await rebuildPreviewApplication({
-						applicationId: job.applicationId,
-						titleLog: job.titleLog || "Rebuild Preview Deployment",
-						descriptionLog: job.descriptionLog || "",
-						previewDeploymentId: job.previewDeploymentId,
-					});
-				} else if (job.type === "deploy") {
+				if (job.type === "deploy") {
 					await deployPreviewApplication({
 						applicationId: job.applicationId,
 						titleLog: job.titleLog || "Preview Deployment",

apps/dokploy/.env.production.example

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

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

@@ -25,11 +25,10 @@ if (typeof window === "undefined") {
 }
 
 const baseApp: ApplicationNested = {
-	railpackVersion: "0.15.4",
+	railpackVersion: "0.2.2",
 	applicationId: "",
 	previewLabels: [],
 	createEnvFile: true,
-	bitbucketRepositorySlug: "",
 	herokuVersion: "",
 	giteaBranch: "",
 	buildServerId: "",

apps/dokploy/__test__/env/environment-access-fallback.test.ts

@@ -1,294 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-// Type definitions matching the project structure
-type Environment = {
-	environmentId: string;
-	name: string;
-	isDefault: boolean;
-};
-
-type Project = {
-	projectId: string;
-	name: string;
-	environments: Environment[];
-};
-
-/**
- * Helper function that selects the appropriate environment for a user
- * This matches the logic used in search-command.tsx and show.tsx
- */
-function selectAccessibleEnvironment(
-	project: Project | null | undefined,
-): Environment | null {
-	if (!project || !project.environments || project.environments.length === 0) {
-		return null;
-	}
-
-	// Find default environment from accessible environments, or fall back to first accessible environment
-	const defaultEnvironment =
-		project.environments.find((environment) => environment.isDefault) ||
-		project.environments[0];
-
-	return defaultEnvironment || null;
-}
-
-describe("Environment Access Fallback", () => {
-	describe("selectAccessibleEnvironment", () => {
-		it("should return default environment when user has access to it", () => {
-			const project: Project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: [
-					{
-						environmentId: "env-prod",
-						name: "production",
-						isDefault: true,
-					},
-					{
-						environmentId: "env-dev",
-						name: "development",
-						isDefault: false,
-					},
-				],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).not.toBeNull();
-			expect(result?.environmentId).toBe("env-prod");
-			expect(result?.isDefault).toBe(true);
-		});
-
-		it("should return first accessible environment when user doesn't have access to default", () => {
-			// Simulating filtered environments (user only has access to development)
-			const project: Project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: [
-					// Note: production is not in the list because user doesn't have access
-					{
-						environmentId: "env-dev",
-						name: "development",
-						isDefault: false,
-					},
-					{
-						environmentId: "env-staging",
-						name: "staging",
-						isDefault: false,
-					},
-				],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).not.toBeNull();
-			expect(result?.environmentId).toBe("env-dev");
-			expect(result?.name).toBe("development");
-		});
-
-		it("should return first environment when no default is marked but environments exist", () => {
-			const project: Project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: [
-					{
-						environmentId: "env-dev",
-						name: "development",
-						isDefault: false,
-					},
-					{
-						environmentId: "env-staging",
-						name: "staging",
-						isDefault: false,
-					},
-				],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).not.toBeNull();
-			expect(result?.environmentId).toBe("env-dev");
-		});
-
-		it("should return null when project has no accessible environments", () => {
-			const project: Project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: [],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).toBeNull();
-		});
-
-		it("should return null when project is null", () => {
-			const result = selectAccessibleEnvironment(null);
-
-			expect(result).toBeNull();
-		});
-
-		it("should return null when project is undefined", () => {
-			const result = selectAccessibleEnvironment(undefined);
-
-			expect(result).toBeNull();
-		});
-
-		it("should handle project with single accessible environment", () => {
-			const project: Project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: [
-					{
-						environmentId: "env-dev",
-						name: "development",
-						isDefault: false,
-					},
-				],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).not.toBeNull();
-			expect(result?.environmentId).toBe("env-dev");
-		});
-
-		it("should prioritize default environment even when it's not first in the array", () => {
-			const project: Project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: [
-					{
-						environmentId: "env-dev",
-						name: "development",
-						isDefault: false,
-					},
-					{
-						environmentId: "env-staging",
-						name: "staging",
-						isDefault: false,
-					},
-					{
-						environmentId: "env-prod",
-						name: "production",
-						isDefault: true,
-					},
-				],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).not.toBeNull();
-			expect(result?.environmentId).toBe("env-prod");
-			expect(result?.isDefault).toBe(true);
-		});
-
-		it("should handle multiple default environments by returning the first one found", () => {
-			// Edge case: multiple environments marked as default (shouldn't happen, but test it)
-			const project: Project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: [
-					{
-						environmentId: "env-prod-1",
-						name: "production-1",
-						isDefault: true,
-					},
-					{
-						environmentId: "env-prod-2",
-						name: "production-2",
-						isDefault: true,
-					},
-				],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).not.toBeNull();
-			expect(result?.isDefault).toBe(true);
-			// Should return the first default found
-			expect(result?.environmentId).toBe("env-prod-1");
-		});
-
-		it("should work correctly when user has access to multiple environments including default", () => {
-			const project: Project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: [
-					{
-						environmentId: "env-prod",
-						name: "production",
-						isDefault: true,
-					},
-					{
-						environmentId: "env-dev",
-						name: "development",
-						isDefault: false,
-					},
-					{
-						environmentId: "env-staging",
-						name: "staging",
-						isDefault: false,
-					},
-				],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).not.toBeNull();
-			expect(result?.environmentId).toBe("env-prod");
-			expect(result?.isDefault).toBe(true);
-		});
-
-		it("should handle real-world scenario: user with only development access", () => {
-			// This simulates the exact bug we're fixing:
-			// User has access to development but not production (default)
-			// The filtered environments array only contains development
-			const project: Project = {
-				projectId: "proj-1",
-				name: "My Project",
-				environments: [
-					// Only development is accessible (production was filtered out)
-					{
-						environmentId: "env-dev-123",
-						name: "development",
-						isDefault: false,
-					},
-				],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).not.toBeNull();
-			expect(result?.environmentId).toBe("env-dev-123");
-			expect(result?.name).toBe("development");
-			// Should not be null even though it's not the default
-		});
-	});
-
-	describe("Environment selection edge cases", () => {
-		it("should handle project with environments property as undefined", () => {
-			const project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: undefined,
-			} as unknown as Project;
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).toBeNull();
-		});
-
-		it("should handle project with null environments array", () => {
-			const project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: null,
-			} as unknown as Project;
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).toBeNull();
-		});
-	});
-});

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

@@ -1,184 +0,0 @@
-import { getEnviromentVariablesObject } from "@dokploy/server/index";
-import { describe, expect, it } from "vitest";
-
-const projectEnv = `
-ENVIRONMENT=staging
-DATABASE_URL=postgres://postgres:postgres@localhost:5432/project_db
-PORT=3000
-`;
-
-const environmentEnv = `
-NODE_ENV=development
-API_URL=https://api.dev.example.com
-REDIS_URL=redis://localhost:6379
-DATABASE_NAME=dev_database
-SECRET_KEY=env-secret-123
-`;
-
-describe("getEnviromentVariablesObject with environment variables (Stack compose)", () => {
-	it("resolves environment variables correctly for Stack compose", () => {
-		const serviceEnv = `
-FOO=\${{environment.NODE_ENV}}
-BAR=\${{environment.API_URL}}
-BAZ=test
-`;
-
-		const result = getEnviromentVariablesObject(
-			serviceEnv,
-			projectEnv,
-			environmentEnv,
-		);
-
-		expect(result).toEqual({
-			FOO: "development",
-			BAR: "https://api.dev.example.com",
-			BAZ: "test",
-		});
-	});
-
-	it("resolves both project and environment variables for Stack compose", () => {
-		const serviceEnv = `
-ENVIRONMENT=\${{project.ENVIRONMENT}}
-NODE_ENV=\${{environment.NODE_ENV}}
-API_URL=\${{environment.API_URL}}
-DATABASE_URL=\${{project.DATABASE_URL}}
-SERVICE_PORT=4000
-`;
-
-		const result = getEnviromentVariablesObject(
-			serviceEnv,
-			projectEnv,
-			environmentEnv,
-		);
-
-		expect(result).toEqual({
-			ENVIRONMENT: "staging",
-			NODE_ENV: "development",
-			API_URL: "https://api.dev.example.com",
-			DATABASE_URL: "postgres://postgres:postgres@localhost:5432/project_db",
-			SERVICE_PORT: "4000",
-		});
-	});
-
-	it("handles multiple environment references in single value for Stack compose", () => {
-		const multiRefEnv = `
-HOST=localhost
-PORT=5432
-USERNAME=postgres
-PASSWORD=secret123
-`;
-
-		const serviceEnv = `
-DATABASE_URL=postgresql://\${{environment.USERNAME}}:\${{environment.PASSWORD}}@\${{environment.HOST}}:\${{environment.PORT}}/mydb
-`;
-
-		const result = getEnviromentVariablesObject(serviceEnv, "", multiRefEnv);
-
-		expect(result).toEqual({
-			DATABASE_URL: "postgresql://postgres:secret123@localhost:5432/mydb",
-		});
-	});
-
-	it("throws error for undefined environment variables in Stack compose", () => {
-		const serviceWithUndefined = `
-UNDEFINED_VAR=\${{environment.UNDEFINED_VAR}}
-`;
-
-		expect(() =>
-			getEnviromentVariablesObject(serviceWithUndefined, "", environmentEnv),
-		).toThrow("Invalid environment variable: environment.UNDEFINED_VAR");
-	});
-
-	it("allows service variables to override environment variables in Stack compose", () => {
-		const serviceOverrideEnv = `
-NODE_ENV=production
-API_URL=\${{environment.API_URL}}
-`;
-
-		const result = getEnviromentVariablesObject(
-			serviceOverrideEnv,
-			"",
-			environmentEnv,
-		);
-
-		expect(result).toEqual({
-			NODE_ENV: "production",
-			API_URL: "https://api.dev.example.com",
-		});
-	});
-
-	it("resolves complex references with project, environment, and service variables for Stack compose", () => {
-		const complexServiceEnv = `
-FULL_DATABASE_URL=\${{project.DATABASE_URL}}/\${{environment.DATABASE_NAME}}
-API_ENDPOINT=\${{environment.API_URL}}/\${{project.ENVIRONMENT}}/api
-SERVICE_NAME=my-service
-COMPLEX_VAR=\${{SERVICE_NAME}}-\${{environment.NODE_ENV}}-\${{project.ENVIRONMENT}}
-`;
-
-		const result = getEnviromentVariablesObject(
-			complexServiceEnv,
-			projectEnv,
-			environmentEnv,
-		);
-
-		expect(result).toEqual({
-			FULL_DATABASE_URL:
-				"postgres://postgres:postgres@localhost:5432/project_db/dev_database",
-			API_ENDPOINT: "https://api.dev.example.com/staging/api",
-			SERVICE_NAME: "my-service",
-			COMPLEX_VAR: "my-service-development-staging",
-		});
-	});
-
-	it("maintains precedence: service > environment > project in Stack compose", () => {
-		const conflictingProjectEnv = `
-NODE_ENV=production-project
-API_URL=https://project.api.com
-DATABASE_NAME=project_db
-`;
-
-		const conflictingEnvironmentEnv = `
-NODE_ENV=development-environment
-API_URL=https://environment.api.com
-DATABASE_NAME=env_db
-`;
-
-		const serviceWithConflicts = `
-NODE_ENV=service-override
-PROJECT_ENV=\${{project.NODE_ENV}}
-ENV_VAR=\${{environment.API_URL}}
-DB_NAME=\${{environment.DATABASE_NAME}}
-`;
-
-		const result = getEnviromentVariablesObject(
-			serviceWithConflicts,
-			conflictingProjectEnv,
-			conflictingEnvironmentEnv,
-		);
-
-		expect(result).toEqual({
-			NODE_ENV: "service-override",
-			PROJECT_ENV: "production-project",
-			ENV_VAR: "https://environment.api.com",
-			DB_NAME: "env_db",
-		});
-	});
-
-	it("handles empty environment variables in Stack compose", () => {
-		const serviceWithEmpty = `
-SERVICE_VAR=test
-PROJECT_VAR=\${{project.ENVIRONMENT}}
-`;
-
-		const result = getEnviromentVariablesObject(
-			serviceWithEmpty,
-			projectEnv,
-			"",
-		);
-
-		expect(result).toEqual({
-			SERVICE_VAR: "test",
-			PROJECT_VAR: "staging",
-		});
-	});
-});

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

@@ -3,12 +3,11 @@ import { createRouterConfig } from "@dokploy/server";
 import { expect, test } from "vitest";
 
 const baseApp: ApplicationNested = {
-	railpackVersion: "0.15.4",
+	railpackVersion: "0.2.2",
 	rollbackActive: false,
 	applicationId: "",
 	previewLabels: [],
 	createEnvFile: true,
-	bitbucketRepositorySlug: "",
 	herokuVersion: "",
 	giteaRepository: "",
 	giteaOwner: "",

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/endpoint-spec-form.tsx

@@ -1,154 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
-import { api } from "@/utils/api";
-
-export const endpointSpecFormSchema = z.object({
-	Mode: z.string().optional(),
-});
-
-interface EndpointSpecFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const EndpointSpecForm = ({ id, type }: EndpointSpecFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		resolver: zodResolver(endpointSpecFormSchema),
-		defaultValues: {
-			Mode: undefined,
-		},
-	});
-
-	useEffect(() => {
-		if (data?.endpointSpecSwarm) {
-			const es = data.endpointSpecSwarm;
-			form.reset({
-				Mode: es.Mode,
-			});
-		}
-	}, [data, form]);
-
-	const onSubmit = async (formData: z.infer<typeof endpointSpecFormSchema>) => {
-		setIsLoading(true);
-		try {
-			// Check if all values are empty, if so, send null to clear the database
-			const hasAnyValue =
-				formData.Mode !== undefined &&
-				formData.Mode !== null &&
-				formData.Mode !== "";
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				endpointSpecSwarm: hasAnyValue ? formData : null,
-			});
-
-			toast.success("Endpoint spec updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating endpoint spec");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<FormField
-					control={form.control}
-					name="Mode"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Mode</FormLabel>
-							<FormDescription>Endpoint mode (vip or dnsrr)</FormDescription>
-							<Select onValueChange={field.onChange} value={field.value}>
-								<FormControl>
-									<SelectTrigger>
-										<SelectValue placeholder="Select endpoint mode" />
-									</SelectTrigger>
-								</FormControl>
-								<SelectContent>
-									<SelectItem value="vip">VIP (Virtual IP)</SelectItem>
-									<SelectItem value="dnsrr">DNS Round Robin</SelectItem>
-								</SelectContent>
-							</Select>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({
-								Mode: undefined,
-							});
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Endpoint Spec
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/health-check-form.tsx

@@ -1,270 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { api } from "@/utils/api";
-
-export const healthCheckFormSchema = z.object({
-	Test: z.array(z.string()).optional(),
-	Interval: z.coerce.number().optional(),
-	Timeout: z.coerce.number().optional(),
-	StartPeriod: z.coerce.number().optional(),
-	Retries: z.coerce.number().optional(),
-});
-
-interface HealthCheckFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const HealthCheckForm = ({ id, type }: HealthCheckFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		resolver: zodResolver(healthCheckFormSchema),
-		defaultValues: {
-			Test: [],
-			Interval: undefined,
-			Timeout: undefined,
-			StartPeriod: undefined,
-			Retries: undefined,
-		},
-	});
-
-	const testCommands = form.watch("Test") || [];
-
-	useEffect(() => {
-		if (data?.healthCheckSwarm) {
-			const hc = data.healthCheckSwarm;
-			form.reset({
-				Test: hc.Test || [],
-				Interval: hc.Interval,
-				Timeout: hc.Timeout,
-				StartPeriod: hc.StartPeriod,
-				Retries: hc.Retries,
-			});
-		}
-	}, [data, form]);
-
-	const onSubmit = async (formData: z.infer<typeof healthCheckFormSchema>) => {
-		setIsLoading(true);
-		try {
-			// Check if all values are empty, if so, send null to clear the database
-			const hasAnyValue =
-				(formData.Test && formData.Test.length > 0) ||
-				formData.Interval !== undefined ||
-				formData.Timeout !== undefined ||
-				formData.StartPeriod !== undefined ||
-				formData.Retries !== undefined;
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				healthCheckSwarm: hasAnyValue ? formData : null,
-			});
-
-			toast.success("Health check updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating health check");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	const addTestCommand = () => {
-		form.setValue("Test", [...testCommands, ""]);
-	};
-
-	const updateTestCommand = (index: number, value: string) => {
-		const newCommands = [...testCommands];
-		newCommands[index] = value;
-		form.setValue("Test", newCommands);
-	};
-
-	const removeTestCommand = (index: number) => {
-		form.setValue(
-			"Test",
-			testCommands.filter((_: string, i: number) => i !== index),
-		);
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<div>
-					<FormLabel>Test Commands</FormLabel>
-					<FormDescription>
-						Command to run for health check (e.g., ["CMD-SHELL", "curl -f
-						http://localhost:3000/health"])
-					</FormDescription>
-					<div className="space-y-2 mt-2">
-						{testCommands.map((cmd: string, index: number) => (
-							<div key={index} className="flex gap-2">
-								<Input
-									value={cmd}
-									onChange={(e) => updateTestCommand(index, e.target.value)}
-									placeholder={
-										index === 0
-											? "CMD-SHELL"
-											: "curl -f http://localhost:3000/health"
-									}
-								/>
-								<Button
-									type="button"
-									variant="destructive"
-									size="sm"
-									onClick={() => removeTestCommand(index)}
-								>
-									Remove
-								</Button>
-							</div>
-						))}
-						<Button
-							type="button"
-							variant="outline"
-							size="sm"
-							onClick={addTestCommand}
-						>
-							Add Command
-						</Button>
-					</div>
-				</div>
-
-				<FormField
-					control={form.control}
-					name="Interval"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Interval (nanoseconds)</FormLabel>
-							<FormDescription>
-								Time between health checks (e.g., 10000000000 for 10 seconds)
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Timeout"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Timeout (nanoseconds)</FormLabel>
-							<FormDescription>
-								Maximum time to wait for health check response
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="StartPeriod"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Start Period (nanoseconds)</FormLabel>
-							<FormDescription>
-								Initial grace period before health checks begin
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Retries"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Retries</FormLabel>
-							<FormDescription>
-								Number of consecutive failures needed to consider container
-								unhealthy
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="3" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({
-								Test: [],
-								Interval: undefined,
-								Timeout: undefined,
-								StartPeriod: undefined,
-								Retries: undefined,
-							});
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Health Check
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/index.ts

@@ -1,10 +0,0 @@
-export { EndpointSpecForm } from "./endpoint-spec-form";
-export { HealthCheckForm } from "./health-check-form";
-export { LabelsForm } from "./labels-form";
-export { ModeForm } from "./mode-form";
-export { PlacementForm } from "./placement-form";
-export { RestartPolicyForm } from "./restart-policy-form";
-export { RollbackConfigForm } from "./rollback-config-form";
-export { StopGracePeriodForm } from "./stop-grace-period-form";
-export { UpdateConfigForm } from "./update-config-form";
-export { filterEmptyValues, hasValues } from "./utils";

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/labels-form.tsx

@@ -1,200 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useFieldArray, useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { api } from "@/utils/api";
-
-export const labelsFormSchema = z.object({
-	labels: z
-		.array(
-			z.object({
-				key: z.string(),
-				value: z.string(),
-			}),
-		)
-		.optional(),
-});
-
-interface LabelsFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const LabelsForm = ({ id, type }: LabelsFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		resolver: zodResolver(labelsFormSchema),
-		defaultValues: {
-			labels: [],
-		},
-	});
-
-	const { fields, append, remove } = useFieldArray({
-		control: form.control,
-		name: "labels",
-	});
-
-	useEffect(() => {
-		if (data?.labelsSwarm && typeof data.labelsSwarm === "object") {
-			const labelEntries = Object.entries(data.labelsSwarm).map(
-				([key, value]) => ({
-					key,
-					value: value as string,
-				}),
-			);
-			form.reset({ labels: labelEntries });
-		}
-	}, [data, form]);
-
-	const onSubmit = async (formData: z.infer<typeof labelsFormSchema>) => {
-		setIsLoading(true);
-		try {
-			const labelsObject =
-				formData.labels?.reduce(
-					(acc, { key, value }) => {
-						if (key && value) {
-							acc[key] = value;
-						}
-						return acc;
-					},
-					{} as Record<string, string>,
-				) || {};
-
-			// If no labels, send null to clear the database
-			const labelsToSend =
-				Object.keys(labelsObject).length > 0 ? labelsObject : null;
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				labelsSwarm: labelsToSend,
-			});
-
-			toast.success("Labels updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating labels");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<div>
-					<FormLabel>Labels</FormLabel>
-					<FormDescription>
-						Add key-value labels to your service
-					</FormDescription>
-					<div className="space-y-2 mt-2">
-						{fields.map((field, index) => (
-							<div key={field.id} className="flex gap-2">
-								<FormField
-									control={form.control}
-									name={`labels.${index}.key`}
-									render={({ field }) => (
-										<FormItem className="flex-1">
-											<FormControl>
-												<Input {...field} placeholder="com.example.app.name" />
-											</FormControl>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-								<FormField
-									control={form.control}
-									name={`labels.${index}.value`}
-									render={({ field }) => (
-										<FormItem className="flex-1">
-											<FormControl>
-												<Input {...field} placeholder="my-app" />
-											</FormControl>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-								<Button
-									type="button"
-									variant="destructive"
-									size="sm"
-									onClick={() => remove(index)}
-								>
-									Remove
-								</Button>
-							</div>
-						))}
-						<Button
-							type="button"
-							variant="outline"
-							size="sm"
-							onClick={() => append({ key: "", value: "" })}
-						>
-							Add Label
-						</Button>
-					</div>
-				</div>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({ labels: [] });
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Labels
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/mode-form.tsx

@@ -1,195 +0,0 @@
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
-import { api } from "@/utils/api";
-
-interface ModeFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const ModeForm = ({ id, type }: ModeFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		defaultValues: {
-			type: undefined,
-			Replicas: undefined,
-		},
-	});
-
-	const modeType = form.watch("type");
-
-	useEffect(() => {
-		if (data?.modeSwarm) {
-			const mode = data.modeSwarm;
-			if (mode.Replicated) {
-				form.reset({
-					type: "Replicated",
-					Replicas: mode.Replicated.Replicas,
-				});
-			} else if (mode.Global) {
-				form.reset({
-					type: "Global",
-					Replicas: undefined,
-				});
-			}
-		}
-	}, [data, form]);
-
-	const onSubmit = async (formData: any) => {
-		setIsLoading(true);
-		try {
-			// If no type is selected, send null to clear the database
-			if (!formData.type) {
-				await mutateAsync({
-					applicationId: id || "",
-					postgresId: id || "",
-					redisId: id || "",
-					mysqlId: id || "",
-					mariadbId: id || "",
-					mongoId: id || "",
-					modeSwarm: null,
-				});
-				toast.success("Mode updated successfully");
-				refetch();
-				setIsLoading(false);
-				return;
-			}
-
-			const modeData =
-				formData.type === "Replicated"
-					? { Replicated: { Replicas: formData.Replicas } }
-					: { Global: {} };
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				modeSwarm: modeData,
-			});
-
-			toast.success("Mode updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating mode");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<FormField
-					control={form.control}
-					name="type"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Mode Type</FormLabel>
-							<FormDescription>
-								Choose between replicated or global service mode
-							</FormDescription>
-							<Select onValueChange={field.onChange} value={field.value}>
-								<FormControl>
-									<SelectTrigger>
-										<SelectValue placeholder="Select mode type" />
-									</SelectTrigger>
-								</FormControl>
-								<SelectContent>
-									<SelectItem value="Replicated">Replicated</SelectItem>
-									<SelectItem value="Global">Global</SelectItem>
-								</SelectContent>
-							</Select>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				{modeType === "Replicated" && (
-					<FormField
-						control={form.control}
-						name="Replicas"
-						render={({ field }) => (
-							<FormItem>
-								<FormLabel>Replicas</FormLabel>
-								<FormDescription>Number of replicas to run</FormDescription>
-								<FormControl>
-									<Input type="number" placeholder="1" {...field} />
-								</FormControl>
-								<FormMessage />
-							</FormItem>
-						)}
-					/>
-				)}
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({
-								type: undefined,
-								Replicas: undefined,
-							});
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Mode
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/placement-form.tsx

@@ -1,347 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { api } from "@/utils/api";
-
-const PreferenceSchema = z.object({
-	SpreadDescriptor: z.string(),
-});
-
-const PlatformSchema = z.object({
-	Architecture: z.string(),
-	OS: z.string(),
-});
-
-export const placementFormSchema = z.object({
-	Constraints: z.array(z.string()).optional(),
-	Preferences: z.array(PreferenceSchema).optional(),
-	MaxReplicas: z.coerce.number().optional(),
-	Platforms: z.array(PlatformSchema).optional(),
-});
-
-interface PlacementFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const PlacementForm = ({ id, type }: PlacementFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		resolver: zodResolver(placementFormSchema),
-		defaultValues: {
-			Constraints: [],
-			Preferences: [],
-			MaxReplicas: undefined,
-			Platforms: [],
-		},
-	});
-
-	const constraints = form.watch("Constraints") || [];
-	const preferences = form.watch("Preferences") || [];
-	const platforms = form.watch("Platforms") || [];
-
-	useEffect(() => {
-		if (data?.placementSwarm) {
-			const placement = data.placementSwarm;
-			form.reset({
-				Constraints: placement.Constraints || [],
-				Preferences:
-					placement.Preferences?.map((p: any) => ({
-						SpreadDescriptor: p.Spread?.SpreadDescriptor || "",
-					})) || [],
-				MaxReplicas: placement.MaxReplicas,
-				Platforms: placement.Platforms || [],
-			});
-		}
-	}, [data, form]);
-
-	const onSubmit = async (formData: z.infer<typeof placementFormSchema>) => {
-		setIsLoading(true);
-		try {
-			// Check if all values are empty, if so, send null to clear the database
-			const hasAnyValue =
-				(formData.Constraints && formData.Constraints.length > 0) ||
-				(formData.Preferences && formData.Preferences.length > 0) ||
-				(formData.Platforms && formData.Platforms.length > 0) ||
-				formData.MaxReplicas !== undefined;
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				placementSwarm: hasAnyValue
-					? {
-							...formData,
-							Preferences: formData.Preferences?.map((p) => ({
-								Spread: { SpreadDescriptor: p.SpreadDescriptor },
-							})),
-						}
-					: null,
-			});
-
-			toast.success("Placement updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating placement");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	const addConstraint = () => {
-		form.setValue("Constraints", [...constraints, ""]);
-	};
-
-	const updateConstraint = (index: number, value: string) => {
-		const newConstraints = [...constraints];
-		newConstraints[index] = value;
-		form.setValue("Constraints", newConstraints);
-	};
-
-	const removeConstraint = (index: number) => {
-		form.setValue(
-			"Constraints",
-			constraints.filter((_: string, i: number) => i !== index),
-		);
-	};
-
-	const addPreference = () => {
-		form.setValue("Preferences", [...preferences, { SpreadDescriptor: "" }]);
-	};
-
-	const updatePreference = (index: number, value: string) => {
-		const newPreferences = [...preferences];
-		if (newPreferences[index]) {
-			newPreferences[index].SpreadDescriptor = value;
-			form.setValue("Preferences", newPreferences);
-		}
-	};
-
-	const removePreference = (index: number) => {
-		form.setValue(
-			"Preferences",
-			preferences.filter((_: any, i: number) => i !== index),
-		);
-	};
-
-	const addPlatform = () => {
-		form.setValue("Platforms", [...platforms, { Architecture: "", OS: "" }]);
-	};
-
-	const updatePlatform = (
-		index: number,
-		field: "Architecture" | "OS",
-		value: string,
-	) => {
-		const newPlatforms = [...platforms];
-		if (newPlatforms[index]) {
-			newPlatforms[index][field] = value;
-			form.setValue("Platforms", newPlatforms);
-		}
-	};
-
-	const removePlatform = (index: number) => {
-		form.setValue(
-			"Platforms",
-			platforms.filter((_: any, i: number) => i !== index),
-		);
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<div>
-					<FormLabel>Constraints</FormLabel>
-					<FormDescription>
-						Placement constraints (e.g., "node.role==manager")
-					</FormDescription>
-					<div className="space-y-2 mt-2">
-						{constraints.map((constraint: string, index: number) => (
-							<div key={index} className="flex gap-2">
-								<Input
-									value={constraint}
-									onChange={(e) => updateConstraint(index, e.target.value)}
-									placeholder="node.role==manager"
-								/>
-								<Button
-									type="button"
-									variant="destructive"
-									size="sm"
-									onClick={() => removeConstraint(index)}
-								>
-									Remove
-								</Button>
-							</div>
-						))}
-						<Button
-							type="button"
-							variant="outline"
-							size="sm"
-							onClick={addConstraint}
-						>
-							Add Constraint
-						</Button>
-					</div>
-				</div>
-
-				<div>
-					<FormLabel>Preferences</FormLabel>
-					<FormDescription>
-						Spread preferences for task distribution (e.g.,
-						"node.labels.region")
-					</FormDescription>
-					<div className="space-y-2 mt-2">
-						{preferences.map((pref: any, index: number) => (
-							<div key={index} className="flex gap-2">
-								<Input
-									value={pref.SpreadDescriptor}
-									onChange={(e) => updatePreference(index, e.target.value)}
-									placeholder="node.labels.region"
-								/>
-								<Button
-									type="button"
-									variant="destructive"
-									size="sm"
-									onClick={() => removePreference(index)}
-								>
-									Remove
-								</Button>
-							</div>
-						))}
-						<Button
-							type="button"
-							variant="outline"
-							size="sm"
-							onClick={addPreference}
-						>
-							Add Preference
-						</Button>
-					</div>
-				</div>
-
-				<FormField
-					control={form.control}
-					name="MaxReplicas"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Max Replicas</FormLabel>
-							<FormDescription>
-								Maximum number of replicas per node
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<div>
-					<FormLabel>Platforms</FormLabel>
-					<FormDescription>
-						Target platforms for task scheduling
-					</FormDescription>
-					<div className="space-y-2 mt-2">
-						{platforms.map((platform: any, index: number) => (
-							<div key={index} className="flex gap-2">
-								<Input
-									value={platform.Architecture}
-									onChange={(e) =>
-										updatePlatform(index, "Architecture", e.target.value)
-									}
-									placeholder="amd64"
-								/>
-								<Input
-									value={platform.OS}
-									onChange={(e) => updatePlatform(index, "OS", e.target.value)}
-									placeholder="linux"
-								/>
-								<Button
-									type="button"
-									variant="destructive"
-									size="sm"
-									onClick={() => removePlatform(index)}
-								>
-									Remove
-								</Button>
-							</div>
-						))}
-						<Button
-							type="button"
-							variant="outline"
-							size="sm"
-							onClick={addPlatform}
-						>
-							Add Platform
-						</Button>
-					</div>
-				</div>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({
-								Constraints: [],
-								Preferences: [],
-								MaxReplicas: undefined,
-								Platforms: [],
-							});
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Placement
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/restart-policy-form.tsx

@@ -1,219 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
-import { api } from "@/utils/api";
-
-export const restartPolicyFormSchema = z.object({
-	Condition: z.string().optional(),
-	Delay: z.coerce.number().optional(),
-	MaxAttempts: z.coerce.number().optional(),
-	Window: z.coerce.number().optional(),
-});
-
-interface RestartPolicyFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const RestartPolicyForm = ({ id, type }: RestartPolicyFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		resolver: zodResolver(restartPolicyFormSchema),
-		defaultValues: {
-			Condition: undefined,
-			Delay: undefined,
-			MaxAttempts: undefined,
-			Window: undefined,
-		},
-	});
-
-	useEffect(() => {
-		if (data?.restartPolicySwarm) {
-			form.reset({
-				Condition: data.restartPolicySwarm.Condition,
-				Delay: data.restartPolicySwarm.Delay,
-				MaxAttempts: data.restartPolicySwarm.MaxAttempts,
-				Window: data.restartPolicySwarm.Window,
-			});
-		}
-	}, [data, form]);
-
-	const onSubmit = async (
-		formData: z.infer<typeof restartPolicyFormSchema>,
-	) => {
-		setIsLoading(true);
-		try {
-			// Check if all values are empty, if so, send null to clear the database
-			const hasAnyValue = Object.values(formData).some(
-				(value) => value !== undefined && value !== null && value !== "",
-			);
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				restartPolicySwarm: hasAnyValue ? formData : null,
-			});
-
-			toast.success("Restart policy updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating restart policy");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<FormField
-					control={form.control}
-					name="Condition"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Condition</FormLabel>
-							<FormDescription>When to restart the container</FormDescription>
-							<Select onValueChange={field.onChange} value={field.value}>
-								<FormControl>
-									<SelectTrigger>
-										<SelectValue placeholder="Select restart condition" />
-									</SelectTrigger>
-								</FormControl>
-								<SelectContent>
-									<SelectItem value="none">None</SelectItem>
-									<SelectItem value="on-failure">On Failure</SelectItem>
-									<SelectItem value="any">Any</SelectItem>
-								</SelectContent>
-							</Select>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Delay"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Delay (nanoseconds)</FormLabel>
-							<FormDescription>
-								Wait time between restart attempts
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="MaxAttempts"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Max Attempts</FormLabel>
-							<FormDescription>
-								Maximum number of restart attempts
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="3" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Window"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Window (nanoseconds)</FormLabel>
-							<FormDescription>
-								Time window to evaluate restart policy
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({
-								Condition: undefined,
-								Delay: undefined,
-								MaxAttempts: undefined,
-								Window: undefined,
-							});
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Restart Policy
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/rollback-config-form.tsx

@@ -1,257 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
-import { api } from "@/utils/api";
-
-export const rollbackConfigFormSchema = z.object({
-	Parallelism: z.coerce.number().optional(),
-	Delay: z.coerce.number().optional(),
-	FailureAction: z.string().optional(),
-	Monitor: z.coerce.number().optional(),
-	MaxFailureRatio: z.coerce.number().optional(),
-	Order: z.string().optional(),
-});
-
-interface RollbackConfigFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const RollbackConfigForm = ({ id, type }: RollbackConfigFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		resolver: zodResolver(rollbackConfigFormSchema),
-		defaultValues: {
-			Parallelism: undefined,
-			Delay: undefined,
-			FailureAction: undefined,
-			Monitor: undefined,
-			MaxFailureRatio: undefined,
-			Order: undefined,
-		},
-	});
-
-	useEffect(() => {
-		if (data?.rollbackConfigSwarm) {
-			form.reset(data.rollbackConfigSwarm);
-		}
-	}, [data, form]);
-
-	const onSubmit = async (
-		formData: z.infer<typeof rollbackConfigFormSchema>,
-	) => {
-		setIsLoading(true);
-		try {
-			// Check if all values are empty, if so, send null to clear the database
-			const hasAnyValue = Object.values(formData).some(
-				(value) => value !== undefined && value !== null && value !== "",
-			);
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				rollbackConfigSwarm: (hasAnyValue ? formData : null) as any,
-			});
-
-			toast.success("Rollback config updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating rollback config");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<FormField
-					control={form.control}
-					name="Parallelism"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Parallelism</FormLabel>
-							<FormDescription>
-								Number of tasks to rollback simultaneously
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="1" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Delay"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Delay (nanoseconds)</FormLabel>
-							<FormDescription>Delay between task rollbacks</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="FailureAction"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Failure Action</FormLabel>
-							<FormDescription>Action on rollback failure</FormDescription>
-							<Select onValueChange={field.onChange} value={field.value}>
-								<FormControl>
-									<SelectTrigger>
-										<SelectValue placeholder="Select failure action" />
-									</SelectTrigger>
-								</FormControl>
-								<SelectContent>
-									<SelectItem value="pause">Pause</SelectItem>
-									<SelectItem value="continue">Continue</SelectItem>
-								</SelectContent>
-							</Select>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Monitor"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Monitor (nanoseconds)</FormLabel>
-							<FormDescription>
-								Duration to monitor for failure after rollback
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="MaxFailureRatio"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Max Failure Ratio</FormLabel>
-							<FormDescription>
-								Maximum failure ratio tolerated (0-1)
-							</FormDescription>
-							<FormControl>
-								<Input type="number" step="0.01" placeholder="0.1" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Order"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Order</FormLabel>
-							<FormDescription>Rollback order strategy</FormDescription>
-							<Select onValueChange={field.onChange} value={field.value}>
-								<FormControl>
-									<SelectTrigger>
-										<SelectValue placeholder="Select order" />
-									</SelectTrigger>
-								</FormControl>
-								<SelectContent>
-									<SelectItem value="stop-first">Stop First</SelectItem>
-									<SelectItem value="start-first">Start First</SelectItem>
-								</SelectContent>
-							</Select>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({
-								Parallelism: undefined,
-								Delay: undefined,
-								FailureAction: undefined,
-								Monitor: undefined,
-								MaxFailureRatio: undefined,
-								Order: undefined,
-							});
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Rollback Config
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/stop-grace-period-form.tsx

@@ -1,158 +0,0 @@
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { api } from "@/utils/api";
-
-const hasStopGracePeriodSwarm = (
-	value: unknown,
-): value is { stopGracePeriodSwarm: bigint | number | string | null } =>
-	typeof value === "object" &&
-	value !== null &&
-	"stopGracePeriodSwarm" in value;
-
-interface StopGracePeriodFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const StopGracePeriodForm = ({ id, type }: StopGracePeriodFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		defaultValues: {
-			value: null as bigint | null,
-		},
-	});
-
-	useEffect(() => {
-		if (hasStopGracePeriodSwarm(data)) {
-			const value = data.stopGracePeriodSwarm;
-			const normalizedValue =
-				value === null || value === undefined
-					? null
-					: typeof value === "bigint"
-						? value
-						: BigInt(value);
-			form.reset({
-				value: normalizedValue,
-			});
-		}
-	}, [data, form]);
-
-	const onSubmit = async (formData: any) => {
-		setIsLoading(true);
-		try {
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				stopGracePeriodSwarm: formData.value,
-			});
-
-			toast.success("Stop grace period updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating stop grace period");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<FormField
-					control={form.control}
-					name="value"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Stop Grace Period (nanoseconds)</FormLabel>
-							<FormDescription>
-								Time to wait before forcefully killing the container
-								<br />
-								Examples: 30000000000 (30s), 120000000000 (2m)
-							</FormDescription>
-							<FormControl>
-								<Input
-									type="number"
-									placeholder="30000000000"
-									{...field}
-									value={
-										field?.value !== null && field?.value !== undefined
-											? field.value.toString()
-											: ""
-									}
-									onChange={(e) =>
-										field.onChange(
-											e.target.value ? BigInt(e.target.value) : null,
-										)
-									}
-								/>
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({
-								value: null,
-							});
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Stop Grace Period
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/update-config-form.tsx

@@ -1,264 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
-import { api } from "@/utils/api";
-
-export const updateConfigFormSchema = z.object({
-	Parallelism: z.coerce.number().optional(),
-	Delay: z.coerce.number().optional(),
-	FailureAction: z.string().optional(),
-	Monitor: z.coerce.number().optional(),
-	MaxFailureRatio: z.coerce.number().optional(),
-	Order: z.string().optional(),
-});
-
-interface UpdateConfigFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const UpdateConfigForm = ({ id, type }: UpdateConfigFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		resolver: zodResolver(updateConfigFormSchema),
-		defaultValues: {
-			Parallelism: undefined,
-			Delay: undefined,
-			FailureAction: undefined,
-			Monitor: undefined,
-			MaxFailureRatio: undefined,
-			Order: undefined,
-		},
-	});
-
-	useEffect(() => {
-		if (data?.updateConfigSwarm) {
-			const config = data.updateConfigSwarm;
-			form.reset({
-				Parallelism: config.Parallelism,
-				Delay: config.Delay,
-				FailureAction: config.FailureAction,
-				Monitor: config.Monitor,
-				MaxFailureRatio: config.MaxFailureRatio,
-				Order: config.Order,
-			});
-		}
-	}, [data, form]);
-
-	const onSubmit = async (formData: z.infer<typeof updateConfigFormSchema>) => {
-		setIsLoading(true);
-		try {
-			// Check if all values are empty, if so, send null to clear the database
-			const hasAnyValue = Object.values(formData).some(
-				(value) => value !== undefined && value !== null && value !== "",
-			);
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				updateConfigSwarm: (hasAnyValue ? formData : null) as any,
-			});
-
-			toast.success("Update config updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating update config");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<FormField
-					control={form.control}
-					name="Parallelism"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Parallelism</FormLabel>
-							<FormDescription>
-								Number of tasks to update simultaneously
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="1" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Delay"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Delay (nanoseconds)</FormLabel>
-							<FormDescription>Delay between task updates</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="FailureAction"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Failure Action</FormLabel>
-							<FormDescription>Action on update failure</FormDescription>
-							<Select onValueChange={field.onChange} value={field.value}>
-								<FormControl>
-									<SelectTrigger>
-										<SelectValue placeholder="Select failure action" />
-									</SelectTrigger>
-								</FormControl>
-								<SelectContent>
-									<SelectItem value="pause">Pause</SelectItem>
-									<SelectItem value="continue">Continue</SelectItem>
-									<SelectItem value="rollback">Rollback</SelectItem>
-								</SelectContent>
-							</Select>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Monitor"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Monitor (nanoseconds)</FormLabel>
-							<FormDescription>
-								Duration to monitor for failure after update
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="MaxFailureRatio"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Max Failure Ratio</FormLabel>
-							<FormDescription>
-								Maximum failure ratio tolerated (0-1)
-							</FormDescription>
-							<FormControl>
-								<Input type="number" step="0.01" placeholder="0.1" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Order"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Order</FormLabel>
-							<FormDescription>Update order strategy</FormDescription>
-							<Select onValueChange={field.onChange} value={field.value}>
-								<FormControl>
-									<SelectTrigger>
-										<SelectValue placeholder="Select order" />
-									</SelectTrigger>
-								</FormControl>
-								<SelectContent>
-									<SelectItem value="stop-first">Stop First</SelectItem>
-									<SelectItem value="start-first">Start First</SelectItem>
-								</SelectContent>
-							</Select>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({
-								Parallelism: undefined,
-								Delay: undefined,
-								FailureAction: undefined,
-								Monitor: undefined,
-								MaxFailureRatio: undefined,
-								Order: undefined,
-							});
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Update Config
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/utils.ts

@@ -1,31 +0,0 @@
-/**
- * Filters out undefined, null, and empty string values from form data
- * Only returns fields that have actual values
- */
-export const filterEmptyValues = (
-	formData: Record<string, any>,
-): Record<string, any> => {
-	return Object.entries(formData).reduce(
-		(acc, [key, value]) => {
-			// Keep arrays even if empty (they might be intentionally cleared)
-			if (Array.isArray(value)) {
-				if (value.length > 0) {
-					acc[key] = value;
-				}
-			}
-			// For other values, filter out undefined, null, and empty strings
-			else if (value !== undefined && value !== null && value !== "") {
-				acc[key] = value;
-			}
-			return acc;
-		},
-		{} as Record<string, any>,
-	);
-};
-
-/**
- * Checks if filtered data has any values to save
- */
-export const hasValues = (data: Record<string, any>): boolean => {
-	return Object.keys(data).length > 0;
-};

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

@@ -1,6 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Cog } from "lucide-react";
-import { useEffect, useState } from "react";
+import { useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
@@ -20,39 +20,8 @@ import {
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
 import { api } from "@/utils/api";
 
-// Railpack versions from https://github.com/railwayapp/railpack/releases
-export const RAILPACK_VERSIONS = [
-	"0.15.4",
-	"0.15.3",
-	"0.15.2",
-	"0.15.1",
-	"0.15.0",
-	"0.14.0",
-	"0.13.0",
-	"0.12.0",
-	"0.11.0",
-	"0.10.0",
-	"0.9.2",
-	"0.9.1",
-	"0.9.0",
-	"0.8.0",
-	"0.7.0",
-	"0.6.0",
-	"0.5.0",
-	"0.4.0",
-	"0.3.0",
-	"0.2.2",
-] as const;
-
 export enum BuildType {
 	dockerfile = "dockerfile",
 	heroku_buildpacks = "heroku_buildpacks",
@@ -96,7 +65,7 @@ const mySchema = z.discriminatedUnion("buildType", [
 	}),
 	z.object({
 		buildType: z.literal(BuildType.railpack),
-		railpackVersion: z.string().nullable().default("0.15.4"),
+		railpackVersion: z.string().nullable().default("0.2.2"),
 	}),
 	z.object({
 		buildType: z.literal(BuildType.static),
@@ -183,8 +152,6 @@ export const ShowBuildChooseForm = ({ applicationId }: Props) => {
 	});
 
 	const buildType = form.watch("buildType");
-	const railpackVersion = form.watch("railpackVersion");
-	const [isManualRailpackVersion, setIsManualRailpackVersion] = useState(false);
 
 	useEffect(() => {
 		if (data) {
@@ -196,22 +163,9 @@ export const ShowBuildChooseForm = ({ applicationId }: Props) => {
 			};
 
 			form.reset(resetData(typedData));
-
-			// Check if railpack version is manual (not in the predefined list)
-			if (
-				data.railpackVersion &&
-				!RAILPACK_VERSIONS.includes(data.railpackVersion as any)
-			) {
-				setIsManualRailpackVersion(true);
-			}
 		}
 	}, [data, form]);
 
-	// Hide builder section when Docker provider is selected
-	if (data?.sourceType === "docker") {
-		return null;
-	}
-
 	const onSubmit = async (data: AddTemplate) => {
 		await mutateAsync({
 			applicationId,
@@ -232,7 +186,7 @@ export const ShowBuildChooseForm = ({ applicationId }: Props) => {
 				data.buildType === BuildType.static ? data.isStaticSpa : null,
 			railpackVersion:
 				data.buildType === BuildType.railpack
-					? data.railpackVersion || "0.15.4"
+					? data.railpackVersion || "0.2.2"
 					: null,
 		})
 			.then(async () => {
@@ -449,88 +403,23 @@ export const ShowBuildChooseForm = ({ applicationId }: Props) => {
 							/>
 						)}
 						{buildType === BuildType.railpack && (
-							<>
-								<FormField
-									control={form.control}
-									name="railpackVersion"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Railpack Version</FormLabel>
-											<FormControl>
-												{isManualRailpackVersion ? (
-													<div className="space-y-2">
-														<Input
-															placeholder="Enter custom version (e.g., 0.15.4)"
-															{...field}
-															value={field.value ?? ""}
-														/>
-														<Button
-															type="button"
-															variant="outline"
-															size="sm"
-															onClick={() => {
-																setIsManualRailpackVersion(false);
-																field.onChange("0.15.4");
-															}}
-														>
-															Use predefined versions
-														</Button>
-													</div>
-												) : (
-													<Select
-														onValueChange={(value) => {
-															if (value === "manual") {
-																setIsManualRailpackVersion(true);
-																field.onChange("");
-															} else {
-																field.onChange(value);
-															}
-														}}
-														value={field.value ?? "0.15.4"}
-													>
-														<SelectTrigger>
-															<SelectValue placeholder="Select Railpack version" />
-														</SelectTrigger>
-														<SelectContent>
-															<SelectItem value="manual">
-																<span className="font-medium">
-																	✏️ Manual (Custom Version)
-																</span>
-															</SelectItem>
-															{RAILPACK_VERSIONS.map((version) => (
-																<SelectItem key={version} value={version}>
-																	v{version}
-																	{version === "0.15.4" && (
-																		<Badge
-																			variant="secondary"
-																			className="ml-2 px-1 text-xs"
-																		>
-																			Latest
-																		</Badge>
-																	)}
-																</SelectItem>
-															))}
-														</SelectContent>
-													</Select>
-												)}
-											</FormControl>
-											<FormDescription>
-												Select a Railpack version or choose manual to enter a
-												custom version.{" "}
-												<a
-													href="https://github.com/railwayapp/railpack/releases"
-													target="_blank"
-													rel="noreferrer"
-													className="text-primary underline underline-offset-4"
-												>
-													View releases
-												</a>
-											</FormDescription>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-							</>
+							<FormField
+								control={form.control}
+								name="railpackVersion"
+								render={({ field }) => (
+									<FormItem>
+										<FormLabel>Railpack Version</FormLabel>
+										<FormControl>
+											<Input
+												placeholder="Railpack Version"
+												{...field}
+												value={field.value ?? ""}
+											/>
+										</FormControl>
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
 						)}
 						<div className="flex w-full justify-end">
 							<Button isLoading={isLoading} type="submit">

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

@@ -256,9 +256,9 @@ export const ShowDeployments = ({
 							return (
 								<div
 									key={deployment.deploymentId}
-									className="flex flex-col gap-4 rounded-lg border p-4 sm:flex-row sm:items-center sm:justify-between"
+									className="flex items-center justify-between rounded-lg border p-4 gap-2"
 								>
-									<div className="flex flex-1 flex-col min-w-0">
+									<div className="flex flex-col">
 										<span className="flex items-center gap-4 font-medium capitalize text-foreground">
 											{index + 1}. {deployment.status}
 											<StatusTooltip
@@ -313,8 +313,8 @@ export const ShowDeployments = ({
 											)}
 										</div>
 									</div>
-									<div className="flex w-full flex-col items-start gap-2 sm:w-auto sm:max-w-[300px] sm:items-end sm:justify-start">
-										<div className="text-sm capitalize text-muted-foreground flex flex-wrap items-center gap-2">
+									<div className="flex flex-col items-end gap-2 max-w-[300px] w-full justify-start">
+										<div className="text-sm capitalize text-muted-foreground flex items-center gap-2">
 											<DateTooltip date={deployment.createdAt} />
 											{deployment.startedAt && deployment.finishedAt && (
 												<Badge
@@ -333,7 +333,7 @@ export const ShowDeployments = ({
 											)}
 										</div>
 
-										<div className="flex w-full flex-col gap-2 sm:w-auto sm:flex-row sm:items-center sm:justify-end">
+										<div className="flex flex-row items-center gap-2">
 											{deployment.pid && deployment.status === "running" && (
 												<DialogAction
 													title="Kill Process"
@@ -355,7 +355,6 @@ export const ShowDeployments = ({
 														variant="destructive"
 														size="sm"
 														isLoading={isKillingProcess}
-														className="w-full sm:w-auto"
 													>
 														Kill Process
 													</Button>
@@ -365,7 +364,6 @@ export const ShowDeployments = ({
 												onClick={() => {
 													setActiveLog(deployment);
 												}}
-												className="w-full sm:w-auto"
 											>
 												View
 											</Button>
@@ -407,7 +405,6 @@ export const ShowDeployments = ({
 															variant="secondary"
 															size="sm"
 															isLoading={isRollingBack}
-															className="w-full sm:w-auto"
 														>
 															<RefreshCcw className="size-4 text-primary group-hover:text-red-500" />
 															Rollback

apps/dokploy/components/dashboard/application/general/generic/save-bitbucket-provider.tsx

@@ -54,7 +54,6 @@ const BitbucketProviderSchema = z.object({
 		.object({
 			repo: z.string().min(1, "Repo is required"),
 			owner: z.string().min(1, "Owner is required"),
-			slug: z.string().optional(),
 		})
 		.required(),
 	branch: z.string().min(1, "Branch is required"),
@@ -83,7 +82,6 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 			repository: {
 				owner: "",
 				repo: "",
-				slug: "",
 			},
 			bitbucketId: "",
 			branch: "",
@@ -116,14 +114,11 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 	} = api.bitbucket.getBitbucketBranches.useQuery(
 		{
 			owner: repository?.owner,
-			repo: repository?.slug || repository?.repo || "",
+			repo: repository?.repo,
 			bitbucketId,
 		},
 		{
-			enabled:
-				!!repository?.owner &&
-				!!(repository?.slug || repository?.repo) &&
-				!!bitbucketId,
+			enabled: !!repository?.owner && !!repository?.repo && !!bitbucketId,
 		},
 	);
 
@@ -134,7 +129,6 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 				repository: {
 					repo: data.bitbucketRepository || "",
 					owner: data.bitbucketOwner || "",
-					slug: data.bitbucketRepositorySlug || "",
 				},
 				buildPath: data.bitbucketBuildPath || "/",
 				bitbucketId: data.bitbucketId || "",
@@ -148,7 +142,6 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 		await mutateAsync({
 			bitbucketBranch: data.branch,
 			bitbucketRepository: data.repository.repo,
-			bitbucketRepositorySlug: data.repository.slug || data.repository.repo,
 			bitbucketOwner: data.repository.owner,
 			bitbucketBuildPath: data.buildPath,
 			bitbucketId: data.bitbucketId,
@@ -188,7 +181,6 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 											form.setValue("repository", {
 												owner: "",
 												repo: "",
-												slug: "",
 											});
 											form.setValue("branch", "");
 										}}
@@ -225,7 +217,7 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 										<FormLabel>Repository</FormLabel>
 										{field.value.owner && field.value.repo && (
 											<Link
-												href={`https://bitbucket.org/${field.value.owner}/${field.value.slug || field.value.repo}`}
+												href={`https://bitbucket.org/${field.value.owner}/${field.value.repo}`}
 												target="_blank"
 												rel="noopener noreferrer"
 												className="flex items-center gap-1 text-sm text-muted-foreground hover:text-primary"
@@ -279,7 +271,6 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 																	form.setValue("repository", {
 																		owner: repo.owner.username as string,
 																		repo: repo.name,
-																		slug: repo.slug,
 																	});
 																	form.setValue("branch", "");
 																}}

apps/dokploy/components/dashboard/application/general/generic/save-gitlab-provider.tsx

@@ -232,9 +232,9 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 								<FormItem className="md:col-span-2 flex flex-col">
 									<div className="flex items-center justify-between">
 										<FormLabel>Repository</FormLabel>
-										{field.value.gitlabPathNamespace && (
+										{field.value.owner && field.value.repo && (
 											<Link
-												href={`${gitlabUrl}/${field.value.gitlabPathNamespace}`}
+												href={`${gitlabUrl}/${field.value.owner}/${field.value.repo}`}
 												target="_blank"
 												rel="noopener noreferrer"
 												className="flex items-center gap-1 text-sm text-muted-foreground hover:text-primary"

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

@@ -1,9 +1,7 @@
-import * as TooltipPrimitive from "@radix-ui/react-tooltip";
 import {
 	ExternalLink,
 	FileText,
 	GitPullRequest,
-	Hammer,
 	Loader2,
 	PenSquare,
 	RocketIcon,
@@ -24,12 +22,6 @@ import {
 	CardTitle,
 } from "@/components/ui/card";
 import { Input } from "@/components/ui/input";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipProvider,
-	TooltipTrigger,
-} from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
 import { ShowModalLogs } from "../../settings/web-server/show-modal-logs";
 import { ShowDeploymentsModal } from "../deployments/show-deployments-modal";
@@ -46,9 +38,6 @@ export const ShowPreviewDeployments = ({ applicationId }: Props) => {
 	const { mutateAsync: deletePreviewDeployment, isLoading } =
 		api.previewDeployment.delete.useMutation();
 
-	const { mutateAsync: redeployPreviewDeployment } =
-		api.previewDeployment.redeploy.useMutation();
-
 	const {
 		data: previewDeployments,
 		refetch: refetchPreviewDeployments,
@@ -57,8 +46,6 @@ export const ShowPreviewDeployments = ({ applicationId }: Props) => {
 		{ applicationId },
 		{
 			enabled: !!applicationId,
-			refetchInterval: (data) =>
-				data?.some((d) => d.previewStatus === "running") ? 2000 : false,
 		},
 	);
 
@@ -206,58 +193,6 @@ export const ShowPreviewDeployments = ({ applicationId }: Props) => {
 															</Button>
 														</ShowDeploymentsModal>
 
-														<DialogAction
-															title="Rebuild Preview Deployment"
-															description="Are you sure you want to rebuild this preview deployment?"
-															type="default"
-															onClick={async () => {
-																await redeployPreviewDeployment({
-																	previewDeploymentId:
-																		deployment.previewDeploymentId,
-																})
-																	.then(() => {
-																		toast.success(
-																			"Preview deployment rebuild started",
-																		);
-																		refetchPreviewDeployments();
-																	})
-																	.catch(() => {
-																		toast.error(
-																			"Error rebuilding preview deployment",
-																		);
-																	});
-															}}
-														>
-															<Button
-																variant="outline"
-																size="sm"
-																isLoading={status === "running"}
-																className="gap-2"
-															>
-																<TooltipProvider>
-																	<Tooltip>
-																		<TooltipTrigger asChild>
-																			<div className="flex items-center gap-2">
-																				<Hammer className="size-4" />
-																				Rebuild
-																			</div>
-																		</TooltipTrigger>
-																		<TooltipPrimitive.Portal>
-																			<TooltipContent
-																				sideOffset={5}
-																				className="z-[60]"
-																			>
-																				<p>
-																					Rebuild the preview deployment without
-																					downloading new code
-																				</p>
-																			</TooltipContent>
-																		</TooltipPrimitive.Portal>
-																	</Tooltip>
-																</TooltipProvider>
-															</Button>
-														</DialogAction>
-
 														<AddPreviewDomain
 															previewDeploymentId={`${deployment.previewDeploymentId}`}
 															domainId={deployment.domain?.domainId}

apps/dokploy/components/dashboard/compose/general/generic/save-bitbucket-provider-compose.tsx

@@ -54,7 +54,6 @@ const BitbucketProviderSchema = z.object({
 		.object({
 			repo: z.string().min(1, "Repo is required"),
 			owner: z.string().min(1, "Owner is required"),
-			slug: z.string().optional(),
 		})
 		.required(),
 	branch: z.string().min(1, "Branch is required"),
@@ -83,7 +82,6 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 			repository: {
 				owner: "",
 				repo: "",
-				slug: "",
 			},
 			bitbucketId: "",
 			branch: "",
@@ -116,14 +114,11 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 	} = api.bitbucket.getBitbucketBranches.useQuery(
 		{
 			owner: repository?.owner,
-			repo: repository?.slug || repository?.repo || "",
+			repo: repository?.repo,
 			bitbucketId,
 		},
 		{
-			enabled:
-				!!repository?.owner &&
-				!!(repository?.slug || repository?.repo) &&
-				!!bitbucketId,
+			enabled: !!repository?.owner && !!repository?.repo && !!bitbucketId,
 		},
 	);
 
@@ -134,7 +129,6 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 				repository: {
 					repo: data.bitbucketRepository || "",
 					owner: data.bitbucketOwner || "",
-					slug: data.bitbucketRepositorySlug || "",
 				},
 				composePath: data.composePath,
 				bitbucketId: data.bitbucketId || "",
@@ -148,7 +142,6 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 		await mutateAsync({
 			bitbucketBranch: data.branch,
 			bitbucketRepository: data.repository.repo,
-			bitbucketRepositorySlug: data.repository.slug || data.repository.repo,
 			bitbucketOwner: data.repository.owner,
 			bitbucketId: data.bitbucketId,
 			composePath: data.composePath,
@@ -190,7 +183,6 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 											form.setValue("repository", {
 												owner: "",
 												repo: "",
-												slug: "",
 											});
 											form.setValue("branch", "");
 										}}
@@ -227,7 +219,7 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 										<FormLabel>Repository</FormLabel>
 										{field.value.owner && field.value.repo && (
 											<Link
-												href={`https://bitbucket.org/${field.value.owner}/${field.value.slug || field.value.repo}`}
+												href={`https://bitbucket.org/${field.value.owner}/${field.value.repo}`}
 												target="_blank"
 												rel="noopener noreferrer"
 												className="flex items-center gap-1 text-sm text-muted-foreground hover:text-primary"
@@ -281,7 +273,6 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 																	form.setValue("repository", {
 																		owner: repo.owner.username as string,
 																		repo: repo.name,
-																		slug: repo.slug,
 																	});
 																	form.setValue("branch", "");
 																}}

apps/dokploy/components/dashboard/compose/general/generic/save-gitlab-provider-compose.tsx

@@ -1,7 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { CheckIcon, ChevronsUpDown, X } from "lucide-react";
 import Link from "next/link";
-import { useEffect, useMemo } from "react";
+import { useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
@@ -97,16 +97,6 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
 	const repository = form.watch("repository");
 	const gitlabId = form.watch("gitlabId");
 
-	const gitlabUrl = useMemo(() => {
-		const url = gitlabProviders?.find(
-			(provider) => provider.gitlabId === gitlabId,
-		)?.gitlabUrl;
-
-		const gitlabUrl = url?.replace(/\/$/, "");
-
-		return gitlabUrl || "https://gitlab.com";
-	}, [gitlabId, gitlabProviders]);
-
 	const {
 		data: repositories,
 		isLoading: isLoadingRepositories,
@@ -234,9 +224,9 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
 								<FormItem className="md:col-span-2 flex flex-col">
 									<div className="flex items-center justify-between">
 										<FormLabel>Repository</FormLabel>
-										{field.value.gitlabPathNamespace && (
+										{field.value.owner && field.value.repo && (
 											<Link
-												href={`${gitlabUrl}/${field.value.gitlabPathNamespace}`}
+												href={`https://gitlab.com/${field.value.owner}/${field.value.repo}`}
 												target="_blank"
 												rel="noopener noreferrer"
 												className="flex items-center gap-1 text-sm text-muted-foreground hover:text-primary"

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

@@ -129,7 +129,7 @@ export const ShowCustomCommand = ({ id, type }: Props) => {
 											<FormItem>
 												<FormLabel>Docker Image</FormLabel>
 												<FormControl>
-													<Input placeholder="postgres:18" {...field} />
+													<Input placeholder="postgres:15" {...field} />
 												</FormControl>
 
 												<FormMessage />

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

@@ -58,7 +58,7 @@ const dockerImageDefaultPlaceholder: Record<DbType, string> = {
 	mongo: "mongo:7",
 	mariadb: "mariadb:11",
 	mysql: "mysql:8",
-	postgres: "postgres:18",
+	postgres: "postgres:15",
 	redis: "redis:7",
 };
 
@@ -559,7 +559,6 @@ export const AddDatabase = ({ environmentId, projectName }: Props) => {
 													type="password"
 													placeholder="******************"
 													autoComplete="one-time-code"
-													enablePasswordGenerator={true}
 													{...field}
 												/>
 											</FormControl>
@@ -579,7 +578,6 @@ export const AddDatabase = ({ environmentId, projectName }: Props) => {
 													<Input
 														type="password"
 														placeholder="******************"
-														enablePasswordGenerator={true}
 														{...field}
 													/>
 												</FormControl>

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

@@ -288,12 +288,9 @@ export const ShowProjects = () => {
 												)
 												.some(Boolean);
 
-											// Find default environment from accessible environments, or fall back to first accessible environment
-											const accessibleEnvironment =
-												project?.environments.find((env) => env.isDefault) ||
-												project?.environments?.[0];
-
-											const hasNoEnvironments = !accessibleEnvironment;
+											const productionEnvironment = project?.environments.find(
+												(env) => env.isDefault,
+											);
 
 											return (
 												<div
@@ -301,16 +298,7 @@ export const ShowProjects = () => {
 													className="w-full lg:max-w-md"
 												>
 													<Link
-														href={
-															hasNoEnvironments
-																? "#"
-																: `/dashboard/project/${project.projectId}/environment/${accessibleEnvironment?.environmentId}`
-														}
-														onClick={(e) => {
-															if (hasNoEnvironments) {
-																e.preventDefault();
-															}
-														}}
+														href={`/dashboard/project/${project.projectId}/environment/${productionEnvironment?.environmentId}`}
 													>
 														<Card className="group relative w-full h-full bg-transparent transition-colors hover:bg-border">
 															{haveServicesWithDomains ? (
@@ -431,7 +419,7 @@ export const ShowProjects = () => {
 															) : null}
 															<CardHeader>
 																<CardTitle className="flex items-center justify-between gap-2">
-																	<span className="flex flex-col gap-1.5 ">
+																	<span className="flex flex-col gap-1.5">
 																		<div className="flex items-center gap-2">
 																			<BookIcon className="size-4 text-muted-foreground" />
 																			<span className="text-base font-medium leading-none">
@@ -439,19 +427,9 @@ export const ShowProjects = () => {
 																			</span>
 																		</div>
 
-																		<span className="text-sm font-medium text-muted-foreground break-all">
+																		<span className="text-sm font-medium text-muted-foreground">
 																			{project.description}
 																		</span>
-
-																		{hasNoEnvironments && (
-																			<div className="flex flex-row gap-2 items-center rounded-lg bg-yellow-50 p-2 mt-2 dark:bg-yellow-950">
-																				<AlertTriangle className="size-4 text-yellow-600 dark:text-yellow-400 shrink-0" />
-																				<span className="text-xs text-yellow-600 dark:text-yellow-400">
-																					You have access to this project but no
-																					environments are available
-																				</span>
-																			</div>
-																		)}
 																	</span>
 																	<div className="flex self-start space-x-1">
 																		<DropdownMenu>

apps/dokploy/components/dashboard/search-command.tsx

@@ -89,7 +89,7 @@ export const SearchCommand = () => {
 					<CommandGroup heading={"Projects"}>
 						<CommandList>
 							{data?.map((project) => {
-								// Find default environment from accessible environments, or fall back to first accessible environment
+								// Find default environment, or fall back to first environment
 								const defaultEnvironment =
 									project.environments.find(
 										(environment) => environment.isDefault,

apps/dokploy/components/dashboard/settings/billing/show-billing-invoices.tsx

@@ -1,74 +0,0 @@
-import { CreditCard, FileText } from "lucide-react";
-import Link from "next/link";
-import { useRouter } from "next/router";
-import {
-	Card,
-	CardContent,
-	CardDescription,
-	CardHeader,
-	CardTitle,
-} from "@/components/ui/card";
-import { cn } from "@/lib/utils";
-import { ShowInvoices } from "./show-invoices";
-
-const navigationItems = [
-	{
-		name: "Subscription",
-		href: "/dashboard/settings/billing",
-		icon: CreditCard,
-	},
-	{
-		name: "Invoices",
-		href: "/dashboard/settings/invoices",
-		icon: FileText,
-	},
-];
-
-export const ShowBillingInvoices = () => {
-	const router = useRouter();
-
-	return (
-		<div className="w-full">
-			<Card className="bg-sidebar p-2.5 rounded-xl max-w-5xl mx-auto">
-				<div className="rounded-xl bg-background shadow-md">
-					<CardHeader>
-						<CardTitle className="text-xl flex flex-row gap-2">
-							<CreditCard className="size-6 text-muted-foreground self-center" />
-							Billing
-						</CardTitle>
-						<CardDescription>
-							Manage your subscription and invoices
-						</CardDescription>
-					</CardHeader>
-					<CardContent className="space-y-4 py-4 border-t">
-						<nav className="flex space-x-2 border-b">
-							{navigationItems.map((item) => {
-								const Icon = item.icon;
-								const isActive = router.pathname === item.href;
-								return (
-									<Link
-										key={item.name}
-										href={item.href}
-										className={cn(
-											"flex items-center gap-2 px-4 py-2 text-sm font-medium border-b-2 transition-colors",
-											isActive
-												? "border-primary text-primary"
-												: "border-transparent text-muted-foreground hover:text-primary hover:border-muted",
-										)}
-									>
-										<Icon className="h-4 w-4" />
-										{item.name}
-									</Link>
-								);
-							})}
-						</nav>
-
-						<div className="mt-6">
-							<ShowInvoices />
-						</div>
-					</CardContent>
-				</div>
-			</Card>
-		</div>
-	);
-};

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

@@ -4,13 +4,11 @@ import {
 	AlertTriangle,
 	CheckIcon,
 	CreditCard,
-	FileText,
 	Loader2,
 	MinusIcon,
 	PlusIcon,
 } from "lucide-react";
 import Link from "next/link";
-import { useRouter } from "next/router";
 import { useState } from "react";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -39,22 +37,7 @@ export const calculatePrice = (count: number, isAnnual = false) => {
 	if (count <= 1) return 4.5;
 	return count * 3.5;
 };
-
-const navigationItems = [
-	{
-		name: "Subscription",
-		href: "/dashboard/settings/billing",
-		icon: CreditCard,
-	},
-	{
-		name: "Invoices",
-		href: "/dashboard/settings/invoices",
-		icon: FileText,
-	},
-];
-
 export const ShowBilling = () => {
-	const router = useRouter();
 	const { data: servers } = api.server.count.useQuery();
 	const { data: admin } = api.user.get.useQuery();
 	const { data, isLoading } = api.stripe.getProducts.useQuery();
@@ -93,41 +76,17 @@ export const ShowBilling = () => {
 
 	return (
 		<div className="w-full">
-			<Card className="bg-sidebar p-2.5 rounded-xl max-w-5xl mx-auto">
-				<div className="rounded-xl bg-background shadow-md">
-					<CardHeader>
+			<Card className="h-full bg-sidebar  p-2.5 rounded-xl  max-w-5xl mx-auto">
+				<div className="rounded-xl bg-background shadow-md ">
+					<CardHeader className="">
 						<CardTitle className="text-xl flex flex-row gap-2">
 							<CreditCard className="size-6 text-muted-foreground self-center" />
 							Billing
 						</CardTitle>
-						<CardDescription>
-							Manage your subscription and invoices
-						</CardDescription>
+						<CardDescription>Manage your subscription</CardDescription>
 					</CardHeader>
-					<CardContent className="space-y-4 py-4 border-t">
-						<nav className="flex space-x-2 border-b">
-							{navigationItems.map((item) => {
-								const Icon = item.icon;
-								const isActive = router.pathname === item.href;
-								return (
-									<Link
-										key={item.name}
-										href={item.href}
-										className={cn(
-											"flex items-center gap-2 px-4 py-2 text-sm font-medium border-b-2 transition-colors",
-											isActive
-												? "border-primary text-primary"
-												: "border-transparent text-muted-foreground hover:text-primary hover:border-muted",
-										)}
-									>
-										<Icon className="h-4 w-4" />
-										{item.name}
-									</Link>
-								);
-							})}
-						</nav>
-
-						<div className="flex flex-col gap-4 w-full mt-6">
+					<CardContent className="space-y-2 py-8 border-t">
+						<div className="flex flex-col gap-4 w-full">
 							<Tabs
 								defaultValue="monthly"
 								value={isAnnual ? "annual" : "monthly"}

apps/dokploy/components/dashboard/settings/billing/show-invoices.tsx

@@ -1,137 +0,0 @@
-import { Download, ExternalLink, FileText, Loader2 } from "lucide-react";
-import type Stripe from "stripe";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import {
-	Table,
-	TableBody,
-	TableCell,
-	TableHead,
-	TableHeader,
-	TableRow,
-} from "@/components/ui/table";
-import { api } from "@/utils/api";
-
-const formatDate = (timestamp: number | null) => {
-	if (!timestamp) return "-";
-	return new Date(timestamp * 1000).toLocaleDateString("en-US", {
-		year: "numeric",
-		month: "short",
-		day: "numeric",
-	});
-};
-
-const formatAmount = (amount: number, currency: string) => {
-	return new Intl.NumberFormat("en-US", {
-		style: "currency",
-		currency: currency.toUpperCase(),
-	}).format(amount / 100);
-};
-
-const getStatusBadge = (status: Stripe.Invoice.Status | null) => {
-	const statusConfig: Record<
-		Stripe.Invoice.Status,
-		{ label: string; variant: "default" | "secondary" | "destructive" }
-	> = {
-		paid: { label: "Paid", variant: "default" },
-		open: { label: "Open", variant: "secondary" },
-		draft: { label: "Draft", variant: "secondary" },
-		void: { label: "Void", variant: "destructive" },
-		uncollectible: { label: "Uncollectible", variant: "destructive" },
-	};
-
-	if (!status) {
-		return <Badge variant="secondary">Unknown</Badge>;
-	}
-
-	const config = statusConfig[status] || {
-		label: status,
-		variant: "secondary" as const,
-	};
-
-	return <Badge variant={config.variant}>{config.label}</Badge>;
-};
-
-export const ShowInvoices = () => {
-	const { data: invoices, isLoading } = api.stripe.getInvoices.useQuery();
-
-	return (
-		<div className="space-y-4">
-			{isLoading ? (
-				<div className="flex items-center justify-center min-h-[20vh]">
-					<span className="text-base text-muted-foreground flex flex-row gap-3 items-center">
-						Loading invoices...
-						<Loader2 className="animate-spin" />
-					</span>
-				</div>
-			) : invoices && invoices.length > 0 ? (
-				<div className="rounded-md border">
-					<Table>
-						<TableHeader>
-							<TableRow>
-								<TableHead>Invoice</TableHead>
-								<TableHead>Date</TableHead>
-								<TableHead>Due Date</TableHead>
-								<TableHead>Amount</TableHead>
-								<TableHead>Status</TableHead>
-								<TableHead className="text-right">Actions</TableHead>
-							</TableRow>
-						</TableHeader>
-						<TableBody>
-							{invoices.map((invoice) => (
-								<TableRow key={invoice.id}>
-									<TableCell className="font-medium">
-										{invoice.number || invoice.id.slice(0, 12)}
-									</TableCell>
-									<TableCell>{formatDate(invoice.created)}</TableCell>
-									<TableCell>{formatDate(invoice.dueDate)}</TableCell>
-									<TableCell>
-										{formatAmount(invoice.amountDue, invoice.currency)}
-									</TableCell>
-									<TableCell>{getStatusBadge(invoice.status)}</TableCell>
-									<TableCell className="text-right">
-										<div className="flex justify-end gap-2">
-											{invoice.hostedInvoiceUrl && (
-												<Button
-													variant="outline"
-													size="sm"
-													onClick={() =>
-														window.open(
-															invoice.hostedInvoiceUrl || "",
-															"_blank",
-														)
-													}
-												>
-													<ExternalLink className="h-4 w-4" />
-												</Button>
-											)}
-											{invoice.invoicePdf && (
-												<Button
-													variant="outline"
-													size="sm"
-													onClick={() =>
-														window.open(invoice.invoicePdf || "", "_blank")
-													}
-												>
-													<Download className="h-4 w-4" />
-												</Button>
-											)}
-										</div>
-									</TableCell>
-								</TableRow>
-							))}
-						</TableBody>
-					</Table>
-				</div>
-			) : (
-				<div className="flex flex-col items-center justify-center min-h-[20vh] gap-2">
-					<FileText className="size-12 text-muted-foreground" />
-					<p className="text-base text-muted-foreground">No invoices found</p>
-					<p className="text-sm text-muted-foreground">
-						Your invoices will appear here once you have a subscription
-					</p>
-				</div>
-			)}
-		</div>
-	);
-};

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

@@ -15,7 +15,6 @@ import {
 	GotifyIcon,
 	LarkIcon,
 	NtfyIcon,
-	PushoverIcon,
 	SlackIcon,
 	TelegramIcon,
 } from "@/components/icons/notification-icons";
@@ -115,16 +114,6 @@ export const notificationSchema = z.discriminatedUnion("type", [
 			priority: z.number().min(1).max(5).default(3),
 		})
 		.merge(notificationBaseSchema),
-	z
-		.object({
-			type: z.literal("pushover"),
-			userKey: z.string().min(1, { message: "User Key is required" }),
-			apiToken: z.string().min(1, { message: "API Token is required" }),
-			priority: z.number().min(-2).max(2).default(0),
-			retry: z.number().min(30).nullish(),
-			expire: z.number().min(1).max(10800).nullish(),
-		})
-		.merge(notificationBaseSchema),
 	z
 		.object({
 			type: z.literal("custom"),
@@ -177,10 +166,6 @@ export const notificationsMap = {
 		icon: <NtfyIcon />,
 		label: "ntfy",
 	},
-	pushover: {
-		icon: <PushoverIcon />,
-		label: "Pushover",
-	},
 	custom: {
 		icon: <PenBoxIcon size={29} className="text-muted-foreground" />,
 		label: "Custom",
@@ -224,9 +209,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 	const { mutateAsync: testCustomConnection, isLoading: isLoadingCustom } =
 		api.notification.testCustomConnection.useMutation();
 
-	const { mutateAsync: testPushoverConnection, isLoading: isLoadingPushover } =
-		api.notification.testPushoverConnection.useMutation();
-
 	const customMutation = notificationId
 		? api.notification.updateCustom.useMutation()
 		: api.notification.createCustom.useMutation();
@@ -251,9 +233,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 	const larkMutation = notificationId
 		? api.notification.updateLark.useMutation()
 		: api.notification.createLark.useMutation();
-	const pushoverMutation = notificationId
-		? api.notification.updatePushover.useMutation()
-		: api.notification.createPushover.useMutation();
 
 	const form = useForm<NotificationSchema>({
 		defaultValues: {
@@ -414,23 +393,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 					dockerCleanup: notification.dockerCleanup,
 					serverThreshold: notification.serverThreshold,
 				});
-			} else if (notification.notificationType === "pushover") {
-				form.reset({
-					appBuildError: notification.appBuildError,
-					appDeploy: notification.appDeploy,
-					dokployRestart: notification.dokployRestart,
-					databaseBackup: notification.databaseBackup,
-					volumeBackup: notification.volumeBackup,
-					type: notification.notificationType,
-					userKey: notification.pushover?.userKey,
-					apiToken: notification.pushover?.apiToken,
-					priority: notification.pushover?.priority,
-					retry: notification.pushover?.retry ?? undefined,
-					expire: notification.pushover?.expire ?? undefined,
-					name: notification.name,
-					dockerCleanup: notification.dockerCleanup,
-					serverThreshold: notification.serverThreshold,
-				});
 			}
 		} else {
 			form.reset();
@@ -446,7 +408,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 		ntfy: ntfyMutation,
 		lark: larkMutation,
 		custom: customMutation,
-		pushover: pushoverMutation,
 	};
 
 	const onSubmit = async (data: NotificationSchema) => {
@@ -598,28 +559,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 				notificationId: notificationId || "",
 				customId: notification?.customId || "",
 			});
-		} else if (data.type === "pushover") {
-			if (data.priority === 2 && (data.retry == null || data.expire == null)) {
-				toast.error("Retry and expire are required for emergency priority (2)");
-				return;
-			}
-			promise = pushoverMutation.mutateAsync({
-				appBuildError: appBuildError,
-				appDeploy: appDeploy,
-				dokployRestart: dokployRestart,
-				databaseBackup: databaseBackup,
-				volumeBackup: volumeBackup,
-				userKey: data.userKey,
-				apiToken: data.apiToken,
-				priority: data.priority,
-				retry: data.priority === 2 ? data.retry : undefined,
-				expire: data.priority === 2 ? data.expire : undefined,
-				name: data.name,
-				dockerCleanup: dockerCleanup,
-				serverThreshold: serverThreshold,
-				notificationId: notificationId || "",
-				pushoverId: notification?.pushoverId || "",
-			});
 		}
 
 		if (promise) {
@@ -1316,147 +1255,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 										/>
 									</>
 								)}
-								{type === "pushover" && (
-									<>
-										<FormField
-											control={form.control}
-											name="userKey"
-											render={({ field }) => (
-												<FormItem>
-													<FormLabel>User Key</FormLabel>
-													<FormControl>
-														<Input placeholder="ub3de9kl2q..." {...field} />
-													</FormControl>
-													<FormMessage />
-												</FormItem>
-											)}
-										/>
-										<FormField
-											control={form.control}
-											name="apiToken"
-											render={({ field }) => (
-												<FormItem>
-													<FormLabel>API Token</FormLabel>
-													<FormControl>
-														<Input placeholder="a3d9k2q7m4..." {...field} />
-													</FormControl>
-													<FormMessage />
-												</FormItem>
-											)}
-										/>
-										<FormField
-											control={form.control}
-											name="priority"
-											defaultValue={0}
-											render={({ field }) => (
-												<FormItem className="w-full">
-													<FormLabel>Priority</FormLabel>
-													<FormControl>
-														<Input
-															placeholder="0"
-															value={field.value ?? 0}
-															onChange={(e) => {
-																const value = e.target.value;
-																if (value === "" || value === "-") {
-																	field.onChange(0);
-																} else {
-																	const priority = Number.parseInt(value);
-																	if (
-																		!Number.isNaN(priority) &&
-																		priority >= -2 &&
-																		priority <= 2
-																	) {
-																		field.onChange(priority);
-																	}
-																}
-															}}
-															type="number"
-															min={-2}
-															max={2}
-														/>
-													</FormControl>
-													<FormDescription>
-														Message priority (-2 to 2, default: 0, emergency: 2)
-													</FormDescription>
-													<FormMessage />
-												</FormItem>
-											)}
-										/>
-										{form.watch("priority") === 2 && (
-											<>
-												<FormField
-													control={form.control}
-													name="retry"
-													render={({ field }) => (
-														<FormItem className="w-full">
-															<FormLabel>Retry (seconds)</FormLabel>
-															<FormControl>
-																<Input
-																	placeholder="30"
-																	{...field}
-																	value={field.value ?? ""}
-																	onChange={(e) => {
-																		const value = e.target.value;
-																		if (value === "") {
-																			field.onChange(undefined);
-																		} else {
-																			const retry = Number.parseInt(value);
-																			if (!Number.isNaN(retry)) {
-																				field.onChange(retry);
-																			}
-																		}
-																	}}
-																	type="number"
-																	min={30}
-																/>
-															</FormControl>
-															<FormDescription>
-																How often (in seconds) to retry. Minimum 30
-																seconds.
-															</FormDescription>
-															<FormMessage />
-														</FormItem>
-													)}
-												/>
-												<FormField
-													control={form.control}
-													name="expire"
-													render={({ field }) => (
-														<FormItem className="w-full">
-															<FormLabel>Expire (seconds)</FormLabel>
-															<FormControl>
-																<Input
-																	placeholder="3600"
-																	{...field}
-																	value={field.value ?? ""}
-																	onChange={(e) => {
-																		const value = e.target.value;
-																		if (value === "") {
-																			field.onChange(undefined);
-																		} else {
-																			const expire = Number.parseInt(value);
-																			if (!Number.isNaN(expire)) {
-																				field.onChange(expire);
-																			}
-																		}
-																	}}
-																	type="number"
-																	min={1}
-																	max={10800}
-																/>
-															</FormControl>
-															<FormDescription>
-																How long to keep retrying (max 10800 seconds / 3
-																hours).
-															</FormDescription>
-															<FormMessage />
-														</FormItem>
-													)}
-												/>
-											</>
-										)}
-									</>
-								)}
 							</div>
 						</div>
 						<div className="flex flex-col gap-4">
@@ -1630,8 +1428,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 								isLoadingGotify ||
 								isLoadingNtfy ||
 								isLoadingLark ||
-								isLoadingCustom ||
-								isLoadingPushover
+								isLoadingCustom
 							}
 							variant="secondary"
 							type="button"
@@ -1700,22 +1497,6 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 											endpoint: data.endpoint,
 											headers: headersRecord,
 										});
-									} else if (data.type === "pushover") {
-										if (
-											data.priority === 2 &&
-											(data.retry == null || data.expire == null)
-										) {
-											throw new Error(
-												"Retry and expire are required for emergency priority (2)",
-											);
-										}
-										await testPushoverConnection({
-											userKey: data.userKey,
-											apiToken: data.apiToken,
-											priority: data.priority,
-											retry: data.priority === 2 ? data.retry : undefined,
-											expire: data.priority === 2 ? data.expire : undefined,
-										});
 									}
 									toast.success("Connection Success");
 								} catch (error) {

apps/dokploy/components/dashboard/settings/profile/profile-form.tsx

@@ -1,7 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import { Loader2, Palette, User } from "lucide-react";
+import { Loader2, User } from "lucide-react";
 import { useTranslation } from "next-i18next";
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
@@ -27,7 +27,6 @@ import {
 import { Input } from "@/components/ui/input";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import { Switch } from "@/components/ui/switch";
-import { getAvatarType, isSolidColorAvatar } from "@/lib/avatar-utils";
 import { generateSHA256Hash, getFallbackAvatarInitials } from "@/lib/utils";
 import { api } from "@/utils/api";
 import { Configure2FA } from "./configure-2fa";
@@ -41,7 +40,7 @@ const profileSchema = z.object({
 	password: z.string().nullable(),
 	currentPassword: z.string().nullable(),
 	image: z.string().optional(),
-	firstName: z.string().optional(),
+	name: z.string().optional(),
 	lastName: z.string().optional(),
 	allowImpersonation: z.boolean().optional().default(false),
 });
@@ -75,7 +74,6 @@ export const ProfileForm = () => {
 	} = api.user.update.useMutation();
 	const { t } = useTranslation("settings");
 	const [gravatarHash, setGravatarHash] = useState<string | null>(null);
-	const colorInputRef = useRef<HTMLInputElement>(null);
 
 	const availableAvatars = useMemo(() => {
 		if (gravatarHash === null) return randomImages;
@@ -91,7 +89,7 @@ export const ProfileForm = () => {
 			image: data?.user?.image || "",
 			currentPassword: "",
 			allowImpersonation: data?.user?.allowImpersonation || false,
-			firstName: data?.user?.firstName || "",
+			name: data?.user?.firstName || "",
 			lastName: data?.user?.lastName || "",
 		},
 		resolver: zodResolver(profileSchema),
@@ -106,7 +104,7 @@ export const ProfileForm = () => {
 					image: data?.user?.image || "",
 					currentPassword: form.getValues("currentPassword") || "",
 					allowImpersonation: data?.user?.allowImpersonation,
-					firstName: data?.user?.firstName || "",
+					name: data?.user?.firstName || "",
 					lastName: data?.user?.lastName || "",
 				},
 				{
@@ -131,7 +129,7 @@ export const ProfileForm = () => {
 				image: values.image,
 				currentPassword: values.currentPassword || undefined,
 				allowImpersonation: values.allowImpersonation,
-				firstName: values.firstName || undefined,
+				name: values.name || undefined,
 				lastName: values.lastName || undefined,
 			});
 			await refetch();
@@ -141,7 +139,7 @@ export const ProfileForm = () => {
 				password: "",
 				image: values.image,
 				currentPassword: "",
-				firstName: values.firstName || "",
+				name: values.name || "",
 				lastName: values.lastName || "",
 			});
 		} catch (error) {
@@ -184,7 +182,7 @@ export const ProfileForm = () => {
 										<div className="space-y-4">
 											<FormField
 												control={form.control}
-												name="firstName"
+												name="name"
 												render={({ field }) => (
 													<FormItem>
 														<FormLabel>First Name</FormLabel>
@@ -276,8 +274,16 @@ export const ProfileForm = () => {
 																onValueChange={(e) => {
 																	field.onChange(e);
 																}}
-																defaultValue={getAvatarType(field.value)}
-																value={getAvatarType(field.value)}
+																defaultValue={
+																	field.value?.startsWith("data:")
+																		? "upload"
+																		: field.value
+																}
+																value={
+																	field.value?.startsWith("data:")
+																		? "upload"
+																		: field.value
+																}
 																className="flex flex-row flex-wrap gap-2 max-xl:justify-center"
 															>
 																<FormItem key="no-avatar">
@@ -364,40 +370,6 @@ export const ProfileForm = () => {
 																		/>
 																	</FormLabel>
 																</FormItem>
-																<FormItem key="color-avatar">
-																	<FormLabel className="[&:has([data-state=checked])>.color-avatar]:border-primary [&:has([data-state=checked])>.color-avatar]:border-1 [&:has([data-state=checked])>.color-avatar]:p-px cursor-pointer relative">
-																		<FormControl>
-																			<RadioGroupItem
-																				value="color"
-																				className="sr-only"
-																			/>
-																		</FormControl>
-																		<div
-																			className="color-avatar h-12 w-12 rounded-full border hover:p-px hover:border-primary transition-colors flex items-center justify-center overflow-hidden cursor-pointer"
-																			style={{
-																				backgroundColor: isSolidColorAvatar(
-																					field.value,
-																				)
-																					? field.value
-																					: undefined,
-																			}}
-																			onClick={() =>
-																				colorInputRef.current?.click()
-																			}
-																		>
-																			{!isSolidColorAvatar(field.value) && (
-																				<Palette className="h-5 w-5 text-muted-foreground" />
-																			)}
-																		</div>
-																		<input
-																			ref={colorInputRef}
-																			type="color"
-																			className="absolute opacity-0 pointer-events-none w-12 h-12 top-0 left-0"
-																			value={field.value}
-																			onChange={field.onChange}
-																		/>
-																	</FormLabel>
-																</FormItem>
 																{availableAvatars.map((image) => (
 																	<FormItem key={image}>
 																		<FormLabel className="[&:has([data-state=checked])>img]:border-primary [&:has([data-state=checked])>img]:border-1 [&:has([data-state=checked])>img]:p-px cursor-pointer">

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

@@ -22,6 +22,7 @@ import {
 	DialogTitle,
 	DialogTrigger,
 } from "@/components/ui/dialog";
+import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
@@ -88,15 +89,15 @@ export const SetupServer = ({ serverId, asButton = false }: Props) => {
 					</Button>
 				</DialogTrigger>
 			) : (
-				<Button
+				<DropdownMenuItem
 					className="w-full cursor-pointer "
-					size="sm"
-					onClick={() => {
+					onSelect={(e) => {
+						e.preventDefault();
 						setIsOpen(true);
 					}}
 				>
-					Setup Server <Settings className="size-4" />
-				</Button>
+					Setup Server
+				</DropdownMenuItem>
 			)}
 			<DialogContent className="sm:max-w-4xl  ">
 				<DialogHeader>

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

@@ -6,7 +6,9 @@ import {
 	Loader2,
 	MoreHorizontal,
 	Network,
+	Pencil,
 	ServerIcon,
+	Settings,
 	Terminal,
 	Trash2,
 	User,
@@ -29,7 +31,9 @@ import {
 import {
 	DropdownMenu,
 	DropdownMenuContent,
+	DropdownMenuItem,
 	DropdownMenuLabel,
+	DropdownMenuSeparator,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import {
@@ -281,32 +285,7 @@ export const ShowServers = () => {
 
 																	{/* Compact Actions */}
 																	{isActive && (
-																		<div className="flex items-center  gap-2 pt-3 border-t mt-auto flex-wrap">
-																			<div className="flex items-center gap-2 w-full">
-																				<Tooltip>
-																					<TooltipTrigger asChild>
-																						<SetupServer
-																							serverId={server.serverId}
-																						/>
-																					</TooltipTrigger>
-																					<TooltipContent
-																						className="max-w-xs"
-																						side="bottom"
-																					>
-																						<div className="space-y-1">
-																							<p className="font-semibold">
-																								Setup Server
-																							</p>
-																							<p className="text-xs text-muted-foreground">
-																								Configure and initialize your
-																								server with Docker, Traefik, and
-																								other essential services
-																							</p>
-																						</div>
-																					</TooltipContent>
-																				</Tooltip>
-																			</div>
-
+																		<div className="flex items-center gap-2 pt-3 border-t mt-auto">
 																			<TooltipProvider>
 																				{server.sshKeyId && (
 																					<Tooltip>
@@ -332,6 +311,20 @@ export const ShowServers = () => {
 																					</Tooltip>
 																				)}
 
+																				<Tooltip>
+																					<TooltipTrigger asChild>
+																						<div>
+																							<SetupServer
+																								serverId={server.serverId}
+																								asButton={true}
+																							/>
+																						</div>
+																					</TooltipTrigger>
+																					<TooltipContent>
+																						<p>Setup Server</p>
+																					</TooltipContent>
+																				</Tooltip>
+
 																				<Tooltip>
 																					<TooltipTrigger asChild>
 																						<div>

apps/dokploy/components/icons/notification-icons.tsx

@@ -231,29 +231,3 @@ export const NtfyIcon = ({ className }: Props) => {
 		</svg>
 	);
 };
-
-export const PushoverIcon = ({ className }: Props) => {
-	return (
-		<svg
-			viewBox="0 0 600 600"
-			className={cn("size-8", className)}
-			xmlns="http://www.w3.org/2000/svg"
-		>
-			<g stroke="none" strokeWidth="1">
-				<ellipse
-					style={{ fillRule: "evenodd" }}
-					fill="#249DF1"
-					transform="matrix(-0.674571, 0.73821, -0.73821, -0.674571, 556.833239, 241.613465)"
-					cx="216.308"
-					cy="152.076"
-					rx="296.855"
-					ry="296.855"
-				/>
-				<path
-					fill="#FFFFFF"
-					d="M 280.949 172.514 L 355.429 162.714 L 282.909 326.374 L 282.909 326.374 C 295.649 325.394 308.142 321.067 320.389 313.394 L 320.389 313.394 L 320.389 313.394 C 332.642 305.714 343.916 296.077 354.209 284.484 L 354.209 284.484 L 354.209 284.484 C 364.496 272.884 373.396 259.981 380.909 245.774 L 380.909 245.774 L 380.909 245.774 C 388.422 231.561 393.812 217.594 397.079 203.874 L 397.079 203.874 L 397.079 203.874 C 399.039 195.381 399.939 187.214 399.779 179.374 L 399.779 179.374 L 399.779 179.374 C 399.612 171.534 397.569 164.674 393.649 158.794 L 393.649 158.794 L 393.649 158.794 C 389.729 152.914 383.766 148.177 375.759 144.584 L 375.759 144.584 L 375.759 144.584 C 367.759 140.991 356.899 139.194 343.179 139.194 L 343.179 139.194 L 343.179 139.194 C 327.172 139.194 311.409 141.807 295.889 147.034 L 295.889 147.034 L 295.889 147.034 C 280.376 152.261 266.002 159.857 252.769 169.824 L 252.769 169.824 L 252.769 169.824 C 239.542 179.784 228.029 192.197 218.229 207.064 L 218.229 207.064 L 218.229 207.064 C 208.429 221.924 201.406 238.827 197.159 257.774 L 197.159 257.774 L 197.159 257.774 C 195.526 263.981 194.546 268.961 194.219 272.714 L 194.219 272.714 L 194.219 272.714 C 193.892 276.474 193.812 279.577 193.979 282.024 L 193.979 282.024 L 193.979 282.024 C 194.139 284.477 194.462 286.357 194.949 287.664 L 194.949 287.664 L 194.949 287.664 C 195.442 288.971 195.852 290.277 196.179 291.584 L 196.179 291.584 L 196.179 291.584 C 179.519 291.584 167.349 288.234 159.669 281.534 L 159.669 281.534 L 159.669 281.534 C 151.996 274.841 150.119 263.164 154.039 246.504 L 154.039 246.504 L 154.039 246.504 C 157.959 229.191 166.862 212.694 180.749 197.014 L 180.749 197.014 L 180.749 197.014 C 194.629 181.334 211.122 167.531 230.229 155.604 L 230.229 155.604 L 230.229 155.604 C 249.342 143.684 270.249 134.214 292.949 127.194 L 292.949 127.194 L 292.949 127.194 C 315.656 120.167 337.789 116.654 359.349 116.654 L 359.349 116.654 L 359.349 116.654 C 378.296 116.654 394.219 119.347 407.119 124.734 L 407.119 124.734 L 407.119 124.734 C 420.026 130.127 430.072 137.234 437.259 146.054 L 437.259 146.054 L 437.259 146.054 C 444.446 154.874 448.936 165.164 450.729 176.924 L 450.729 176.924 L 450.729 176.924 C 452.529 188.684 451.959 200.934 449.019 213.674 L 449.019 213.674 L 449.019 213.674 C 445.426 229.027 438.646 244.464 428.679 259.984 L 428.679 259.984 L 428.679 259.984 C 418.719 275.497 406.226 289.544 391.199 302.124 L 391.199 302.124 L 391.199 302.124 C 376.172 314.697 358.939 324.904 339.499 332.744 L 339.499 332.744 L 339.499 332.744 C 320.066 340.584 299.406 344.504 277.519 344.504 L 277.519 344.504 L 275.069 344.504 L 212.839 484.154 L 142.279 484.154 L 280.949 172.514 Z"
-				/>
-			</g>
-		</svg>
-	);
-};

apps/dokploy/components/layouts/side.tsx

@@ -18,6 +18,7 @@ import {
 	Forward,
 	GalleryVerticalEnd,
 	GitBranch,
+	HeartIcon,
 	KeyRound,
 	Loader2,
 	type LucideIcon,
@@ -409,6 +410,18 @@ const MENU: Menu = {
 			url: "https://discord.gg/2tBnJ3jDJc",
 			icon: CircleHelp,
 		},
+		{
+			name: "Sponsor",
+			url: "https://opencollective.com/dokploy",
+			icon: ({ className }) => (
+				<HeartIcon
+					className={cn(
+						"text-red-500 fill-red-600 animate-heartbeat",
+						className,
+					)}
+				/>
+			),
+		},
 	],
 } as const;
 

apps/dokploy/components/shared/toggle-visibility-input.tsx

@@ -10,7 +10,7 @@ export const ToggleVisibilityInput = ({ ...props }: InputProps) => {
 
 	return (
 		<div className="flex w-full items-center space-x-2">
-			<Input ref={inputRef} {...props} type="password" />
+			<Input ref={inputRef} type={"password"} {...props} />
 			<Button
 				variant={"secondary"}
 				onClick={() => {

apps/dokploy/components/ui/avatar.tsx

@@ -1,6 +1,6 @@
 import * as AvatarPrimitive from "@radix-ui/react-avatar";
 import * as React from "react";
-import { isSolidColorAvatar } from "@/lib/avatar-utils";
+
 import { cn } from "@/lib/utils";
 
 const Avatar = React.forwardRef<
@@ -20,33 +20,14 @@ Avatar.displayName = AvatarPrimitive.Root.displayName;
 
 const AvatarImage = React.forwardRef<
 	React.ElementRef<typeof AvatarPrimitive.Image>,
-	React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Image> & {
-		src?: string | null;
-	}
->(({ className, src, ...props }, ref) => {
-	if (isSolidColorAvatar(src)) {
-		return (
-			<div
-				key={`solid-${src}`}
-				ref={ref}
-				className={cn("aspect-square h-full w-full rounded-full", className)}
-				style={{
-					backgroundColor: src,
-				}}
-				{...props}
-			/>
-		);
-	}
-
-	return (
-		<AvatarPrimitive.Image
-			ref={ref}
-			className={cn("aspect-square h-full w-full", className)}
-			src={src ?? ""}
-			{...props}
-		/>
-	);
-});
+	React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Image>
+>(({ className, ...props }, ref) => (
+	<AvatarPrimitive.Image
+		ref={ref}
+		className={cn("aspect-square h-full w-full", className)}
+		{...props}
+	/>
+));
 AvatarImage.displayName = AvatarPrimitive.Image.displayName;
 
 const AvatarFallback = React.forwardRef<

apps/dokploy/components/ui/input.tsx

@@ -1,75 +1,18 @@
-import { EyeIcon, EyeOffIcon, RefreshCcw } from "lucide-react";
+import { EyeIcon, EyeOffIcon } from "lucide-react";
 import * as React from "react";
-import { generateRandomPassword } from "@/lib/password-utils";
 import { cn } from "@/lib/utils";
 
 export interface InputProps
 	extends React.InputHTMLAttributes<HTMLInputElement> {
 	errorMessage?: string;
-	enablePasswordGenerator?: boolean;
-	passwordGeneratorLength?: number;
 }
 
 const Input = React.forwardRef<HTMLInputElement, InputProps>(
-	(
-		{
-			className,
-			errorMessage,
-			type,
-			enablePasswordGenerator = false,
-			passwordGeneratorLength,
-			...props
-		},
-		ref,
-	) => {
+	({ className, errorMessage, type, ...props }, ref) => {
 		const [showPassword, setShowPassword] = React.useState(false);
-		const inputRef = React.useRef<HTMLInputElement>(null);
 		const isPassword = type === "password";
-		const shouldShowGenerator =
-			isPassword &&
-			enablePasswordGenerator !== false &&
-			!props.disabled &&
-			!props.readOnly;
 		const inputType = isPassword ? (showPassword ? "text" : "password") : type;
 
-		const setRefs = React.useCallback(
-			(node: HTMLInputElement | null) => {
-				// @ts-ignore
-				inputRef.current = node;
-				if (typeof ref === "function") {
-					ref(node);
-				} else if (ref) {
-					ref.current = node;
-				}
-			},
-			[ref],
-		);
-
-		const handleGeneratePassword = () => {
-			const nextValue =
-				typeof passwordGeneratorLength === "number" &&
-				passwordGeneratorLength > 0
-					? generateRandomPassword(Math.floor(passwordGeneratorLength))
-					: generateRandomPassword();
-
-			const input = inputRef.current;
-			if (!input) {
-				return;
-			}
-
-			const valueSetter = Object.getOwnPropertyDescriptor(
-				HTMLInputElement.prototype,
-				"value",
-			)?.set;
-			if (valueSetter) {
-				valueSetter.call(input, nextValue);
-			} else {
-				input.value = nextValue;
-			}
-
-			input.dispatchEvent(new Event("input", { bubbles: true }));
-		};
-
 		return (
 			<>
 				<div className="relative w-full">
@@ -78,39 +21,25 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
 						className={cn(
 							// bg-gray
 							"flex h-10 w-full rounded-md bg-input px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-border disabled:cursor-not-allowed disabled:opacity-50",
-							isPassword && (shouldShowGenerator ? "pr-16" : "pr-10"),
+							isPassword && "pr-10", // Add padding for the eye icon
 							className,
 						)}
-						ref={setRefs}
+						ref={ref}
 						{...props}
 					/>
 					{isPassword && (
-						<div className="absolute inset-y-0 right-0 flex items-center gap-1 pr-3 text-muted-foreground">
-							{shouldShowGenerator && (
-								<button
-									type="button"
-									className="hover:text-foreground focus:outline-none"
-									onClick={handleGeneratePassword}
-									aria-label="Generate password"
-									title="Generate password"
-									tabIndex={-1}
-								>
-									<RefreshCcw className="h-4 w-4" />
-								</button>
+						<button
+							type="button"
+							className="absolute inset-y-0 right-0 flex items-center pr-3 text-muted-foreground hover:text-foreground focus:outline-none"
+							onClick={() => setShowPassword(!showPassword)}
+							tabIndex={-1}
+						>
+							{showPassword ? (
+								<EyeOffIcon className="h-4 w-4" />
+							) : (
+								<EyeIcon className="h-4 w-4" />
 							)}
-							<button
-								type="button"
-								className="hover:text-foreground focus:outline-none"
-								onClick={() => setShowPassword(!showPassword)}
-								tabIndex={-1}
-							>
-								{showPassword ? (
-									<EyeOffIcon className="h-4 w-4" />
-								) : (
-									<EyeIcon className="h-4 w-4" />
-								)}
-							</button>
-						</div>
+						</button>
 					)}
 				</div>
 				{errorMessage && (

apps/dokploy/drizzle/0057_damp_prism.sql

@@ -0,0 +1,16 @@
+CREATE TABLE IF NOT EXISTS "ai" (
+	"aiId" text PRIMARY KEY NOT NULL,
+	"name" text NOT NULL,
+	"apiUrl" text NOT NULL,
+	"apiKey" text NOT NULL,
+	"model" text NOT NULL,
+	"isEnabled" boolean DEFAULT true NOT NULL,
+	"adminId" text NOT NULL,
+	"createdAt" text NOT NULL
+);
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "ai" ADD CONSTRAINT "ai_adminId_admin_adminId_fk" FOREIGN KEY ("adminId") REFERENCES "public"."admin"("adminId") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;

apps/dokploy/drizzle/0134_strong_hercules.sql

@@ -1 +0,0 @@
-ALTER TABLE "application" ALTER COLUMN "railpackVersion" SET DEFAULT '0.15.4';

apps/dokploy/drizzle/0135_illegal_magik.sql

@@ -1,12 +0,0 @@
-ALTER TYPE "public"."notificationType" ADD VALUE 'pushover' BEFORE 'custom';--> statement-breakpoint
-CREATE TABLE "pushover" (
-	"pushoverId" text PRIMARY KEY NOT NULL,
-	"userKey" text NOT NULL,
-	"apiToken" text NOT NULL,
-	"priority" integer DEFAULT 0 NOT NULL,
-	"retry" integer,
-	"expire" integer
-);
---> statement-breakpoint
-ALTER TABLE "notification" ADD COLUMN "pushoverId" text;--> statement-breakpoint
-ALTER TABLE "notification" ADD CONSTRAINT "notification_pushoverId_pushover_pushoverId_fk" FOREIGN KEY ("pushoverId") REFERENCES "public"."pushover"("pushoverId") ON DELETE cascade ON UPDATE no action;

apps/dokploy/drizzle/0136_tidy_puff_adder.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "application" ADD COLUMN "bitbucketRepositorySlug" text;--> statement-breakpoint
-ALTER TABLE "compose" ADD COLUMN "bitbucketRepositorySlug" text;

apps/dokploy/drizzle/meta/_journal.json

@@ -939,27 +939,6 @@
       "when": 1766301478005,
       "tag": "0133_striped_the_order",
       "breakpoints": true
-    },
-    {
-      "idx": 134,
-      "version": "7",
-      "when": 1767871040249,
-      "tag": "0134_strong_hercules",
-      "breakpoints": true
-    },
-    {
-      "idx": 135,
-      "version": "7",
-      "when": 1768271617042,
-      "tag": "0135_illegal_magik",
-      "breakpoints": true
-    },
-    {
-      "idx": 136,
-      "version": "7",
-      "when": 1769580434296,
-      "tag": "0136_tidy_puff_adder",
-      "breakpoints": true
     }
   ]
 }

apps/dokploy/lib/avatar-utils.ts

@@ -1,30 +0,0 @@
-/**
- * Checks if the given avatar value represents a solid color in hexadecimal format.
- *
- * @param value Avatar value to check.
- *
- * @return True if the avatar is a solid color, false otherwise.
- */
-export function isSolidColorAvatar(value?: string | null) {
-	return (
-		(value?.startsWith("#") && /^#[0-9A-Fa-f]{6}$/.test(value)) ||
-		value?.startsWith("color:") ||
-		false
-	);
-}
-
-/**
- * Gets the avatar type for form selection (RadioGroup value).
- *
- * @param value Avatar value.
- *
- * @return "upload" for base64 images, "color" for solid colors, or the original value for other types.
- */
-export function getAvatarType(value?: string | null) {
-	if (!value) return "";
-
-	if (value.startsWith("data:")) return "upload";
-	if (isSolidColorAvatar(value)) return "color";
-
-	return value;
-}

apps/dokploy/lib/password-utils.ts

@@ -1,38 +0,0 @@
-const DEFAULT_PASSWORD_LENGTH = 20;
-const DEFAULT_PASSWORD_CHARSET =
-	"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-
-export const generateRandomPassword = (
-	length: number = DEFAULT_PASSWORD_LENGTH,
-	charset: string = DEFAULT_PASSWORD_CHARSET,
-) => {
-	const safeLength =
-		Number.isFinite(length) && length > 0
-			? Math.floor(length)
-			: DEFAULT_PASSWORD_LENGTH;
-
-	if (safeLength <= 0 || charset.length === 0) {
-		return "";
-	}
-
-	const cryptoApi =
-		typeof globalThis !== "undefined" ? globalThis.crypto : undefined;
-
-	if (!cryptoApi?.getRandomValues) {
-		let fallback = "";
-		for (let i = 0; i < safeLength; i += 1) {
-			fallback += charset[Math.floor(Math.random() * charset.length)];
-		}
-		return fallback;
-	}
-
-	const values = new Uint32Array(safeLength);
-	cryptoApi.getRandomValues(values);
-
-	let result = "";
-	for (const value of values) {
-		result += charset[value % charset.length];
-	}
-
-	return result;
-};

apps/dokploy/migration.ts

@@ -1,9 +1,10 @@
-import { dbUrl } from "@dokploy/server/db";
 import { drizzle } from "drizzle-orm/postgres-js";
 import { migrate } from "drizzle-orm/postgres-js/migrator";
 import postgres from "postgres";
 
-const sql = postgres(dbUrl, { max: 1 });
+const connectionString = process.env.DATABASE_URL!;
+
+const sql = postgres(connectionString, { max: 1 });
 const db = drizzle(sql);
 
 await migrate(db, { migrationsFolder: "drizzle" })

apps/dokploy/next.config.mjs

@@ -19,32 +19,6 @@ const nextConfig = {
 		locales: ["en"],
 		defaultLocale: "en",
 	},
-	async headers() {
-		return [
-			{
-				// Apply security headers to all routes
-				source: "/:path*",
-				headers: [
-					{
-						key: "X-Frame-Options",
-						value: "DENY",
-					},
-					{
-						key: "Content-Security-Policy",
-						value: "frame-ancestors 'none'",
-					},
-					{
-						key: "X-Content-Type-Options",
-						value: "nosniff",
-					},
-					{
-						key: "Referrer-Policy",
-						value: "strict-origin-when-cross-origin",
-					},
-				],
-			},
-		];
-	},
 };
 
 export default nextConfig;

apps/dokploy/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dokploy",
-	"version": "v0.26.7",
+	"version": "v0.26.3",
 	"private": true,
 	"license": "Apache-2.0",
 	"type": "module",
@@ -109,6 +109,7 @@
 		"drizzle-orm": "^0.39.3",
 		"drizzle-zod": "0.5.1",
 		"fancy-ansi": "^0.1.3",
+		"hi-base32": "^0.5.1",
 		"i18next": "^23.16.8",
 		"input-otp": "^1.4.2",
 		"js-cookie": "^3.0.5",
@@ -125,6 +126,7 @@
 		"node-schedule": "2.1.1",
 		"nodemailer": "6.9.14",
 		"octokit": "3.1.2",
+		"otpauth": "^9.4.0",
 		"pino": "9.4.0",
 		"pino-pretty": "11.2.2",
 		"postgres": "3.4.4",
@@ -153,11 +155,9 @@
 		"xterm-addon-fit": "^0.8.0",
 		"yaml": "2.8.1",
 		"zod": "^3.25.32",
-		"zod-form-data": "^2.0.7",
-		"semver": "7.7.3"
+		"zod-form-data": "^2.0.7"
 	},
 	"devDependencies": {
-		"@types/semver": "7.7.1",
 		"@types/shell-quote": "^1.7.5",
 		"@types/adm-zip": "^0.5.7",
 		"@types/bcrypt": "5.0.2",
@@ -196,5 +196,10 @@
 		"*": [
 			"biome check --write --no-errors-on-unmatched --files-ignore-unknown=true"
 		]
+	},
+	"commitlint": {
+		"extends": [
+			"@commitlint/config-conventional"
+		]
 	}
 }

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

@@ -195,9 +195,7 @@ export default async function handler(
 			const commitedPaths = await extractCommitedPaths(
 				req.body,
 				application.bitbucket,
-				application.bitbucketRepositorySlug ||
-					application.bitbucketRepository ||
-					"",
+				application.bitbucketRepository || "",
 			);
 
 			const shouldDeployPaths = shouldDeploy(

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

@@ -100,9 +100,7 @@ export default async function handler(
 			const commitedPaths = await extractCommitedPaths(
 				req.body,
 				composeResult.bitbucket,
-				composeResult.bitbucketRepositorySlug ||
-					composeResult.bitbucketRepository ||
-					"",
+				composeResult.bitbucketRepository || "",
 			);
 
 			const shouldDeployPaths = shouldDeploy(

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

@@ -909,9 +909,7 @@ const EnvironmentPage = (
 									<ProjectEnvironment projectId={projectId}>
 										<Button variant="outline">Project Environment</Button>
 									</ProjectEnvironment>
-									{(auth?.role === "owner" ||
-										auth?.role === "admin" ||
-										auth?.canCreateServices) && (
+									{(auth?.role === "owner" || auth?.canCreateServices) && (
 										<DropdownMenu>
 											<DropdownMenuTrigger asChild>
 												<Button>
@@ -1034,7 +1032,6 @@ const EnvironmentPage = (
 													</Button>
 												</DialogAction>
 												{(auth?.role === "owner" ||
-													auth?.role === "admin" ||
 													auth?.canDeleteServices) && (
 													<>
 														<DialogAction
@@ -1624,39 +1621,9 @@ export async function getServerSideProps(
 				projectId: params.projectId,
 			});
 
-			// Try to fetch the requested environment
-			try {
-				await helpers.environment.one.fetch({
-					environmentId: params.environmentId,
-				});
-			} catch (error) {
-				// If user doesn't have access to requested environment, redirect to accessible one
-				const accessibleEnvironments =
-					await helpers.environment.byProjectId.fetch({
-						projectId: params.projectId,
-					});
-
-				if (accessibleEnvironments.length > 0) {
-					// Try to find default, otherwise use first accessible
-					const targetEnv =
-						accessibleEnvironments.find((env) => env.isDefault) ||
-						accessibleEnvironments[0];
-
-					return {
-						redirect: {
-							permanent: false,
-							destination: `/dashboard/project/${params.projectId}/environment/${targetEnv.environmentId}`,
-						},
-					};
-				}
-				// No accessible environments, redirect to home
-				return {
-					redirect: {
-						permanent: false,
-						destination: "/",
-					},
-				};
-			}
+			await helpers.environment.one.fetch({
+				environmentId: params.environmentId,
+			});
 
 			await helpers.environment.byProjectId.fetch({
 				projectId: params.projectId,

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

@@ -108,7 +108,6 @@ const Service = (
 					{ name: "Projects", href: "/dashboard/projects" },
 					{
 						name: data?.environment?.project?.name || "",
-						href: `/dashboard/project/${projectId}/environment/${environmentId}`,
 					},
 					{
 						name: data?.environment?.name || "",
@@ -193,9 +192,7 @@ const Service = (
 
 								<div className="flex flex-row gap-2 justify-end">
 									<UpdateApplication applicationId={applicationId} />
-									{(auth?.role === "owner" ||
-										auth?.role === "admin" ||
-										auth?.canDeleteServices) && (
+									{(auth?.role === "owner" || auth?.canDeleteServices) && (
 										<DeleteService id={applicationId} type="application" />
 									)}
 								</div>

apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/compose/[composeId].tsx

@@ -97,7 +97,6 @@ const Service = (
 					{ name: "Projects", href: "/dashboard/projects" },
 					{
 						name: data?.environment?.project?.name || "",
-						href: `/dashboard/project/${projectId}/environment/${environmentId}`,
 					},
 					{
 						name: data?.environment?.name || "",
@@ -183,9 +182,7 @@ const Service = (
 									<div className="flex flex-row gap-2 justify-end">
 										<UpdateCompose composeId={composeId} />
 
-										{(auth?.role === "owner" ||
-											auth?.role === "admin" ||
-											auth?.canDeleteServices) && (
+										{(auth?.role === "owner" || auth?.canDeleteServices) && (
 											<DeleteService id={composeId} type="compose" />
 										)}
 									</div>

apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mariadb/[mariadbId].tsx

@@ -79,7 +79,6 @@ const Mariadb = (
 					{ name: "Projects", href: "/dashboard/projects" },
 					{
 						name: data?.environment?.project?.name || "",
-						href: `/dashboard/project/${projectId}/environment/${environmentId}`,
 					},
 					{
 						name: data?.environment?.name || "",
@@ -157,9 +156,7 @@ const Mariadb = (
 								</div>
 								<div className="flex flex-row gap-2 justify-end">
 									<UpdateMariadb mariadbId={mariadbId} />
-									{(auth?.role === "owner" ||
-										auth?.role === "admin" ||
-										auth?.canDeleteServices) && (
+									{(auth?.role === "owner" || auth?.canDeleteServices) && (
 										<DeleteService id={mariadbId} type="mariadb" />
 									)}
 								</div>

apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mongo/[mongoId].tsx

@@ -78,7 +78,6 @@ const Mongo = (
 					{ name: "Projects", href: "/dashboard/projects" },
 					{
 						name: data?.environment?.project?.name || "",
-						href: `/dashboard/project/${projectId}/environment/${environmentId}`,
 					},
 					{
 						name: data?.environment?.name || "",
@@ -156,9 +155,7 @@ const Mongo = (
 
 								<div className="flex flex-row gap-2 justify-end">
 									<UpdateMongo mongoId={mongoId} />
-									{(auth?.role === "owner" ||
-										auth?.role === "admin" ||
-										auth?.canDeleteServices) && (
+									{(auth?.role === "owner" || auth?.canDeleteServices) && (
 										<DeleteService id={mongoId} type="mongo" />
 									)}
 								</div>

apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mysql/[mysqlId].tsx

@@ -77,7 +77,6 @@ const MySql = (
 					{ name: "Projects", href: "/dashboard/projects" },
 					{
 						name: data?.environment?.project?.name || "",
-						href: `/dashboard/project/${projectId}/environment/${environmentId}`,
 					},
 					{
 						name: data?.environment?.name || "",
@@ -157,9 +156,7 @@ const MySql = (
 
 									<div className="flex flex-row gap-2 justify-end">
 										<UpdateMysql mysqlId={mysqlId} />
-										{(auth?.role === "owner" ||
-											auth?.role === "admin" ||
-											auth?.canDeleteServices) && (
+										{(auth?.role === "owner" || auth?.canDeleteServices) && (
 											<DeleteService id={mysqlId} type="mysql" />
 										)}
 									</div>

apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/postgres/[postgresId].tsx

@@ -77,7 +77,6 @@ const Postgresql = (
 					{ name: "Projects", href: "/dashboard/projects" },
 					{
 						name: data?.environment?.project?.name || "",
-						href: `/dashboard/project/${projectId}/environment/${environmentId}`,
 					},
 					{
 						name: data?.environment?.name || "",
@@ -155,9 +154,7 @@ const Postgresql = (
 
 								<div className="flex flex-row gap-2 justify-end">
 									<UpdatePostgres postgresId={postgresId} />
-									{(auth?.role === "owner" ||
-										auth?.role === "admin" ||
-										auth?.canDeleteServices) && (
+									{(auth?.role === "owner" || auth?.canDeleteServices) && (
 										<DeleteService id={postgresId} type="postgres" />
 									)}
 								</div>

apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/redis/[redisId].tsx

@@ -77,7 +77,6 @@ const Redis = (
 					{ name: "Projects", href: "/dashboard/projects" },
 					{
 						name: data?.environment?.project?.name || "",
-						href: `/dashboard/project/${projectId}/environment/${environmentId}`,
 					},
 					{
 						name: data?.environment?.name || "",
@@ -155,9 +154,7 @@ const Redis = (
 
 								<div className="flex flex-row gap-2 justify-end">
 									<UpdateRedis redisId={redisId} />
-									{(auth?.role === "owner" ||
-										auth?.role === "admin" ||
-										auth?.canDeleteServices) && (
+									{(auth?.role === "owner" || auth?.canDeleteServices) && (
 										<DeleteService id={redisId} type="redis" />
 									)}
 								</div>

apps/dokploy/pages/dashboard/settings/invoices.tsx

@@ -1,63 +0,0 @@
-import { IS_CLOUD } from "@dokploy/server/constants";
-import { validateRequest } from "@dokploy/server/lib/auth";
-import { createServerSideHelpers } from "@trpc/react-query/server";
-import type { GetServerSidePropsContext } from "next";
-import type { ReactElement } from "react";
-import superjson from "superjson";
-import { ShowBillingInvoices } from "@/components/dashboard/settings/billing/show-billing-invoices";
-import { DashboardLayout } from "@/components/layouts/dashboard-layout";
-import { appRouter } from "@/server/api/root";
-
-const Page = () => {
-	return <ShowBillingInvoices />;
-};
-
-export default Page;
-
-Page.getLayout = (page: ReactElement) => {
-	return <DashboardLayout metaName="Invoices">{page}</DashboardLayout>;
-};
-export async function getServerSideProps(
-	ctx: GetServerSidePropsContext<{ serviceId: string }>,
-) {
-	if (!IS_CLOUD) {
-		return {
-			redirect: {
-				permanent: true,
-				destination: "/dashboard/projects",
-			},
-		};
-	}
-	const { req, res } = ctx;
-	const { user, session } = await validateRequest(req);
-	if (!user || user.role !== "owner") {
-		return {
-			redirect: {
-				permanent: true,
-				destination: "/",
-			},
-		};
-	}
-
-	const helpers = createServerSideHelpers({
-		router: appRouter,
-		ctx: {
-			req: req as any,
-			res: res as any,
-			db: null as any,
-			session: session as any,
-			user: user as any,
-		},
-		transformer: superjson,
-	});
-
-	await helpers.user.get.prefetch();
-
-	await helpers.settings.isCloud.prefetch();
-
-	return {
-		props: {
-			trpcState: helpers.dehydrate(),
-		},
-	};
-}

apps/dokploy/proprietary/README.md

@@ -1,18 +0,0 @@
-# Proprietary Features
-
-This directory contains all proprietary functionality of Dokploy.
-
-## Purpose
-
-This folder will house all **paid features** and premium functionality that are not part of the open source code.
-
-## License
-
-The code in this directory is under Dokploy's proprietary license. See [LICENSE_PROPRIETARY.md](../../../LICENSE_PROPRIETARY.md) for more details.
-
-## Contact
-
-If you want to learn more about our paid features or have any questions, please contact us at:
-
-- Email: [sales@dokploy.com](mailto:sales@dokploy.com)
-- Contact Form: [https://dokploy.com/contact](https://dokploy.com/contact)

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

@@ -469,7 +469,6 @@ export const applicationRouter = createTRPCRouter({
 			}
 			await updateApplication(input.applicationId, {
 				bitbucketRepository: input.bitbucketRepository,
-				bitbucketRepositorySlug: input.bitbucketRepositorySlug,
 				bitbucketOwner: input.bitbucketOwner,
 				bitbucketBranch: input.bitbucketBranch,
 				bitbucketBuildPath: input.bitbucketBuildPath,

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

@@ -285,7 +285,6 @@ export const backupRouter = createTRPCRouter({
 		.mutation(async ({ input }) => {
 			const backup = await findBackupById(input.backupId);
 			await runWebServerBackup(backup);
-			await keepLatestNBackups(backup);
 			return true;
 		}),
 	listBackupFiles: protectedProcedure

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

@@ -430,11 +430,7 @@ export const composeRouter = createTRPCRouter({
 					removeOnFail: true,
 				},
 			);
-			return {
-				success: true,
-				message: "Deployment queued",
-				composeId: compose.composeId,
-			};
+			return { success: true, message: "Deployment queued" };
 		}),
 	redeploy: protectedProcedure
 		.input(apiRedeployCompose)
@@ -472,11 +468,7 @@ export const composeRouter = createTRPCRouter({
 					removeOnFail: true,
 				},
 			);
-			return {
-				success: true,
-				message: "Redeployment queued",
-				composeId: compose.composeId,
-			};
+			return { success: true, message: "Redeployment queued" };
 		}),
 	stop: protectedProcedure
 		.input(apiFindCompose)

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

@@ -5,7 +5,6 @@ import {
 	createGotifyNotification,
 	createLarkNotification,
 	createNtfyNotification,
-	createPushoverNotification,
 	createSlackNotification,
 	createTelegramNotification,
 	findNotificationById,
@@ -18,7 +17,6 @@ import {
 	sendGotifyNotification,
 	sendLarkNotification,
 	sendNtfyNotification,
-	sendPushoverNotification,
 	sendServerThresholdNotifications,
 	sendSlackNotification,
 	sendTelegramNotification,
@@ -28,7 +26,6 @@ import {
 	updateGotifyNotification,
 	updateLarkNotification,
 	updateNtfyNotification,
-	updatePushoverNotification,
 	updateSlackNotification,
 	updateTelegramNotification,
 } from "@dokploy/server";
@@ -49,7 +46,6 @@ import {
 	apiCreateGotify,
 	apiCreateLark,
 	apiCreateNtfy,
-	apiCreatePushover,
 	apiCreateSlack,
 	apiCreateTelegram,
 	apiFindOneNotification,
@@ -59,7 +55,6 @@ import {
 	apiTestGotifyConnection,
 	apiTestLarkConnection,
 	apiTestNtfyConnection,
-	apiTestPushoverConnection,
 	apiTestSlackConnection,
 	apiTestTelegramConnection,
 	apiUpdateCustom,
@@ -68,7 +63,6 @@ import {
 	apiUpdateGotify,
 	apiUpdateLark,
 	apiUpdateNtfy,
-	apiUpdatePushover,
 	apiUpdateSlack,
 	apiUpdateTelegram,
 	notifications,
@@ -348,7 +342,6 @@ export const notificationRouter = createTRPCRouter({
 				ntfy: true,
 				custom: true,
 				lark: true,
-				pushover: true,
 			},
 			orderBy: desc(notifications.createdAt),
 			where: eq(notifications.organizationId, ctx.session.activeOrganizationId),
@@ -641,62 +634,6 @@ export const notificationRouter = createTRPCRouter({
 				});
 			}
 		}),
-	createPushover: adminProcedure
-		.input(apiCreatePushover)
-		.mutation(async ({ input, ctx }) => {
-			try {
-				return await createPushoverNotification(
-					input,
-					ctx.session.activeOrganizationId,
-				);
-			} catch (error) {
-				throw new TRPCError({
-					code: "BAD_REQUEST",
-					message: "Error creating the notification",
-					cause: error,
-				});
-			}
-		}),
-	updatePushover: adminProcedure
-		.input(apiUpdatePushover)
-		.mutation(async ({ input, ctx }) => {
-			try {
-				const notification = await findNotificationById(input.notificationId);
-				if (
-					IS_CLOUD &&
-					notification.organizationId !== ctx.session.activeOrganizationId
-				) {
-					throw new TRPCError({
-						code: "UNAUTHORIZED",
-						message: "You are not authorized to update this notification",
-					});
-				}
-				return await updatePushoverNotification({
-					...input,
-					organizationId: ctx.session.activeOrganizationId,
-				});
-			} catch (error) {
-				throw error;
-			}
-		}),
-	testPushoverConnection: adminProcedure
-		.input(apiTestPushoverConnection)
-		.mutation(async ({ input }) => {
-			try {
-				await sendPushoverNotification(
-					input,
-					"Test Notification",
-					"Hi, From Dokploy 👋",
-				);
-				return true;
-			} catch (error) {
-				throw new TRPCError({
-					code: "BAD_REQUEST",
-					message: "Error testing the notification",
-					cause: error,
-				});
-			}
-		}),
 	getEmailProviders: adminProcedure.query(async ({ ctx }) => {
 		return await db.query.notifications.findMany({
 			where: eq(notifications.organizationId, ctx.session.activeOrganizationId),

apps/dokploy/server/api/routers/preview-deployment.ts

@@ -2,15 +2,11 @@ import {
 	findApplicationById,
 	findPreviewDeploymentById,
 	findPreviewDeploymentsByApplicationId,
-	IS_CLOUD,
 	removePreviewDeployment,
 } from "@dokploy/server";
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
 import { apiFindAllByApplication } from "@/server/db/schema";
-import type { DeploymentJob } from "@/server/queues/queue-types";
-import { myQueue } from "@/server/queues/queueSetup";
-import { deploy } from "@/server/utils/deploy";
 import { createTRPCRouter, protectedProcedure } from "../trpc";
 
 export const previewDeploymentRouter = createTRPCRouter({
@@ -64,55 +60,4 @@ export const previewDeploymentRouter = createTRPCRouter({
 			}
 			return previewDeployment;
 		}),
-	redeploy: protectedProcedure
-		.input(
-			z.object({
-				previewDeploymentId: z.string(),
-				title: z.string().optional(),
-				description: z.string().optional(),
-			}),
-		)
-		.mutation(async ({ input, ctx }) => {
-			const previewDeployment = await findPreviewDeploymentById(
-				input.previewDeploymentId,
-			);
-			if (
-				previewDeployment.application.environment.project.organizationId !==
-				ctx.session.activeOrganizationId
-			) {
-				throw new TRPCError({
-					code: "UNAUTHORIZED",
-					message: "You are not authorized to redeploy this preview deployment",
-				});
-			}
-			const application = await findApplicationById(
-				previewDeployment.applicationId,
-			);
-			const jobData: DeploymentJob = {
-				applicationId: previewDeployment.applicationId,
-				titleLog: input.title || "Rebuild Preview Deployment",
-				descriptionLog: input.description || "",
-				type: "redeploy",
-				applicationType: "application-preview",
-				previewDeploymentId: input.previewDeploymentId,
-				server: !!application.serverId,
-			};
-
-			if (IS_CLOUD && application.serverId) {
-				jobData.serverId = application.serverId;
-				deploy(jobData).catch((error) => {
-					console.error("Background deployment failed:", error);
-				});
-				return true;
-			}
-			await myQueue.add(
-				"deployments",
-				{ ...jobData },
-				{
-					removeOnComplete: true,
-					removeOnFail: true,
-				},
-			);
-			return true;
-		}),
 });

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

@@ -88,7 +88,7 @@ export const settingsRouter = createTRPCRouter({
 		if (IS_CLOUD) {
 			return true;
 		}
-		await reloadDockerResource("dokploy", undefined, packageInfo.version);
+		await reloadDockerResource("dokploy");
 		return true;
 	}),
 	cleanRedis: adminProcedure.mutation(async () => {
@@ -399,7 +399,7 @@ export const settingsRouter = createTRPCRouter({
 			return DEFAULT_UPDATE_DATA;
 		}
 
-		return await getUpdateData(packageInfo.version);
+		return await getUpdateData();
 	}),
 	updateServer: adminProcedure.mutation(async () => {
 		if (IS_CLOUD) {

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

@@ -75,9 +75,9 @@ export const stripeRouter = createTRPCRouter({
 			const session = await stripe.checkout.sessions.create({
 				mode: "subscription",
 				line_items: items,
-				...(stripeCustomerId
-					? { customer: stripeCustomerId }
-					: { customer_email: owner.email }),
+				...(stripeCustomerId && {
+					customer: stripeCustomerId,
+				}),
 				metadata: {
 					adminId: owner.id,
 				},
@@ -128,39 +128,4 @@ export const stripeRouter = createTRPCRouter({
 
 		return servers.length < user.serversQuantity;
 	}),
-
-	getInvoices: adminProcedure.query(async ({ ctx }) => {
-		const user = await findUserById(ctx.user.ownerId);
-		const stripeCustomerId = user.stripeCustomerId;
-
-		if (!stripeCustomerId) {
-			return [];
-		}
-
-		const stripe = new Stripe(process.env.STRIPE_SECRET_KEY!, {
-			apiVersion: "2024-09-30.acacia",
-		});
-
-		try {
-			const invoices = await stripe.invoices.list({
-				customer: stripeCustomerId,
-				limit: 100,
-			});
-
-			return invoices.data.map((invoice) => ({
-				id: invoice.id,
-				number: invoice.number,
-				status: invoice.status,
-				amountDue: invoice.amount_due,
-				amountPaid: invoice.amount_paid,
-				currency: invoice.currency,
-				created: invoice.created,
-				dueDate: invoice.due_date,
-				hostedInvoiceUrl: invoice.hosted_invoice_url,
-				invoicePdf: invoice.invoice_pdf,
-			}));
-		} catch (_) {
-			return [];
-		}
-	}),
 });

apps/dokploy/server/db/drizzle.config.ts

@@ -1,11 +1,10 @@
-import { dbUrl } from "@dokploy/server/db";
 import { defineConfig } from "drizzle-kit";
 
 export default defineConfig({
 	schema: "./server/db/schema/index.ts",
 	dialect: "postgresql",
 	dbCredentials: {
-		url: dbUrl,
+		url: process.env.DATABASE_URL!,
 	},
 	out: "drizzle",
 	migrations: {

apps/dokploy/server/db/index.ts

@@ -1,4 +1,3 @@
-import { dbUrl } from "@dokploy/server/db/constants";
 import { drizzle, type PostgresJsDatabase } from "drizzle-orm/postgres-js";
 import postgres from "postgres";
 import * as schema from "./schema";
@@ -7,6 +6,10 @@ declare global {
 	var db: PostgresJsDatabase<typeof schema> | undefined;
 }
 
+const dbUrl =
+	process.env.DATABASE_URL ||
+	"postgres://dokploy:amukds4wi9001583845717ad2@dokploy-postgres:5432/dokploy";
+
 export let db: PostgresJsDatabase<typeof schema>;
 if (process.env.NODE_ENV === "production") {
 	db = drizzle(postgres(dbUrl!), {

apps/dokploy/server/db/migration.ts

@@ -1,9 +1,10 @@
-import { dbUrl } from "@dokploy/server/db";
 import { drizzle } from "drizzle-orm/postgres-js";
 import { migrate } from "drizzle-orm/postgres-js/migrator";
 import postgres from "postgres";
 
-const sql = postgres(dbUrl, { max: 1 });
+const connectionString = process.env.DATABASE_URL!;
+
+const sql = postgres(connectionString, { max: 1 });
 const db = drizzle(sql);
 
 export const migration = async () =>

apps/dokploy/server/db/reset.ts

@@ -1,10 +1,11 @@
-import { dbUrl } from "@dokploy/server/db";
 import { sql } from "drizzle-orm";
 // Credits to Louistiti from Drizzle Discord: https://discord.com/channels/1043890932593987624/1130802621750448160/1143083373535973406
 import { drizzle } from "drizzle-orm/postgres-js";
 import postgres from "postgres";
 
-const pg = postgres(dbUrl, { max: 1 });
+const connectionString = process.env.DATABASE_URL!;
+
+const pg = postgres(connectionString, { max: 1 });
 const db = drizzle(pg);
 
 const clearDb = async (): Promise<void> => {

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

@@ -4,7 +4,6 @@ import {
 	deployPreviewApplication,
 	rebuildApplication,
 	rebuildCompose,
-	rebuildPreviewApplication,
 	updateApplicationStatus,
 	updateCompose,
 	updatePreviewDeployment,
@@ -55,14 +54,7 @@ export const deploymentWorker = new Worker(
 					previewStatus: "running",
 				});
 
-				if (job.data.type === "redeploy") {
-					await rebuildPreviewApplication({
-						applicationId: job.data.applicationId,
-						titleLog: job.data.titleLog,
-						descriptionLog: job.data.descriptionLog,
-						previewDeploymentId: job.data.previewDeploymentId,
-					});
-				} else if (job.data.type === "deploy") {
+				if (job.data.type === "deploy") {
 					await deployPreviewApplication({
 						applicationId: job.data.applicationId,
 						titleLog: job.data.titleLog,

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

@@ -22,7 +22,7 @@ type DeployJob =
 			titleLog: string;
 			descriptionLog: string;
 			server?: boolean;
-			type: "deploy" | "redeploy";
+			type: "deploy";
 			applicationType: "application-preview";
 			previewDeploymentId: string;
 			serverId?: string;

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

@@ -1,9 +1,9 @@
 import type http from "node:http";
-import { findServerById, IS_CLOUD, validateRequest } from "@dokploy/server";
+import { findServerById, validateRequest } from "@dokploy/server";
 import { spawn } from "node-pty";
 import { Client } from "ssh2";
 import { WebSocketServer } from "ws";
-import { getShell, isValidContainerId } from "./utils";
+import { getShell } from "./utils";
 
 export const setupDockerContainerLogsWebSocketServer = (
 	server: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>,
@@ -42,12 +42,6 @@ export const setupDockerContainerLogsWebSocketServer = (
 			return;
 		}
 
-		// Security: Validate containerId to prevent command injection
-		if (!isValidContainerId(containerId)) {
-			ws.close(4000, "Invalid container ID format");
-			return;
-		}
-
 		if (!user || !session) {
 			ws.close();
 			return;
@@ -117,11 +111,6 @@ export const setupDockerContainerLogsWebSocketServer = (
 					client.end();
 				});
 			} else {
-				if (IS_CLOUD) {
-					ws.send("This feature is not available in the cloud version.");
-					ws.close();
-					return;
-				}
 				const shell = getShell();
 				const baseCommand = `docker ${runType === "swarm" ? "service" : "container"} logs --timestamps ${
 					runType === "swarm" ? "--raw" : ""

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

@@ -1,9 +1,9 @@
 import type http from "node:http";
-import { findServerById, IS_CLOUD, validateRequest } from "@dokploy/server";
+import { findServerById, validateRequest } from "@dokploy/server";
 import { spawn } from "node-pty";
 import { Client } from "ssh2";
 import { WebSocketServer } from "ws";
-import { isValidContainerId, isValidShell } from "./utils";
+import { getShell } from "./utils";
 
 export const setupDockerContainerTerminalWebSocketServer = (
 	server: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>,
@@ -35,25 +35,10 @@ export const setupDockerContainerTerminalWebSocketServer = (
 		const { user, session } = await validateRequest(req);
 
 		if (!containerId) {
-			ws.close(4000, "containerId not provided");
+			ws.close(4000, "containerId no provided");
 			return;
 		}
 
-		// Security: Validate containerId to prevent command injection
-		if (!isValidContainerId(containerId)) {
-			ws.close(4000, "Invalid container ID format");
-			return;
-		}
-
-		// Security: Validate shell to prevent command injection
-		if (activeWay && !isValidShell(activeWay)) {
-			ws.close(4000, "Invalid shell specified");
-			return;
-		}
-
-		// Default to 'sh' if no shell specified
-		const shell = activeWay || "sh";
-
 		if (!user || !session) {
 			ws.close();
 			return;
@@ -69,61 +54,55 @@ export const setupDockerContainerTerminalWebSocketServer = (
 				let _stderr = "";
 				conn
 					.once("ready", () => {
-						// Use array-style arguments to prevent shell injection
-						const dockerCommand = [
-							"docker",
-							"exec",
-							"-it",
-							"-w",
-							"/",
-							containerId,
-							shell,
-						].join(" ");
-						conn.exec(dockerCommand, { pty: true }, (err, stream) => {
-							if (err) {
-								console.error("SSH exec error:", err);
-								ws.close();
-								conn.end();
-								return;
-							}
-
-							stream
-								.on("close", (code: number, _signal: string) => {
-									ws.send(`\nContainer closed with code: ${code}\n`);
+						conn.exec(
+							`docker exec -it -w / ${containerId} ${activeWay}`,
+							{ pty: true },
+							(err, stream) => {
+								if (err) {
+									console.error("SSH exec error:", err);
+									ws.close();
 									conn.end();
-								})
-								.on("data", (data: string) => {
-									_stdout += data.toString();
-									ws.send(data.toString());
-								})
-								.stderr.on("data", (data) => {
-									_stderr += data.toString();
-									ws.send(data.toString());
-									console.error("Error: ", data.toString());
+									return;
+								}
+
+								stream
+									.on("close", (code: number, _signal: string) => {
+										ws.send(`\nContainer closed with code: ${code}\n`);
+										conn.end();
+									})
+									.on("data", (data: string) => {
+										_stdout += data.toString();
+										ws.send(data.toString());
+									})
+									.stderr.on("data", (data) => {
+										_stderr += data.toString();
+										ws.send(data.toString());
+										console.error("Error: ", data.toString());
+									});
+
+								ws.on("message", (message) => {
+									try {
+										let command: string | Buffer[] | Buffer | ArrayBuffer;
+										if (Buffer.isBuffer(message)) {
+											command = message.toString("utf8");
+										} else {
+											command = message;
+										}
+										stream.write(command.toString());
+									} catch (error) {
+										// @ts-ignore
+										const errorMessage = error?.message as unknown as string;
+										ws.send(errorMessage);
+									}
 								});
 
-							ws.on("message", (message) => {
-								try {
-									let command: string | Buffer[] | Buffer | ArrayBuffer;
-									if (Buffer.isBuffer(message)) {
-										command = message.toString("utf8");
-									} else {
-										command = message;
-									}
-									stream.write(command.toString());
-								} catch (error) {
-									// @ts-ignore
-									const errorMessage = error?.message as unknown as string;
-									ws.send(errorMessage);
-								}
-							});
-
-							ws.on("close", () => {
-								stream.end();
-								// Ensure SSH connection is closed when WebSocket closes
-								conn.end();
-							});
-						});
+								ws.on("close", () => {
+									stream.end();
+									// Ensure SSH connection is closed when WebSocket closes
+									conn.end();
+								});
+							},
+						);
 					})
 					.on("error", (err) => {
 						console.error("SSH connection error:", err);
@@ -140,14 +119,10 @@ export const setupDockerContainerTerminalWebSocketServer = (
 						privateKey: server.sshKey?.privateKey,
 					});
 			} else {
-				if (IS_CLOUD) {
-					ws.send("This feature is not available in the cloud version.");
-					ws.close();
-					return;
-				}
+				const shell = getShell();
 				const ptyProcess = spawn(
-					"docker",
-					["exec", "-it", "-w", "/", containerId, shell],
+					shell,
+					["-c", `docker exec -it -w / ${containerId} ${activeWay}`],
 					{},
 				);
 

apps/dokploy/server/wss/docker-stats.ts

@@ -4,7 +4,6 @@ import {
 	execAsync,
 	getHostSystemStats,
 	getLastAdvancedStatsFile,
-	IS_CLOUD,
 	recordAdvancedStats,
 	validateRequest,
 } from "@dokploy/server";
@@ -33,12 +32,6 @@ export const setupDockerStatsMonitoringSocketServer = (
 
 	wssTerm.on("connection", async (ws, req) => {
 		const url = new URL(req.url || "", `http://${req.headers.host}`);
-
-		if (IS_CLOUD) {
-			ws.send("This feature is not available in the cloud version.");
-			ws.close();
-			return;
-		}
 		const appName = url.searchParams.get("appName");
 		const appType = (url.searchParams.get("appType") || "application") as
 			| "application"

apps/dokploy/server/wss/listen-deployment.ts

@@ -1,9 +1,8 @@
 import { spawn } from "node:child_process";
 import type http from "node:http";
-import { findServerById, IS_CLOUD, validateRequest } from "@dokploy/server";
+import { findServerById, validateRequest } from "@dokploy/server";
 import { Client } from "ssh2";
 import { WebSocketServer } from "ws";
-import { readValidDirectory } from "./utils";
 
 export const setupDeploymentLogsWebSocketServer = (
 	server: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>,
@@ -41,11 +40,6 @@ export const setupDeploymentLogsWebSocketServer = (
 			return;
 		}
 
-		if (!readValidDirectory(logPath)) {
-			ws.close(4000, "Invalid log path");
-			return;
-		}
-
 		if (!user || !session) {
 			ws.close();
 			return;
@@ -114,11 +108,6 @@ export const setupDeploymentLogsWebSocketServer = (
 					}
 				});
 			} else {
-				if (IS_CLOUD) {
-					ws.send("This feature is not available in the cloud version.");
-					ws.close();
-					return;
-				}
 				tailProcess = spawn("tail", ["-n", "+1", "-f", logPath]);
 
 				const stdout = tailProcess.stdout;

apps/dokploy/server/wss/terminal.ts

@@ -97,12 +97,7 @@ export const setupTerminalWebSocketServer = (
 
 		const isLocalServer = serverId === "local";
 
-		if (isLocalServer) {
-			if (IS_CLOUD) {
-				ws.send("This feature is not available in the cloud version.");
-				ws.close();
-				return;
-			}
+		if (isLocalServer && !IS_CLOUD) {
 			const port = Number(url.searchParams.get("port"));
 			const username = url.searchParams.get("username");
 

apps/dokploy/server/wss/utils.ts

@@ -1,52 +1,9 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { execAsync, IS_CLOUD, paths } from "@dokploy/server";
+import { execAsync, paths } from "@dokploy/server";
 
-/**
- * Validates that the container ID matches Docker's expected format.
- * Docker container IDs are 64-character hex strings (or 12-char short form).
- * Also allows container names: alphanumeric, underscores, hyphens, and dots.
- */
-export const isValidContainerId = (id: string): boolean => {
-	// Match full ID (64 hex chars), short ID (12 hex chars), or container name
-	const hexPattern = /^[a-f0-9]{12,64}$/i;
-	const namePattern = /^[a-zA-Z0-9][a-zA-Z0-9_.-]*$/;
-	return hexPattern.test(id) || (namePattern.test(id) && id.length <= 128);
-};
-
-/**
- * Validates that the shell is one of the allowed shells.
- */
-export const isValidShell = (shell: string): boolean => {
-	const allowedShells = [
-		"sh",
-		"bash",
-		"zsh",
-		"ash",
-		"/bin/sh",
-		"/bin/bash",
-		"/bin/zsh",
-		"/bin/ash",
-	];
-	return allowedShells.includes(shell);
-};
-
-export const readValidDirectory = (directory: string) => {
-	const { BASE_PATH } = paths();
-
-	const resolvedBase = path.resolve(BASE_PATH);
-	const resolvedDir = path.resolve(directory);
-
-	return (
-		resolvedDir === resolvedBase ||
-		resolvedDir.startsWith(resolvedBase + path.sep)
-	);
-};
 export const getShell = () => {
-	if (IS_CLOUD) {
-		return "NO_AVAILABLE";
-	}
 	switch (os.platform()) {
 		case "win32":
 			return "powershell.exe";

apps/dokploy/setup.ts

@@ -22,7 +22,7 @@ import {
 		await initializeNetwork();
 		createDefaultTraefikConfig();
 		createDefaultServerTraefikConfig();
-		await execAsync("docker pull traefik:v3.6.7");
+		await execAsync("docker pull traefik:v3.6.1");
 		await initializeStandaloneTraefik();
 		await initializeRedis();
 		await initializePostgres();

apps/monitoring/database/containers.go

@@ -58,7 +58,7 @@ func (db *DB) GetLastNContainerMetrics(containerName string, limit int) ([]Conta
 		WITH recent_metrics AS (
 			SELECT metrics_json
 			FROM container_metrics
-			WHERE container_name = ?
+			WHERE container_name LIKE ? || '%'
 			ORDER BY timestamp DESC
 			LIMIT ?
 		)
@@ -98,7 +98,7 @@ func (db *DB) GetAllMetricsContainer(containerName string) ([]ContainerMetric, e
 		WITH recent_metrics AS (
 			SELECT metrics_json
 			FROM container_metrics
-			WHERE container_name = ?
+			WHERE container_name LIKE ? || '%'
 			ORDER BY timestamp DESC
 		)
 		SELECT metrics_json FROM recent_metrics ORDER BY json_extract(metrics_json, '$.timestamp') ASC

biome.json

@@ -1,7 +1,6 @@
 {
 	"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
 	"files": {
-		"ignoreUnknown": true,
 		"includes": [
 			"**",
 			"!**/.docker",