Merge branch 'canary' into feat/introduce-server-pay

apps/dokploy/__test__/compose/compose.test.ts

@@ -1,7 +1,7 @@
 import type { ComposeSpecification } from "@dokploy/server";
 import { addSuffixToAllProperties } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 const composeFile1 = `
 version: "3.8"
@@ -61,7 +61,7 @@ secrets:
     file: ./db_password.txt
 `;
 
-const expectedComposeFile1 = parse(`
+const expectedComposeFile1 = load(`
 version: "3.8"
 
 services:
@@ -120,7 +120,7 @@ secrets:
 `) as ComposeSpecification;
 
 test("Add suffix to all properties in compose file 1", () => {
-	const composeData = parse(composeFile1) as ComposeSpecification;
+	const composeData = load(composeFile1) as ComposeSpecification;
 	const suffix = "testhash";
 
 	const updatedComposeData = addSuffixToAllProperties(composeData, suffix);
@@ -185,7 +185,7 @@ secrets:
     file: ./db_password.txt
 `;
 
-const expectedComposeFile2 = parse(`
+const expectedComposeFile2 = load(`
 version: "3.8"
 
 services:
@@ -243,7 +243,7 @@ secrets:
 `) as ComposeSpecification;
 
 test("Add suffix to all properties in compose file 2", () => {
-	const composeData = parse(composeFile2) as ComposeSpecification;
+	const composeData = load(composeFile2) as ComposeSpecification;
 	const suffix = "testhash";
 
 	const updatedComposeData = addSuffixToAllProperties(composeData, suffix);
@@ -308,7 +308,7 @@ secrets:
     file: ./service_secret.txt
 `;
 
-const expectedComposeFile3 = parse(`
+const expectedComposeFile3 = load(`
 version: "3.8"
 
 services:
@@ -366,7 +366,7 @@ secrets:
 `) as ComposeSpecification;
 
 test("Add suffix to all properties in compose file 3", () => {
-	const composeData = parse(composeFile3) as ComposeSpecification;
+	const composeData = load(composeFile3) as ComposeSpecification;
 	const suffix = "testhash";
 
 	const updatedComposeData = addSuffixToAllProperties(composeData, suffix);
@@ -420,7 +420,7 @@ volumes:
     driver: local
 `;
 
-const expectedComposeFile = parse(`
+const expectedComposeFile = load(`
 version: "3.8"
 
 services:
@@ -467,7 +467,7 @@ volumes:
 `) as ComposeSpecification;
 
 test("Add suffix to all properties in Plausible compose file", () => {
-	const composeData = parse(composeFile) as ComposeSpecification;
+	const composeData = load(composeFile) as ComposeSpecification;
 	const suffix = "testhash";
 
 	const updatedComposeData = addSuffixToAllProperties(composeData, suffix);

apps/dokploy/__test__/compose/config/config-root.test.ts

@@ -1,7 +1,7 @@
 import type { ComposeSpecification } from "@dokploy/server";
 import { addSuffixToConfigsRoot, generateRandomHash } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 test("Generate random hash with 8 characters", () => {
 	const hash = generateRandomHash();
@@ -23,7 +23,7 @@ configs:
 `;
 
 test("Add suffix to configs in root property", () => {
-	const composeData = parse(composeFile) as ComposeSpecification;
+	const composeData = load(composeFile) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -59,7 +59,7 @@ configs:
 `;
 
 test("Add suffix to multiple configs in root property", () => {
-	const composeData = parse(composeFileMultipleConfigs) as ComposeSpecification;
+	const composeData = load(composeFileMultipleConfigs) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -92,7 +92,7 @@ configs:
 `;
 
 test("Add suffix to configs with different properties in root property", () => {
-	const composeData = parse(
+	const composeData = load(
 		composeFileDifferentProperties,
 	) as ComposeSpecification;
 
@@ -137,7 +137,7 @@ configs:
 `;
 
 // Expected compose file con el prefijo `testhash`
-const expectedComposeFileConfigRoot = parse(`
+const expectedComposeFileConfigRoot = load(`
 version: "3.8"
 
 services:
@@ -162,7 +162,7 @@ configs:
 `) as ComposeSpecification;
 
 test("Add suffix to configs in root property", () => {
-	const composeData = parse(composeFileConfigRoot) as ComposeSpecification;
+	const composeData = load(composeFileConfigRoot) as ComposeSpecification;
 
 	const suffix = "testhash";
 

apps/dokploy/__test__/compose/config/config-service.test.ts

@@ -3,8 +3,8 @@ import {
 	addSuffixToConfigsInServices,
 	generateRandomHash,
 } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 const composeFile = `
 version: "3.8"
@@ -22,7 +22,7 @@ configs:
 `;
 
 test("Add suffix to configs in services", () => {
-	const composeData = parse(composeFile) as ComposeSpecification;
+	const composeData = load(composeFile) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -54,7 +54,7 @@ configs:
 `;
 
 test("Add suffix to configs in services with single config", () => {
-	const composeData = parse(
+	const composeData = load(
 		composeFileSingleServiceConfig,
 	) as ComposeSpecification;
 
@@ -108,7 +108,7 @@ configs:
 `;
 
 test("Add suffix to configs in services with multiple configs", () => {
-	const composeData = parse(
+	const composeData = load(
 		composeFileMultipleServicesConfigs,
 	) as ComposeSpecification;
 
@@ -157,7 +157,7 @@ services:
 `;
 
 // Expected compose file con el prefijo `testhash`
-const expectedComposeFileConfigServices = parse(`
+const expectedComposeFileConfigServices = load(`
 version: "3.8"
 
 services:
@@ -182,7 +182,7 @@ services:
 `) as ComposeSpecification;
 
 test("Add suffix to configs in services", () => {
-	const composeData = parse(composeFileConfigServices) as ComposeSpecification;
+	const composeData = load(composeFileConfigServices) as ComposeSpecification;
 
 	const suffix = "testhash";
 

apps/dokploy/__test__/compose/config/config.test.ts

@@ -1,7 +1,7 @@
 import type { ComposeSpecification } from "@dokploy/server";
 import { addSuffixToAllConfigs, generateRandomHash } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 test("Generate random hash with 8 characters", () => {
 	const hash = generateRandomHash();
@@ -43,7 +43,7 @@ configs:
     file: ./db-config.yml
 `;
 
-const expectedComposeFileCombinedConfigs = parse(`
+const expectedComposeFileCombinedConfigs = load(`
 version: "3.8"
 
 services:
@@ -77,7 +77,7 @@ configs:
 `) as ComposeSpecification;
 
 test("Add suffix to all configs in root and services", () => {
-	const composeData = parse(composeFileCombinedConfigs) as ComposeSpecification;
+	const composeData = load(composeFileCombinedConfigs) as ComposeSpecification;
 
 	const suffix = "testhash";
 
@@ -122,7 +122,7 @@ configs:
     file: ./db-config.yml
 `;
 
-const expectedComposeFileWithEnvAndExternal = parse(`
+const expectedComposeFileWithEnvAndExternal = load(`
 version: "3.8"
 
 services:
@@ -159,7 +159,7 @@ configs:
 `) as ComposeSpecification;
 
 test("Add suffix to configs with environment and external", () => {
-	const composeData = parse(
+	const composeData = load(
 		composeFileWithEnvAndExternal,
 	) as ComposeSpecification;
 
@@ -200,7 +200,7 @@ configs:
     file: ./db-config.yml
 `;
 
-const expectedComposeFileWithTemplateDriverAndLabels = parse(`
+const expectedComposeFileWithTemplateDriverAndLabels = load(`
 version: "3.8"
 
 services:
@@ -231,7 +231,7 @@ configs:
 `) as ComposeSpecification;
 
 test("Add suffix to configs with template driver and labels", () => {
-	const composeData = parse(
+	const composeData = load(
 		composeFileWithTemplateDriverAndLabels,
 	) as ComposeSpecification;
 

apps/dokploy/__test__/compose/network/network-root.test.ts

@@ -1,7 +1,7 @@
 import type { ComposeSpecification } from "@dokploy/server";
 import { addSuffixToNetworksRoot, generateRandomHash } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 const composeFile = `
 version: "3.8"
@@ -35,7 +35,7 @@ test("Generate random hash with 8 characters", () => {
 });
 
 test("Add suffix to networks root property", () => {
-	const composeData = parse(composeFile) as ComposeSpecification;
+	const composeData = load(composeFile) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -79,7 +79,7 @@ networks:
 `;
 
 test("Add suffix to advanced networks root property (2 TRY)", () => {
-	const composeData = parse(composeFile2) as ComposeSpecification;
+	const composeData = load(composeFile2) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -120,7 +120,7 @@ networks:
 `;
 
 test("Add suffix to networks with external properties", () => {
-	const composeData = parse(composeFile3) as ComposeSpecification;
+	const composeData = load(composeFile3) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -160,7 +160,7 @@ networks:
 `;
 
 test("Add suffix to networks with IPAM configurations", () => {
-	const composeData = parse(composeFile4) as ComposeSpecification;
+	const composeData = load(composeFile4) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -201,7 +201,7 @@ networks:
 `;
 
 test("Add suffix to networks with custom options", () => {
-	const composeData = parse(composeFile5) as ComposeSpecification;
+	const composeData = load(composeFile5) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -264,7 +264,7 @@ networks:
 `;
 
 test("Add suffix to networks with static suffix", () => {
-	const composeData = parse(composeFile6) as ComposeSpecification;
+	const composeData = load(composeFile6) as ComposeSpecification;
 
 	const suffix = "testhash";
 
@@ -273,7 +273,7 @@ test("Add suffix to networks with static suffix", () => {
 	}
 	const networks = addSuffixToNetworksRoot(composeData.networks, suffix);
 
-	const expectedComposeData = parse(
+	const expectedComposeData = load(
 		expectedComposeFile6,
 	) as ComposeSpecification;
 	expect(networks).toStrictEqual(expectedComposeData.networks);
@@ -293,7 +293,7 @@ networks:
 `;
 
 test("It shoudn't add suffix to dokploy-network", () => {
-	const composeData = parse(composeFile7) as ComposeSpecification;
+	const composeData = load(composeFile7) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 

apps/dokploy/__test__/compose/network/network-service.test.ts

@@ -3,8 +3,8 @@ import {
 	addSuffixToServiceNetworks,
 	generateRandomHash,
 } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 const composeFile = `
 version: "3.8"
@@ -23,7 +23,7 @@ services:
 `;
 
 test("Add suffix to networks in services", () => {
-	const composeData = parse(composeFile) as ComposeSpecification;
+	const composeData = load(composeFile) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -67,7 +67,7 @@ networks:
 `;
 
 test("Add suffix to networks in services with aliases", () => {
-	const composeData = parse(composeFile2) as ComposeSpecification;
+	const composeData = load(composeFile2) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -107,7 +107,7 @@ networks:
 `;
 
 test("Add suffix to networks in services (Object with simple networks)", () => {
-	const composeData = parse(composeFile3) as ComposeSpecification;
+	const composeData = load(composeFile3) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -153,7 +153,7 @@ networks:
 `;
 
 test("Add suffix to networks in services (combined case)", () => {
-	const composeData = parse(composeFileCombined) as ComposeSpecification;
+	const composeData = load(composeFileCombined) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -196,7 +196,7 @@ services:
 `;
 
 test("It shoudn't add suffix to dokploy-network in services", () => {
-	const composeData = parse(composeFile7) as ComposeSpecification;
+	const composeData = load(composeFile7) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -245,7 +245,7 @@ services:
 `;
 
 test("It shoudn't add suffix to dokploy-network in services multiples cases", () => {
-	const composeData = parse(composeFile8) as ComposeSpecification;
+	const composeData = load(composeFile8) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 

apps/dokploy/__test__/compose/network/network.test.ts

@@ -5,8 +5,8 @@ import {
 	addSuffixToServiceNetworks,
 	generateRandomHash,
 } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 const composeFileCombined = `
 version: "3.8"
@@ -39,7 +39,7 @@ networks:
 `;
 
 test("Add suffix to networks in services and root (combined case)", () => {
-	const composeData = parse(composeFileCombined) as ComposeSpecification;
+	const composeData = load(composeFileCombined) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -89,7 +89,7 @@ test("Add suffix to networks in services and root (combined case)", () => {
 	expect(redisNetworks).not.toHaveProperty("backend");
 });
 
-const expectedComposeFile = parse(`
+const expectedComposeFile = load(`
 version: "3.8"
 
 services:
@@ -120,7 +120,7 @@ networks:
 `);
 
 test("Add suffix to networks in compose file", () => {
-	const composeData = parse(composeFileCombined) as ComposeSpecification;
+	const composeData = load(composeFileCombined) as ComposeSpecification;
 
 	const suffix = "testhash";
 	if (!composeData?.networks) {
@@ -156,7 +156,7 @@ networks:
     driver: bridge
 `;
 
-const expectedComposeFile2 = parse(`
+const expectedComposeFile2 = load(`
 version: "3.8"
 
 services:
@@ -182,7 +182,7 @@ networks:
 `);
 
 test("Add suffix to networks in compose file with external and internal networks", () => {
-	const composeData = parse(composeFile2) as ComposeSpecification;
+	const composeData = load(composeFile2) as ComposeSpecification;
 
 	const suffix = "testhash";
 	const updatedComposeData = addSuffixToAllNetworks(composeData, suffix);
@@ -218,7 +218,7 @@ networks:
       com.docker.network.bridge.enable_icc: "true"
 `;
 
-const expectedComposeFile3 = parse(`
+const expectedComposeFile3 = load(`
 version: "3.8"
 
 services:
@@ -247,7 +247,7 @@ networks:
 `);
 
 test("Add suffix to networks in compose file with multiple services and complex network configurations", () => {
-	const composeData = parse(composeFile3) as ComposeSpecification;
+	const composeData = load(composeFile3) as ComposeSpecification;
 
 	const suffix = "testhash";
 	const updatedComposeData = addSuffixToAllNetworks(composeData, suffix);
@@ -289,7 +289,7 @@ networks:
 
 `;
 
-const expectedComposeFile4 = parse(`
+const expectedComposeFile4 = load(`
 version: "3.8"
 
 services:
@@ -326,7 +326,7 @@ networks:
 `);
 
 test("Expect don't add suffix to dokploy-network in compose file with multiple services and complex network configurations", () => {
-	const composeData = parse(composeFile4) as ComposeSpecification;
+	const composeData = load(composeFile4) as ComposeSpecification;
 
 	const suffix = "testhash";
 	const updatedComposeData = addSuffixToAllNetworks(composeData, suffix);

apps/dokploy/__test__/compose/secrets/secret-root.test.ts

@@ -1,7 +1,7 @@
 import type { ComposeSpecification } from "@dokploy/server";
 import { addSuffixToSecretsRoot, generateRandomHash } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 test("Generate random hash with 8 characters", () => {
 	const hash = generateRandomHash();
@@ -23,7 +23,7 @@ secrets:
 `;
 
 test("Add suffix to secrets in root property", () => {
-	const composeData = parse(composeFileSecretsRoot) as ComposeSpecification;
+	const composeData = load(composeFileSecretsRoot) as ComposeSpecification;
 	const suffix = generateRandomHash();
 
 	if (!composeData?.secrets) {
@@ -52,7 +52,7 @@ secrets:
 `;
 
 test("Add suffix to secrets in root property (Test 1)", () => {
-	const composeData = parse(composeFileSecretsRoot1) as ComposeSpecification;
+	const composeData = load(composeFileSecretsRoot1) as ComposeSpecification;
 	const suffix = generateRandomHash();
 
 	if (!composeData?.secrets) {
@@ -84,7 +84,7 @@ secrets:
 `;
 
 test("Add suffix to secrets in root property (Test 2)", () => {
-	const composeData = parse(composeFileSecretsRoot2) as ComposeSpecification;
+	const composeData = load(composeFileSecretsRoot2) as ComposeSpecification;
 	const suffix = generateRandomHash();
 
 	if (!composeData?.secrets) {

apps/dokploy/__test__/compose/secrets/secret-services.test.ts

@@ -3,8 +3,8 @@ import {
 	addSuffixToSecretsInServices,
 	generateRandomHash,
 } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 const composeFileSecretsServices = `
 version: "3.8"
@@ -21,7 +21,7 @@ secrets:
 `;
 
 test("Add suffix to secrets in services", () => {
-	const composeData = parse(composeFileSecretsServices) as ComposeSpecification;
+	const composeData = load(composeFileSecretsServices) as ComposeSpecification;
 	const suffix = generateRandomHash();
 
 	if (!composeData.services) {
@@ -54,9 +54,7 @@ secrets:
 `;
 
 test("Add suffix to secrets in services (Test 1)", () => {
-	const composeData = parse(
-		composeFileSecretsServices1,
-	) as ComposeSpecification;
+	const composeData = load(composeFileSecretsServices1) as ComposeSpecification;
 	const suffix = generateRandomHash();
 
 	if (!composeData.services) {
@@ -95,9 +93,7 @@ secrets:
 `;
 
 test("Add suffix to secrets in services (Test 2)", () => {
-	const composeData = parse(
-		composeFileSecretsServices2,
-	) as ComposeSpecification;
+	const composeData = load(composeFileSecretsServices2) as ComposeSpecification;
 	const suffix = generateRandomHash();
 
 	if (!composeData.services) {

apps/dokploy/__test__/compose/secrets/secret.test.ts

@@ -1,7 +1,7 @@
 import type { ComposeSpecification } from "@dokploy/server";
 import { addSuffixToAllSecrets } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 const composeFileCombinedSecrets = `
 version: "3.8"
@@ -25,7 +25,7 @@ secrets:
     file: ./app_secret.txt
 `;
 
-const expectedComposeFileCombinedSecrets = parse(`
+const expectedComposeFileCombinedSecrets = load(`
 version: "3.8"
 
 services:
@@ -48,7 +48,7 @@ secrets:
 `) as ComposeSpecification;
 
 test("Add suffix to all secrets", () => {
-	const composeData = parse(composeFileCombinedSecrets) as ComposeSpecification;
+	const composeData = load(composeFileCombinedSecrets) as ComposeSpecification;
 	const suffix = "testhash";
 
 	const updatedComposeData = addSuffixToAllSecrets(composeData, suffix);
@@ -77,7 +77,7 @@ secrets:
     file: ./cache_secret.txt
 `;
 
-const expectedComposeFileCombinedSecrets3 = parse(`
+const expectedComposeFileCombinedSecrets3 = load(`
 version: "3.8"
 
 services:
@@ -99,9 +99,7 @@ secrets:
 `) as ComposeSpecification;
 
 test("Add suffix to all secrets (3rd Case)", () => {
-	const composeData = parse(
-		composeFileCombinedSecrets3,
-	) as ComposeSpecification;
+	const composeData = load(composeFileCombinedSecrets3) as ComposeSpecification;
 	const suffix = "testhash";
 
 	const updatedComposeData = addSuffixToAllSecrets(composeData, suffix);
@@ -130,7 +128,7 @@ secrets:
     file: ./db_password.txt
 `;
 
-const expectedComposeFileCombinedSecrets4 = parse(`
+const expectedComposeFileCombinedSecrets4 = load(`
 version: "3.8"
 
 services:
@@ -152,9 +150,7 @@ secrets:
 `) as ComposeSpecification;
 
 test("Add suffix to all secrets (4th Case)", () => {
-	const composeData = parse(
-		composeFileCombinedSecrets4,
-	) as ComposeSpecification;
+	const composeData = load(composeFileCombinedSecrets4) as ComposeSpecification;
 	const suffix = "testhash";
 
 	const updatedComposeData = addSuffixToAllSecrets(composeData, suffix);

apps/dokploy/__test__/compose/service/service-container-name.test.ts

@@ -1,7 +1,7 @@
 import type { ComposeSpecification } from "@dokploy/server";
 import { addSuffixToServiceNames, generateRandomHash } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 const composeFile = `
 version: "3.8"
@@ -27,7 +27,7 @@ test("Generate random hash with 8 characters", () => {
 });
 
 test("Add suffix to service names with container_name in compose file", () => {
-	const composeData = parse(composeFile) as ComposeSpecification;
+	const composeData = load(composeFile) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 

apps/dokploy/__test__/compose/service/service-depends-on.test.ts

@@ -1,7 +1,7 @@
 import type { ComposeSpecification } from "@dokploy/server";
 import { addSuffixToServiceNames, generateRandomHash } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 test("Generate random hash with 8 characters", () => {
 	const hash = generateRandomHash();
@@ -32,7 +32,7 @@ networks:
 `;
 
 test("Add suffix to service names with depends_on (array) in compose file", () => {
-	const composeData = parse(composeFile4) as ComposeSpecification;
+	const composeData = load(composeFile4) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -102,7 +102,7 @@ networks:
 `;
 
 test("Add suffix to service names with depends_on (object) in compose file", () => {
-	const composeData = parse(composeFile5) as ComposeSpecification;
+	const composeData = load(composeFile5) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 

apps/dokploy/__test__/compose/service/service-extends.test.ts

@@ -1,7 +1,7 @@
 import type { ComposeSpecification } from "@dokploy/server";
 import { addSuffixToServiceNames, generateRandomHash } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 test("Generate random hash with 8 characters", () => {
 	const hash = generateRandomHash();
@@ -30,7 +30,7 @@ networks:
 `;
 
 test("Add suffix to service names with extends (string) in compose file", () => {
-	const composeData = parse(composeFile6) as ComposeSpecification;
+	const composeData = load(composeFile6) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -90,7 +90,7 @@ networks:
 `;
 
 test("Add suffix to service names with extends (object) in compose file", () => {
-	const composeData = parse(composeFile7) as ComposeSpecification;
+	const composeData = load(composeFile7) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 

apps/dokploy/__test__/compose/service/service-links.test.ts

@@ -1,7 +1,7 @@
 import type { ComposeSpecification } from "@dokploy/server";
 import { addSuffixToServiceNames, generateRandomHash } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 test("Generate random hash with 8 characters", () => {
 	const hash = generateRandomHash();
@@ -31,7 +31,7 @@ networks:
 `;
 
 test("Add suffix to service names with links in compose file", () => {
-	const composeData = parse(composeFile2) as ComposeSpecification;
+	const composeData = load(composeFile2) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 

apps/dokploy/__test__/compose/service/service-names.test.ts

@@ -1,7 +1,7 @@
 import type { ComposeSpecification } from "@dokploy/server";
 import { addSuffixToServiceNames, generateRandomHash } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 test("Generate random hash with 8 characters", () => {
 	const hash = generateRandomHash();
@@ -26,7 +26,7 @@ networks:
 `;
 
 test("Add suffix to service names in compose file", () => {
-	const composeData = parse(composeFile) as ComposeSpecification;
+	const composeData = load(composeFile) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 

apps/dokploy/__test__/compose/service/service.test.ts

@@ -3,8 +3,8 @@ import {
 	addSuffixToAllServiceNames,
 	addSuffixToServiceNames,
 } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 const composeFileCombinedAllCases = `
 version: "3.8"
@@ -38,7 +38,7 @@ networks:
     driver: bridge
 `;
 
-const expectedComposeFile = parse(`
+const expectedComposeFile = load(`
 version: "3.8"
 
 services:
@@ -71,9 +71,7 @@ networks:
 `);
 
 test("Add suffix to all service names in compose file", () => {
-	const composeData = parse(
-		composeFileCombinedAllCases,
-	) as ComposeSpecification;
+	const composeData = load(composeFileCombinedAllCases) as ComposeSpecification;
 
 	const suffix = "testhash";
 
@@ -133,7 +131,7 @@ networks:
     driver: bridge
 `;
 
-const expectedComposeFile1 = parse(`
+const expectedComposeFile1 = load(`
 version: "3.8"
 
 services:
@@ -178,7 +176,7 @@ networks:
 `) as ComposeSpecification;
 
 test("Add suffix to all service names in compose file 1", () => {
-	const composeData = parse(composeFile1) as ComposeSpecification;
+	const composeData = load(composeFile1) as ComposeSpecification;
 	const suffix = "testhash";
 
 	const updatedComposeData = addSuffixToAllServiceNames(composeData, suffix);
@@ -229,7 +227,7 @@ networks:
     driver: bridge
 `;
 
-const expectedComposeFile2 = parse(`
+const expectedComposeFile2 = load(`
 version: "3.8"
 
 services:
@@ -273,7 +271,7 @@ networks:
 `) as ComposeSpecification;
 
 test("Add suffix to all service names in compose file 2", () => {
-	const composeData = parse(composeFile2) as ComposeSpecification;
+	const composeData = load(composeFile2) as ComposeSpecification;
 	const suffix = "testhash";
 
 	const updatedComposeData = addSuffixToAllServiceNames(composeData, suffix);
@@ -324,7 +322,7 @@ networks:
     driver: bridge
 `;
 
-const expectedComposeFile3 = parse(`
+const expectedComposeFile3 = load(`
 version: "3.8"
 
 services:
@@ -368,7 +366,7 @@ networks:
 `) as ComposeSpecification;
 
 test("Add suffix to all service names in compose file 3", () => {
-	const composeData = parse(composeFile3) as ComposeSpecification;
+	const composeData = load(composeFile3) as ComposeSpecification;
 	const suffix = "testhash";
 
 	const updatedComposeData = addSuffixToAllServiceNames(composeData, suffix);

apps/dokploy/__test__/compose/service/sevice-volumes-from.test.ts

@@ -1,7 +1,7 @@
 import type { ComposeSpecification } from "@dokploy/server";
 import { addSuffixToServiceNames, generateRandomHash } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 test("Generate random hash with 8 characters", () => {
 	const hash = generateRandomHash();
@@ -35,7 +35,7 @@ networks:
 `;
 
 test("Add suffix to service names with volumes_from in compose file", () => {
-	const composeData = parse(composeFile3) as ComposeSpecification;
+	const composeData = load(composeFile3) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 

apps/dokploy/__test__/compose/volume/volume-2.test.ts

@@ -4,8 +4,8 @@ import {
 	addSuffixToVolumesRoot,
 	generateRandomHash,
 } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 const composeFile = `
 services:
@@ -70,7 +70,7 @@ volumes:
     driver: local
 `;
 
-const expectedDockerCompose = parse(`
+const expectedDockerCompose = load(`
 services:
   mail:
     image: bytemark/smtp
@@ -143,7 +143,7 @@ test("Generate random hash with 8 characters", () => {
 // Docker compose needs unique names for services, volumes, networks and containers
 // So base on a input which is a dockercompose file, it should replace the name with a hash and return a new dockercompose file
 test("Add suffix to volumes root property", () => {
-	const composeData = parse(composeFile) as ComposeSpecification;
+	const composeData = load(composeFile) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -165,7 +165,7 @@ test("Add suffix to volumes root property", () => {
 });
 
 test("Expect to change the suffix in all the possible places", () => {
-	const composeData = parse(composeFile) as ComposeSpecification;
+	const composeData = load(composeFile) as ComposeSpecification;
 	const suffix = "testhash";
 
 	const updatedComposeData = addSuffixToAllVolumes(composeData, suffix);
@@ -195,7 +195,7 @@ volumes:
   mongo-data:
 `;
 
-const expectedDockerCompose2 = parse(`
+const expectedDockerCompose2 = load(`
 version: '3.8'
 services:
   app:
@@ -218,7 +218,7 @@ volumes:
 `) as ComposeSpecification;
 
 test("Expect to change the suffix in all the possible places (2 Try)", () => {
-	const composeData = parse(composeFile2) as ComposeSpecification;
+	const composeData = load(composeFile2) as ComposeSpecification;
 	const suffix = "testhash";
 
 	const updatedComposeData = addSuffixToAllVolumes(composeData, suffix);
@@ -248,7 +248,7 @@ volumes:
   mongo-data:
 `;
 
-const expectedDockerCompose3 = parse(`
+const expectedDockerCompose3 = load(`
 version: '3.8'
 services:
   app:
@@ -271,7 +271,7 @@ volumes:
 `) as ComposeSpecification;
 
 test("Expect to change the suffix in all the possible places (3 Try)", () => {
-	const composeData = parse(composeFile3) as ComposeSpecification;
+	const composeData = load(composeFile3) as ComposeSpecification;
 	const suffix = "testhash";
 
 	const updatedComposeData = addSuffixToAllVolumes(composeData, suffix);
@@ -645,7 +645,7 @@ volumes:
   db-config:
 `;
 
-const expectedDockerComposeComplex = parse(`
+const expectedDockerComposeComplex = load(`
 version: "3.8"
 services:
   studio:
@@ -1012,7 +1012,7 @@ volumes:
 `);
 
 test("Expect to change the suffix in all the possible places (4 Try)", () => {
-	const composeData = parse(composeFileComplex) as ComposeSpecification;
+	const composeData = load(composeFileComplex) as ComposeSpecification;
 	const suffix = "testhash";
 
 	const updatedComposeData = addSuffixToAllVolumes(composeData, suffix);
@@ -1065,7 +1065,7 @@ volumes:
   db-data:
 `;
 
-const expectedDockerComposeExample1 = parse(`
+const expectedDockerComposeExample1 = load(`
 version: "3.8"
 services:
   web:
@@ -1111,7 +1111,7 @@ volumes:
 `) as ComposeSpecification;
 
 test("Expect to change the suffix in all the possible places (5 Try)", () => {
-	const composeData = parse(composeFileExample1) as ComposeSpecification;
+	const composeData = load(composeFileExample1) as ComposeSpecification;
 	const suffix = "testhash";
 
 	const updatedComposeData = addSuffixToAllVolumes(composeData, suffix);
@@ -1143,7 +1143,7 @@ volumes:
   backrest-cache:
 `;
 
-const expectedDockerComposeBackrest = parse(`
+const expectedDockerComposeBackrest = load(`
 services:
   backrest:
     image: garethgeorge/backrest:v1.7.3
@@ -1168,7 +1168,7 @@ volumes:
 `) as ComposeSpecification;
 
 test("Should handle volume paths with subdirectories correctly", () => {
-	const composeData = parse(composeFileBackrest) as ComposeSpecification;
+	const composeData = load(composeFileBackrest) as ComposeSpecification;
 	const suffix = "testhash";
 
 	const updatedComposeData = addSuffixToAllVolumes(composeData, suffix);

apps/dokploy/__test__/compose/volume/volume-root.test.ts

@@ -1,7 +1,7 @@
 import type { ComposeSpecification } from "@dokploy/server";
 import { addSuffixToVolumesRoot, generateRandomHash } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 const composeFile = `
 version: "3.8"
@@ -29,7 +29,7 @@ test("Generate random hash with 8 characters", () => {
 });
 
 test("Add suffix to volumes in root property", () => {
-	const composeData = parse(composeFile) as ComposeSpecification;
+	const composeData = load(composeFile) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -67,7 +67,7 @@ networks:
 `;
 
 test("Add suffix to volumes in root property (Case 2)", () => {
-	const composeData = parse(composeFile2) as ComposeSpecification;
+	const composeData = load(composeFile2) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -101,7 +101,7 @@ networks:
 `;
 
 test("Add suffix to volumes in root property (Case 3)", () => {
-	const composeData = parse(composeFile3) as ComposeSpecification;
+	const composeData = load(composeFile3) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -148,7 +148,7 @@ volumes:
 `;
 
 // Expected compose file con el prefijo `testhash`
-const expectedComposeFile4 = parse(`
+const expectedComposeFile4 = load(`
 version: "3.8"
 
 services:
@@ -179,7 +179,7 @@ volumes:
 `) as ComposeSpecification;
 
 test("Add suffix to volumes in root property", () => {
-	const composeData = parse(composeFile4) as ComposeSpecification;
+	const composeData = load(composeFile4) as ComposeSpecification;
 
 	const suffix = "testhash";
 

apps/dokploy/__test__/compose/volume/volume-services.test.ts

@@ -3,8 +3,8 @@ import {
 	addSuffixToVolumesInServices,
 	generateRandomHash,
 } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 test("Generate random hash with 8 characters", () => {
 	const hash = generateRandomHash();
@@ -24,7 +24,7 @@ services:
 `;
 
 test("Add suffix to volumes declared directly in services", () => {
-	const composeData = parse(composeFile1) as ComposeSpecification;
+	const composeData = load(composeFile1) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 
@@ -59,7 +59,7 @@ volumes:
 `;
 
 test("Add suffix to volumes declared directly in services (Case 2)", () => {
-	const composeData = parse(composeFileTypeVolume) as ComposeSpecification;
+	const composeData = load(composeFileTypeVolume) as ComposeSpecification;
 
 	const suffix = generateRandomHash();
 

apps/dokploy/__test__/compose/volume/volume.test.ts

@@ -1,7 +1,7 @@
 import type { ComposeSpecification } from "@dokploy/server";
 import { addSuffixToAllVolumes } from "@dokploy/server";
+import { load } from "js-yaml";
 import { expect, test } from "vitest";
-import { parse } from "yaml";
 
 const composeFileTypeVolume = `
 version: "3.8"
@@ -23,7 +23,7 @@ volumes:
     driver: local
 `;
 
-const expectedComposeFileTypeVolume = parse(`
+const expectedComposeFileTypeVolume = load(`
 version: "3.8"
 
 services:
@@ -44,7 +44,7 @@ volumes:
 `) as ComposeSpecification;
 
 test("Add suffix to volumes with type: volume in services", () => {
-	const composeData = parse(composeFileTypeVolume) as ComposeSpecification;
+	const composeData = load(composeFileTypeVolume) as ComposeSpecification;
 
 	const suffix = "testhash";
 
@@ -73,7 +73,7 @@ volumes:
     driver: local
 `;
 
-const expectedComposeFileTypeVolume1 = parse(`
+const expectedComposeFileTypeVolume1 = load(`
 version: "3.8"
 
 services:
@@ -93,7 +93,7 @@ volumes:
 `) as ComposeSpecification;
 
 test("Add suffix to mixed volumes in services", () => {
-	const composeData = parse(composeFileTypeVolume1) as ComposeSpecification;
+	const composeData = load(composeFileTypeVolume1) as ComposeSpecification;
 
 	const suffix = "testhash";
 
@@ -128,7 +128,7 @@ volumes:
       device: /path/to/app/logs
 `;
 
-const expectedComposeFileTypeVolume2 = parse(`
+const expectedComposeFileTypeVolume2 = load(`
 version: "3.8"
 
 services:
@@ -154,7 +154,7 @@ volumes:
 `) as ComposeSpecification;
 
 test("Add suffix to complex volume configurations in services", () => {
-	const composeData = parse(composeFileTypeVolume2) as ComposeSpecification;
+	const composeData = load(composeFileTypeVolume2) as ComposeSpecification;
 
 	const suffix = "testhash";
 
@@ -218,7 +218,7 @@ volumes:
       device: /path/to/shared/logs
 `;
 
-const expectedComposeFileTypeVolume3 = parse(`
+const expectedComposeFileTypeVolume3 = load(`
 version: "3.8"
 
 services:
@@ -273,7 +273,7 @@ volumes:
 `) as ComposeSpecification;
 
 test("Add suffix to complex nested volumes configuration in services", () => {
-	const composeData = parse(composeFileTypeVolume3) as ComposeSpecification;
+	const composeData = load(composeFileTypeVolume3) as ComposeSpecification;
 
 	const suffix = "testhash";
 

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

@@ -133,7 +133,6 @@ const baseApp: ApplicationNested = {
 	username: null,
 	dockerContextPath: null,
 	rollbackActive: false,
-	stopGracePeriodSwarm: null,
 };
 
 describe("unzipDrop using real zip files", () => {

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

@@ -1,102 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import type { ApplicationNested } from "@dokploy/server/utils/builders";
-import { mechanizeDockerContainer } from "@dokploy/server/utils/builders";
-
-type MockCreateServiceOptions = {
-	StopGracePeriod?: number;
-	[key: string]: unknown;
-};
-
-const { inspectMock, getServiceMock, createServiceMock, getRemoteDockerMock } =
-	vi.hoisted(() => {
-		const inspect = vi.fn<[], Promise<never>>();
-		const getService = vi.fn(() => ({ inspect }));
-		const createService = vi.fn<[MockCreateServiceOptions], Promise<void>>(
-			async () => undefined,
-		);
-		const getRemoteDocker = vi.fn(async () => ({
-			getService,
-			createService,
-		}));
-		return {
-			inspectMock: inspect,
-			getServiceMock: getService,
-			createServiceMock: createService,
-			getRemoteDockerMock: getRemoteDocker,
-		};
-	});
-
-vi.mock("@dokploy/server/utils/servers/remote-docker", () => ({
-	getRemoteDocker: getRemoteDockerMock,
-}));
-
-const createApplication = (
-	overrides: Partial<ApplicationNested> = {},
-): ApplicationNested =>
-	({
-		appName: "test-app",
-		buildType: "dockerfile",
-		env: null,
-		mounts: [],
-		cpuLimit: null,
-		memoryLimit: null,
-		memoryReservation: null,
-		cpuReservation: null,
-		command: null,
-		ports: [],
-		sourceType: "docker",
-		dockerImage: "example:latest",
-		registry: null,
-		environment: {
-			project: { env: null },
-			env: null,
-		},
-		replicas: 1,
-		stopGracePeriodSwarm: 0n,
-		serverId: "server-id",
-		...overrides,
-	}) as unknown as ApplicationNested;
-
-describe("mechanizeDockerContainer", () => {
-	beforeEach(() => {
-		inspectMock.mockReset();
-		inspectMock.mockRejectedValue(new Error("service not found"));
-		getServiceMock.mockClear();
-		createServiceMock.mockClear();
-		getRemoteDockerMock.mockClear();
-		getRemoteDockerMock.mockResolvedValue({
-			getService: getServiceMock,
-			createService: createServiceMock,
-		});
-	});
-
-	it("converts bigint stopGracePeriodSwarm to a number and keeps zero values", async () => {
-		const application = createApplication({ stopGracePeriodSwarm: 0n });
-
-		await mechanizeDockerContainer(application);
-
-		expect(createServiceMock).toHaveBeenCalledTimes(1);
-		const call = createServiceMock.mock.calls[0];
-		if (!call) {
-			throw new Error("createServiceMock should have been called once");
-		}
-		const [settings] = call;
-		expect(settings.StopGracePeriod).toBe(0);
-		expect(typeof settings.StopGracePeriod).toBe("number");
-	});
-
-	it("omits StopGracePeriod when stopGracePeriodSwarm is null", async () => {
-		const application = createApplication({ stopGracePeriodSwarm: null });
-
-		await mechanizeDockerContainer(application);
-
-		expect(createServiceMock).toHaveBeenCalledTimes(1);
-		const call = createServiceMock.mock.calls[0];
-		if (!call) {
-			throw new Error("createServiceMock should have been called once");
-		}
-		const [settings] = call;
-		expect(settings).not.toHaveProperty("StopGracePeriod");
-	});
-});

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

@@ -111,7 +111,6 @@ const baseApp: ApplicationNested = {
 	updateConfigSwarm: null,
 	username: null,
 	dockerContextPath: null,
-	stopGracePeriodSwarm: null,
 };
 
 const baseDomain: Domain = {

apps/dokploy/components/dashboard/application/advanced/cluster/modify-swarm-settings.tsx

@@ -25,7 +25,6 @@ import {
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
 import {
 	Tooltip,
 	TooltipContent,
@@ -177,18 +176,10 @@ const addSwarmSettings = z.object({
 	modeSwarm: createStringToJSONSchema(ServiceModeSwarmSchema).nullable(),
 	labelsSwarm: createStringToJSONSchema(LabelsSwarmSchema).nullable(),
 	networkSwarm: createStringToJSONSchema(NetworkSwarmSchema).nullable(),
-	stopGracePeriodSwarm: z.bigint().nullable(),
 });
 
 type AddSwarmSettings = z.infer<typeof addSwarmSettings>;
 
-const hasStopGracePeriodSwarm = (
-	value: unknown,
-): value is { stopGracePeriodSwarm: bigint | number | string | null } =>
-	typeof value === "object" &&
-	value !== null &&
-	"stopGracePeriodSwarm" in value;
-
 interface Props {
 	id: string;
 	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
@@ -233,22 +224,12 @@ export const AddSwarmSettings = ({ id, type }: Props) => {
 			modeSwarm: null,
 			labelsSwarm: null,
 			networkSwarm: null,
-			stopGracePeriodSwarm: null,
 		},
 		resolver: zodResolver(addSwarmSettings),
 	});
 
 	useEffect(() => {
 		if (data) {
-			const stopGracePeriodValue = hasStopGracePeriodSwarm(data)
-				? data.stopGracePeriodSwarm
-				: null;
-			const normalizedStopGracePeriod =
-				stopGracePeriodValue === null || stopGracePeriodValue === undefined
-					? null
-					: typeof stopGracePeriodValue === "bigint"
-						? stopGracePeriodValue
-						: BigInt(stopGracePeriodValue);
 			form.reset({
 				healthCheckSwarm: data.healthCheckSwarm
 					? JSON.stringify(data.healthCheckSwarm, null, 2)
@@ -274,7 +255,6 @@ export const AddSwarmSettings = ({ id, type }: Props) => {
 				networkSwarm: data.networkSwarm
 					? JSON.stringify(data.networkSwarm, null, 2)
 					: null,
-				stopGracePeriodSwarm: normalizedStopGracePeriod,
 			});
 		}
 	}, [form, form.reset, data]);
@@ -295,7 +275,6 @@ export const AddSwarmSettings = ({ id, type }: Props) => {
 			modeSwarm: data.modeSwarm,
 			labelsSwarm: data.labelsSwarm,
 			networkSwarm: data.networkSwarm,
-			stopGracePeriodSwarm: data.stopGracePeriodSwarm ?? null,
 		})
 			.then(async () => {
 				toast.success("Swarm settings updated");
@@ -373,9 +352,9 @@ export const AddSwarmSettings = ({ id, type }: Props) => {
 											language="json"
 											placeholder={`{
 	"Test" : ["CMD-SHELL", "curl -f http://localhost:3000/health"],
-	"Interval" : 10000000000,
-	"Timeout" : 10000000000,
-	"StartPeriod" : 10000000000,
+	"Interval" : 10000,
+	"Timeout" : 10000,
+	"StartPeriod" : 10000,
 	"Retries" : 10
 }`}
 											className="h-[12rem] font-mono"
@@ -428,9 +407,9 @@ export const AddSwarmSettings = ({ id, type }: Props) => {
 											language="json"
 											placeholder={`{
 	"Condition" : "on-failure",
-	"Delay" : 10000000000,
+	"Delay" : 10000,
 	"MaxAttempts" : 10,
-	"Window" : 10000000000
+	"Window" : 10000
 }                                                  `}
 											className="h-[12rem] font-mono"
 											{...field}
@@ -550,9 +529,9 @@ export const AddSwarmSettings = ({ id, type }: Props) => {
 											language="json"
 											placeholder={`{
 	"Parallelism" : 1,
-	"Delay" : 10000000000,
+	"Delay" : 10000,
 	"FailureAction" : "continue",
-	"Monitor" : 10000000000,
+	"Monitor" : 10000,
 	"MaxFailureRatio" : 10,
 	"Order" : "start-first"
 }`}
@@ -608,9 +587,9 @@ export const AddSwarmSettings = ({ id, type }: Props) => {
 											language="json"
 											placeholder={`{
 	"Parallelism" : 1,
-	"Delay" : 10000000000,
+	"Delay" : 10000,
 	"FailureAction" : "continue",
-	"Monitor" : 10000000000,
+	"Monitor" : 10000,
 	"MaxFailureRatio" : 10,
 	"Order" : "start-first"
 }`}
@@ -795,57 +774,7 @@ export const AddSwarmSettings = ({ id, type }: Props) => {
 								</FormItem>
 							)}
 						/>
-						<FormField
-							control={form.control}
-							name="stopGracePeriodSwarm"
-							render={({ field }) => (
-								<FormItem className="relative max-lg:px-4 lg:pl-6 ">
-									<FormLabel>Stop Grace Period (nanoseconds)</FormLabel>
-									<TooltipProvider delayDuration={0}>
-										<Tooltip>
-											<TooltipTrigger asChild>
-												<FormDescription className="break-all w-fit flex flex-row gap-1 items-center">
-													Duration in nanoseconds
-													<HelpCircle className="size-4 text-muted-foreground" />
-												</FormDescription>
-											</TooltipTrigger>
-											<TooltipContent
-												className="w-full z-[999]"
-												align="start"
-												side="bottom"
-											>
-												<code>
-													<pre>
-														{`Enter duration in nanoseconds:
-														• 30000000000 - 30 seconds
-														• 120000000000 - 2 minutes  
-														• 3600000000000 - 1 hour
-														• 0 - no grace period`}
-													</pre>
-												</code>
-											</TooltipContent>
-										</Tooltip>
-									</TooltipProvider>
-									<FormControl>
-										<Input
-											type="number"
-											placeholder="30000000000"
-											className="font-mono"
-											{...field}
-											value={field?.value?.toString() || ""}
-											onChange={(e) =>
-												field.onChange(
-													e.target.value ? BigInt(e.target.value) : null,
-												)
-											}
-										/>
-									</FormControl>
-									<pre>
-										<FormMessage />
-									</pre>
-								</FormItem>
-							)}
-						/>
+
 						<DialogFooter className="flex w-full flex-row justify-end md:col-span-2 m-0 sticky bottom-0 right-0 bg-muted border">
 							<Button
 								isLoading={isLoading}

apps/dokploy/components/dashboard/application/advanced/traefik/update-traefik-config.tsx

@@ -1,8 +1,8 @@
 import { zodResolver } from "@hookform/resolvers/zod";
+import jsyaml from "js-yaml";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
-import { parse, stringify, YAMLParseError } from "yaml";
 import { z } from "zod";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { CodeEditor } from "@/components/shared/code-editor";
@@ -38,11 +38,11 @@ interface Props {
 
 export const validateAndFormatYAML = (yamlText: string) => {
 	try {
-		const obj = parse(yamlText);
-		const formattedYaml = stringify(obj, { indent: 4 });
+		const obj = jsyaml.load(yamlText);
+		const formattedYaml = jsyaml.dump(obj, { indent: 4 });
 		return { valid: true, formattedYaml, error: null };
 	} catch (error) {
-		if (error instanceof YAMLParseError) {
+		if (error instanceof jsyaml.YAMLException) {
 			return {
 				valid: false,
 				formattedYaml: yamlText,
@@ -89,7 +89,7 @@ export const UpdateTraefikConfig = ({ applicationId }: Props) => {
 		if (!valid) {
 			form.setError("traefikConfig", {
 				type: "manual",
-				message: (error as string) || "Invalid YAML",
+				message: error || "Invalid YAML",
 			});
 			return;
 		}

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

@@ -59,7 +59,7 @@ export const SaveGitProvider = ({ applicationId }: Props) => {
 	const router = useRouter();
 
 	const { mutateAsync, isLoading } =
-		api.application.saveGitProvider.useMutation();
+		api.application.saveGitProdiver.useMutation();
 
 	const form = useForm<GitProvider>({
 		defaultValues: {

apps/dokploy/components/dashboard/application/schedules/handle-schedules.tsx

@@ -7,7 +7,7 @@ import {
 	RefreshCw,
 } from "lucide-react";
 import { useEffect, useState } from "react";
-import { type Control, useForm } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
 import { AlertBlock } from "@/components/shared/alert-block";
@@ -57,7 +57,6 @@ export const commonCronExpressions = [
 	{ label: "Every month on the 1st at midnight", value: "0 0 1 * *" },
 	{ label: "Every 15 minutes", value: "*/15 * * * *" },
 	{ label: "Every weekday at midnight", value: "0 0 * * 1-5" },
-	{ label: "Custom", value: "custom" },
 ];
 
 const formSchema = z
@@ -116,91 +115,10 @@ interface Props {
 	scheduleType?: "application" | "compose" | "server" | "dokploy-server";
 }
 
-export const ScheduleFormField = ({
-	name,
-	formControl,
-}: {
-	name: string;
-	formControl: Control<any>;
-}) => {
-	const [selectedOption, setSelectedOption] = useState("");
-
-	return (
-		<FormField
-			control={formControl}
-			name={name}
-			render={({ field }) => (
-				<FormItem>
-					<FormLabel className="flex items-center gap-2">
-						Schedule
-						<TooltipProvider>
-							<Tooltip>
-								<TooltipTrigger asChild>
-									<Info className="w-4 h-4 text-muted-foreground cursor-help" />
-								</TooltipTrigger>
-								<TooltipContent>
-									<p>Cron expression format: minute hour day month weekday</p>
-									<p>Example: 0 0 * * * (daily at midnight)</p>
-								</TooltipContent>
-							</Tooltip>
-						</TooltipProvider>
-					</FormLabel>
-					<div className="flex flex-col gap-2">
-						<Select
-							value={selectedOption}
-							onValueChange={(value) => {
-								setSelectedOption(value);
-								field.onChange(value === "custom" ? "" : value);
-							}}
-						>
-							<FormControl>
-								<SelectTrigger>
-									<SelectValue placeholder="Select a predefined schedule" />
-								</SelectTrigger>
-							</FormControl>
-							<SelectContent>
-								{commonCronExpressions.map((expr) => (
-									<SelectItem key={expr.value} value={expr.value}>
-										{expr.label}
-										{expr.value !== "custom" && ` (${expr.value})`}
-									</SelectItem>
-								))}
-							</SelectContent>
-						</Select>
-						<div className="relative">
-							<FormControl>
-								<Input
-									placeholder="Custom cron expression (e.g., 0 0 * * *)"
-									{...field}
-									onChange={(e) => {
-										const value = e.target.value;
-										const commonExpression = commonCronExpressions.find(
-											(expression) => expression.value === value,
-										);
-										if (commonExpression) {
-											setSelectedOption(commonExpression.value);
-										} else {
-											setSelectedOption("custom");
-										}
-										field.onChange(e);
-									}}
-								/>
-							</FormControl>
-						</div>
-					</div>
-					<FormDescription>
-						Choose a predefined schedule or enter a custom cron expression
-					</FormDescription>
-					<FormMessage />
-				</FormItem>
-			)}
-		/>
-	);
-};
-
 export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
 	const [isOpen, setIsOpen] = useState(false);
 	const [cacheType, setCacheType] = useState<CacheType>("cache");
+
 	const utils = api.useUtils();
 	const form = useForm<z.infer<typeof formSchema>>({
 		resolver: zodResolver(formSchema),
@@ -459,9 +377,63 @@ export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
 							)}
 						/>
 
-						<ScheduleFormField
+						<FormField
+							control={form.control}
 							name="cronExpression"
-							formControl={form.control}
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel className="flex items-center gap-2">
+										Schedule
+										<TooltipProvider>
+											<Tooltip>
+												<TooltipTrigger asChild>
+													<Info className="w-4 h-4 text-muted-foreground cursor-help" />
+												</TooltipTrigger>
+												<TooltipContent>
+													<p>
+														Cron expression format: minute hour day month
+														weekday
+													</p>
+													<p>Example: 0 0 * * * (daily at midnight)</p>
+												</TooltipContent>
+											</Tooltip>
+										</TooltipProvider>
+									</FormLabel>
+									<div className="flex flex-col gap-2">
+										<Select
+											onValueChange={(value) => {
+												field.onChange(value);
+											}}
+										>
+											<FormControl>
+												<SelectTrigger>
+													<SelectValue placeholder="Select a predefined schedule" />
+												</SelectTrigger>
+											</FormControl>
+											<SelectContent>
+												{commonCronExpressions.map((expr) => (
+													<SelectItem key={expr.value} value={expr.value}>
+														{expr.label} ({expr.value})
+													</SelectItem>
+												))}
+											</SelectContent>
+										</Select>
+										<div className="relative">
+											<FormControl>
+												<Input
+													placeholder="Custom cron expression (e.g., 0 0 * * *)"
+													{...field}
+												/>
+											</FormControl>
+										</div>
+									</div>
+									<FormDescription>
+										Choose a predefined schedule or enter a custom cron
+										expression
+									</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
 						/>
 
 						{(scheduleTypeForm === "application" ||

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

@@ -1,5 +1,11 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import { DatabaseZap, PenBoxIcon, PlusCircle, RefreshCw } from "lucide-react";
+import {
+	DatabaseZap,
+	Info,
+	PenBoxIcon,
+	PlusCircle,
+	RefreshCw,
+} from "lucide-react";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
@@ -41,7 +47,7 @@ import {
 import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
 import type { CacheType } from "../domains/handle-domain";
-import { ScheduleFormField } from "../schedules/handle-schedules";
+import { commonCronExpressions } from "../schedules/handle-schedules";
 
 const formSchema = z
 	.object({
@@ -300,9 +306,64 @@ export const HandleVolumeBackups = ({
 								</FormItem>
 							)}
 						/>
-						<ScheduleFormField
+
+						<FormField
+							control={form.control}
 							name="cronExpression"
-							formControl={form.control}
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel className="flex items-center gap-2">
+										Schedule
+										<TooltipProvider>
+											<Tooltip>
+												<TooltipTrigger asChild>
+													<Info className="w-4 h-4 text-muted-foreground cursor-help" />
+												</TooltipTrigger>
+												<TooltipContent>
+													<p>
+														Cron expression format: minute hour day month
+														weekday
+													</p>
+													<p>Example: 0 0 * * * (daily at midnight)</p>
+												</TooltipContent>
+											</Tooltip>
+										</TooltipProvider>
+									</FormLabel>
+									<div className="flex flex-col gap-2">
+										<Select
+											onValueChange={(value) => {
+												field.onChange(value);
+											}}
+										>
+											<FormControl>
+												<SelectTrigger>
+													<SelectValue placeholder="Select a predefined schedule" />
+												</SelectTrigger>
+											</FormControl>
+											<SelectContent>
+												{commonCronExpressions.map((expr) => (
+													<SelectItem key={expr.value} value={expr.value}>
+														{expr.label} ({expr.value})
+													</SelectItem>
+												))}
+											</SelectContent>
+										</Select>
+										<div className="relative">
+											<FormControl>
+												<Input
+													placeholder="Custom cron expression (e.g., 0 0 * * *)"
+													{...field}
+												/>
+											</FormControl>
+										</div>
+									</div>
+									<FormDescription>
+										Choose a predefined schedule or enter a custom cron
+										expression
+									</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
 						/>
 
 						<FormField

apps/dokploy/components/dashboard/compose/general/actions.tsx

@@ -195,7 +195,6 @@ export const ComposeActions = ({ composeId }: Props) => {
 			<DockerTerminalModal
 				appName={data?.appName || ""}
 				serverId={data?.serverId || ""}
-				appType={data?.composeType || "docker-compose"}
 			>
 				<Button
 					variant="outline"

apps/dokploy/components/dashboard/compose/general/compose-file-editor.tsx

@@ -1,5 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
+import { useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
@@ -35,7 +35,6 @@ export const ComposeFileEditor = ({ composeId }: Props) => {
 	);
 
 	const { mutateAsync, isLoading } = api.compose.update.useMutation();
-	const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
 
 	const form = useForm<AddComposeFile>({
 		defaultValues: {
@@ -54,12 +53,6 @@ export const ComposeFileEditor = ({ composeId }: Props) => {
 		}
 	}, [form, form.reset, data]);
 
-	useEffect(() => {
-		if (data?.composeFile !== undefined) {
-			setHasUnsavedChanges(composeFile !== data.composeFile);
-		}
-	}, [composeFile, data?.composeFile]);
-
 	const onSubmit = async (data: AddComposeFile) => {
 		const { valid, error } = validateAndFormatYAML(data.composeFile);
 		if (!valid) {
@@ -78,7 +71,6 @@ export const ComposeFileEditor = ({ composeId }: Props) => {
 		})
 			.then(async () => {
 				toast.success("Compose config Updated");
-				setHasUnsavedChanges(false);
 				refetch();
 				await utils.compose.getConvertedCompose.invalidate({
 					composeId,
@@ -107,19 +99,6 @@ export const ComposeFileEditor = ({ composeId }: Props) => {
 	return (
 		<>
 			<div className="w-full flex flex-col gap-4 ">
-				<div className="flex items-center justify-between">
-					<div>
-						<h3 className="text-lg font-medium">Compose File</h3>
-						<p className="text-sm text-muted-foreground">
-							Configure your Docker Compose file for this service.
-							{hasUnsavedChanges && (
-								<span className="text-yellow-500 ml-2">
-									(You have unsaved changes)
-								</span>
-							)}
-						</p>
-					</div>
-				</div>
 				<Form {...form}>
 					<form
 						id="hook-form-save-compose-file"

apps/dokploy/components/dashboard/compose/logs/show-stack.tsx

@@ -37,6 +37,8 @@ interface Props {
 	serverId?: string;
 }
 
+badgeStateColor;
+
 export const ShowDockerLogsStack = ({ appName, serverId }: Props) => {
 	const [option, setOption] = useState<"swarm" | "native">("native");
 	const [containerId, setContainerId] = useState<string | undefined>();

apps/dokploy/components/dashboard/database/backups/handle-backup.tsx

@@ -3,6 +3,7 @@ import {
 	CheckIcon,
 	ChevronsUpDown,
 	DatabaseZap,
+	Info,
 	PenBoxIcon,
 	PlusIcon,
 	RefreshCw,
@@ -61,7 +62,7 @@ import {
 } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
-import { ScheduleFormField } from "../../application/schedules/handle-schedules";
+import { commonCronExpressions } from "../../application/schedules/handle-schedules";
 
 type CacheType = "cache" | "fetch";
 
@@ -578,9 +579,66 @@ export const HandleBackup = ({
 									);
 								}}
 							/>
-
-							<ScheduleFormField name="schedule" formControl={form.control} />
-
+							<FormField
+								control={form.control}
+								name="schedule"
+								render={({ field }) => {
+									return (
+										<FormItem>
+											<FormLabel className="flex items-center gap-2">
+												Schedule
+												<TooltipProvider>
+													<Tooltip>
+														<TooltipTrigger asChild>
+															<Info className="w-4 h-4 text-muted-foreground cursor-help" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p>
+																Cron expression format: minute hour day month
+																weekday
+															</p>
+															<p>Example: 0 0 * * * (daily at midnight)</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</FormLabel>
+											<div className="flex flex-col gap-2">
+												<Select
+													onValueChange={(value) => {
+														field.onChange(value);
+													}}
+												>
+													<FormControl>
+														<SelectTrigger>
+															<SelectValue placeholder="Select a predefined schedule" />
+														</SelectTrigger>
+													</FormControl>
+													<SelectContent>
+														{commonCronExpressions.map((expr) => (
+															<SelectItem key={expr.value} value={expr.value}>
+																{expr.label} ({expr.value})
+															</SelectItem>
+														))}
+													</SelectContent>
+												</Select>
+												<div className="relative">
+													<FormControl>
+														<Input
+															placeholder="Custom cron expression (e.g., 0 0 * * *)"
+															{...field}
+														/>
+													</FormControl>
+												</div>
+											</div>
+											<FormDescription>
+												Choose a predefined schedule or enter a custom cron
+												expression
+											</FormDescription>
+											<FormMessage />
+										</FormItem>
+									);
+								}}
+							/>
 							<FormField
 								control={form.control}
 								name="prefix"

apps/dokploy/components/dashboard/docker/terminal/docker-terminal.tsx

@@ -8,7 +8,7 @@ import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
 
 interface Props {
 	id: string;
-	containerId?: string;
+	containerId: string;
 	serverId?: string;
 }
 
@@ -36,6 +36,7 @@ export const DockerTerminal: React.FC<Props> = ({
 			},
 		});
 		const addonFit = new FitAddon();
+
 		const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
 
 		const wsUrl = `${protocol}//${window.location.host}/docker-container-terminal?containerId=${containerId}&activeWay=${activeWay}${serverId ? `&serverId=${serverId}` : ""}`;
@@ -56,7 +57,7 @@ export const DockerTerminal: React.FC<Props> = ({
 
 	return (
 		<div className="flex flex-col gap-4">
-			<div className="flex flex-col gap-2  mt-4">
+			<div className="flex flex-col gap-2">
 				<span>
 					Select way to connect to <b>{containerId}</b>
 				</span>

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

@@ -171,7 +171,7 @@ export const AddTemplate = ({ environmentId, baseUrl }: Props) => {
 								<Input
 									placeholder="Search Template"
 									onChange={(e) => setQuery(e.target.value)}
-									className="w-full"
+									className="w-full sm:w-[200px]"
 									value={query}
 								/>
 								<Input
@@ -248,7 +248,7 @@ export const AddTemplate = ({ environmentId, baseUrl }: Props) => {
 									onClick={() =>
 										setViewMode(viewMode === "detailed" ? "icon" : "detailed")
 									}
-									className="h-9 w-9 flex-shrink-0"
+									className="h-9 w-9"
 								>
 									{viewMode === "detailed" ? (
 										<LayoutGrid className="size-4" />

apps/dokploy/components/dashboard/project/advanced-environment-selector.tsx

@@ -63,20 +63,13 @@ export const AdvancedEnvironmentSelector = ({
 	const [name, setName] = useState("");
 	const [description, setDescription] = useState("");
 
-	// Get current user's permissions
-	const { data: currentUser } = api.user.get.useQuery();
-
-	// Check if user can create environments
-	const canCreateEnvironments =
-		currentUser?.role === "owner" ||
-		currentUser?.role === "admin" ||
-		currentUser?.canCreateEnvironments === true;
-
-	// Check if user can delete environments
-	const canDeleteEnvironments =
-		currentUser?.role === "owner" ||
-		currentUser?.role === "admin" ||
-		currentUser?.canDeleteEnvironments === true;
+	// API mutations
+	const { data: environment } = api.environment.one.useQuery(
+		{ environmentId: currentEnvironmentId || "" },
+		{
+			enabled: !!currentEnvironmentId,
+		},
+	);
 
 	const haveServices =
 		selectedEnvironment &&
@@ -274,19 +267,17 @@ export const AdvancedEnvironmentSelector = ({
 											<PencilIcon className="h-3 w-3" />
 										</Button>
 
-										{canDeleteEnvironments && (
-											<Button
-												variant="ghost"
-												size="sm"
-												className="h-6 w-6 p-0 text-red-600 hover:text-red-700"
-												onClick={(e) => {
-													e.stopPropagation();
-													openDeleteDialog(environment);
-												}}
-											>
-												<TrashIcon className="h-3 w-3" />
-											</Button>
-										)}
+										<Button
+											variant="ghost"
+											size="sm"
+											className="h-6 w-6 p-0 text-red-600 hover:text-red-700"
+											onClick={(e) => {
+												e.stopPropagation();
+												openDeleteDialog(environment);
+											}}
+										>
+											<TrashIcon className="h-3 w-3" />
+										</Button>
 									</div>
 								)}
 							</div>
@@ -294,15 +285,13 @@ export const AdvancedEnvironmentSelector = ({
 					})}
 
 					<DropdownMenuSeparator />
-					{canCreateEnvironments && (
-						<DropdownMenuItem
-							className="cursor-pointer"
-							onClick={() => setIsCreateDialogOpen(true)}
-						>
-							<PlusIcon className="h-4 w-4 mr-2" />
-							Create Environment
-						</DropdownMenuItem>
-					)}
+					<DropdownMenuItem
+						className="cursor-pointer"
+						onClick={() => setIsCreateDialogOpen(true)}
+					>
+						<PlusIcon className="h-4 w-4 mr-2" />
+						Create Environment
+					</DropdownMenuItem>
 				</DropdownMenuContent>
 			</DropdownMenu>
 

apps/dokploy/components/dashboard/project/ai/step-three.tsx

@@ -88,7 +88,7 @@ export const StepThree = ({ templateInfo }: StepProps) => {
 						<div>
 							<h3 className="text-sm font-semibold">Configuration Files</h3>
 							<ul className="list-disc pl-5">
-								{templateInfo?.details?.configFiles?.map((file, index) => (
+								{templateInfo?.details?.configFiles.map((file, index) => (
 									<li key={index}>
 										<strong className="text-sm font-semibold">
 											{file.filePath}

apps/dokploy/components/dashboard/project/ai/step-two.tsx

@@ -1,5 +1,5 @@
-import { Bot, PlusCircle, Trash2 } from "lucide-react";
-import { useEffect } from "react";
+import { Bot, Eye, EyeOff, PlusCircle, Trash2 } from "lucide-react";
+import { useEffect, useState } from "react";
 import ReactMarkdown from "react-markdown";
 import { toast } from "sonner";
 import { AlertBlock } from "@/components/shared/alert-block";
@@ -27,6 +27,7 @@ export interface StepProps {
 export const StepTwo = ({ templateInfo, setTemplateInfo }: StepProps) => {
 	const suggestions = templateInfo.suggestions || [];
 	const selectedVariant = templateInfo.details;
+	const [showValues, setShowValues] = useState<Record<string, boolean>>({});
 
 	const { mutateAsync, isLoading, error, isError } =
 		api.ai.suggest.useMutation();
@@ -43,7 +44,7 @@ export const StepTwo = ({ templateInfo, setTemplateInfo }: StepProps) => {
 			.then((data) => {
 				setTemplateInfo({
 					...templateInfo,
-					suggestions: data || [],
+					suggestions: data,
 				});
 			})
 			.catch((error) => {
@@ -53,6 +54,10 @@ export const StepTwo = ({ templateInfo, setTemplateInfo }: StepProps) => {
 			});
 	}, [templateInfo.userInput]);
 
+	const toggleShowValue = (name: string) => {
+		setShowValues((prev) => ({ ...prev, [name]: !prev[name] }));
+	};
+
 	const handleEnvVariableChange = (
 		index: number,
 		field: "name" | "value",
@@ -303,9 +308,11 @@ export const StepTwo = ({ templateInfo, setTemplateInfo }: StepProps) => {
 																placeholder="Variable Name"
 																className="flex-1"
 															/>
-															<div className="relative">
+															<div className="flex-1 relative">
 																<Input
-																	type={"password"}
+																	type={
+																		showValues[env.name] ? "text" : "password"
+																	}
 																	value={env.value}
 																	onChange={(e) =>
 																		handleEnvVariableChange(
@@ -316,6 +323,19 @@ export const StepTwo = ({ templateInfo, setTemplateInfo }: StepProps) => {
 																	}
 																	placeholder="Variable Value"
 																/>
+																<Button
+																	type="button"
+																	variant="ghost"
+																	size="icon"
+																	className="absolute right-2 top-1/2 transform -translate-y-1/2"
+																	onClick={() => toggleShowValue(env.name)}
+																>
+																	{showValues[env.name] ? (
+																		<EyeOff className="h-4 w-4" />
+																	) : (
+																		<Eye className="h-4 w-4" />
+																	)}
+																</Button>
 															</div>
 															<Button
 																type="button"
@@ -417,14 +437,13 @@ export const StepTwo = ({ templateInfo, setTemplateInfo }: StepProps) => {
 										<AccordionContent>
 											<ScrollArea className="w-full rounded-md border">
 												<div className="p-4 space-y-4">
-													{selectedVariant?.configFiles?.length &&
-													selectedVariant?.configFiles?.length > 0 ? (
+													{selectedVariant?.configFiles?.length > 0 ? (
 														<>
 															<div className="text-sm text-muted-foreground mb-4">
 																This template requires the following
 																configuration files to be mounted:
 															</div>
-															{selectedVariant?.configFiles?.map(
+															{selectedVariant.configFiles.map(
 																(config, index) => (
 																	<div
 																		key={index}

apps/dokploy/components/dashboard/project/ai/template-generator.tsx

@@ -47,7 +47,7 @@ interface Details {
 	envVariables: EnvVariable[];
 	shortDescription: string;
 	domains: Domain[];
-	configFiles?: Mount[];
+	configFiles: Mount[];
 }
 
 interface Mount {

apps/dokploy/components/dashboard/project/duplicate-project.tsx

@@ -80,29 +80,6 @@ export const DuplicateProject = ({
 		api.project.duplicate.useMutation({
 			onSuccess: async (newProject) => {
 				await utils.project.all.invalidate();
-
-				// If duplicating to same project+environment, invalidate the environment query
-				// to refresh the services list
-				if (duplicateType === "existing-environment") {
-					await utils.environment.one.invalidate({
-						environmentId: selectedTargetEnvironment,
-					});
-					await utils.environment.byProjectId.invalidate({
-						projectId: selectedTargetProject,
-					});
-
-					// If duplicating to the same environment we're currently viewing,
-					// also invalidate the current environment to refresh the services list
-					if (selectedTargetEnvironment === environmentId) {
-						await utils.environment.one.invalidate({ environmentId });
-						// Also invalidate the project query to refresh the project data
-						const projectId = router.query.projectId as string;
-						if (projectId) {
-							await utils.project.one.invalidate({ projectId });
-						}
-					}
-				}
-
 				toast.success(
 					duplicateType === "new-project"
 						? "Project duplicated successfully"

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

@@ -96,30 +96,8 @@ export const ShowProjects = () => {
 						new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
 					break;
 				case "services": {
-					const aTotalServices = a.environments.reduce((total, env) => {
-						return (
-							total +
-							(env.applications?.length || 0) +
-							(env.mariadb?.length || 0) +
-							(env.mongo?.length || 0) +
-							(env.mysql?.length || 0) +
-							(env.postgres?.length || 0) +
-							(env.redis?.length || 0) +
-							(env.compose?.length || 0)
-						);
-					}, 0);
-					const bTotalServices = b.environments.reduce((total, env) => {
-						return (
-							total +
-							(env.applications?.length || 0) +
-							(env.mariadb?.length || 0) +
-							(env.mongo?.length || 0) +
-							(env.mysql?.length || 0) +
-							(env.postgres?.length || 0) +
-							(env.redis?.length || 0) +
-							(env.compose?.length || 0)
-						);
-					}, 0);
+					const aTotalServices = a.environments.length;
+					const bTotalServices = b.environments.length;
 					comparison = aTotalServices - bTotalServices;
 					break;
 				}
@@ -313,48 +291,45 @@ export const ShowProjects = () => {
 																				)}
 																			</DropdownMenuGroup>
 																		)}
-																		{project.environments.some(
-																			(env) => env.compose.length > 0,
-																		) && (
+																		{/* 
+																		{project.compose.length > 0 && (
 																			<DropdownMenuGroup>
 																				<DropdownMenuLabel>
 																					Compose
 																				</DropdownMenuLabel>
-																				{project.environments.map((env) =>
-																					env.compose.map((comp) => (
-																						<div key={comp.composeId}>
+																				{project.compose.map((comp) => (
+																					<div key={comp.composeId}>
+																						<DropdownMenuSeparator />
+																						<DropdownMenuGroup>
+																							<DropdownMenuLabel className="font-normal capitalize text-xs flex items-center justify-between">
+																								{comp.name}
+																								<StatusTooltip
+																									status={comp.composeStatus}
+																								/>
+																							</DropdownMenuLabel>
 																							<DropdownMenuSeparator />
-																							<DropdownMenuGroup>
-																								<DropdownMenuLabel className="font-normal capitalize text-xs flex items-center justify-between">
-																									{comp.name}
-																									<StatusTooltip
-																										status={comp.composeStatus}
-																									/>
-																								</DropdownMenuLabel>
-																								<DropdownMenuSeparator />
-																								{comp.domains.map((domain) => (
-																									<DropdownMenuItem
-																										key={domain.domainId}
-																										asChild
+																							{comp.domains.map((domain) => (
+																								<DropdownMenuItem
+																									key={domain.domainId}
+																									asChild
+																								>
+																									<Link
+																										className="space-x-4 text-xs cursor-pointer justify-between"
+																										target="_blank"
+																										href={`${domain.https ? "https" : "http"}://${domain.host}${domain.path}`}
 																									>
-																										<Link
-																											className="space-x-4 text-xs cursor-pointer justify-between"
-																											target="_blank"
-																											href={`${domain.https ? "https" : "http"}://${domain.host}${domain.path}`}
-																										>
-																											<span className="truncate">
-																												{domain.host}
-																											</span>
-																											<ExternalLinkIcon className="size-4 shrink-0" />
-																										</Link>
-																									</DropdownMenuItem>
-																								))}
-																							</DropdownMenuGroup>
-																						</div>
-																					)),
-																				)}
+																										<span className="truncate">
+																											{domain.host}
+																										</span>
+																										<ExternalLinkIcon className="size-4 shrink-0" />
+																									</Link>
+																								</DropdownMenuItem>
+																							))}
+																						</DropdownMenuGroup>
+																					</div>
+																				))}
 																			</DropdownMenuGroup>
-																		)}
+																		)} */}
 																	</DropdownMenuContent>
 																</DropdownMenu>
 															) : null}

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

@@ -24,6 +24,7 @@ import { Progress } from "@/components/ui/progress";
 import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
+import { ShowProviders } from "./show-providers";
 
 const stripePromise = loadStripe(
 	process.env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY!,
@@ -151,44 +152,25 @@ export const ShowBilling = () => {
 									<Loader2 className="animate-spin" />
 								</span>
 							) : (
-								<>
-									{products?.map((product) => {
-										const featured = true;
-										return (
-											<div key={product.id}>
-												<section
-													className={clsx(
-														"flex flex-col rounded-3xl  border-dashed border-2 px-4 max-w-sm",
-														featured
-															? "order-first  border py-8 lg:order-none"
-															: "lg:py-8",
-													)}
-												>
-													{isAnnual && (
-														<div className="mb-4 flex flex-row items-center gap-2">
-															<Badge>Recommended 🚀</Badge>
-														</div>
-													)}
-													{isAnnual ? (
-														<div className="flex flex-row gap-2 items-center">
-															<p className="text-2xl font-semibold tracking-tight text-primary ">
-																${" "}
-																{calculatePrice(
-																	serverQuantity,
-																	isAnnual,
-																).toFixed(2)}{" "}
-																USD
-															</p>
-															|
-															<p className="text-base font-semibold tracking-tight text-muted-foreground">
-																${" "}
-																{(
-																	calculatePrice(serverQuantity, isAnnual) / 12
-																).toFixed(2)}{" "}
-																/ Month USD
-															</p>
-														</div>
-													) : (
+								products?.map((product) => {
+									const featured = true;
+									return (
+										<div key={product.id}>
+											<section
+												className={clsx(
+													"flex flex-col rounded-3xl  border-dashed border-2 px-4 max-w-sm",
+													featured
+														? "order-first  border py-8 lg:order-none"
+														: "lg:py-8",
+												)}
+											>
+												{isAnnual && (
+													<div className="mb-4 flex flex-row items-center gap-2">
+														<Badge>Recommended 🚀</Badge>
+													</div>
+												)}
+												{isAnnual ? (
+													<div className="flex flex-row gap-2 items-center">
 														<p className="text-2xl font-semibold tracking-tight text-primary ">
 															${" "}
 															{calculatePrice(serverQuantity, isAnnual).toFixed(
@@ -196,127 +178,146 @@ export const ShowBilling = () => {
 															)}{" "}
 															USD
 														</p>
-													)}
-													<h3 className="mt-5 font-medium text-lg text-primary">
-														{product.name}
-													</h3>
-													<p
-														className={clsx(
-															"text-sm",
-															featured ? "text-white" : "text-slate-400",
-														)}
-													>
-														{product.description}
+														|
+														<p className="text-base font-semibold tracking-tight text-muted-foreground">
+															${" "}
+															{(
+																calculatePrice(serverQuantity, isAnnual) / 12
+															).toFixed(2)}{" "}
+															/ Month USD
+														</p>
+													</div>
+												) : (
+													<p className="text-2xl font-semibold tracking-tight text-primary ">
+														${" "}
+														{calculatePrice(serverQuantity, isAnnual).toFixed(
+															2,
+														)}{" "}
+														USD
 													</p>
+												)}
+												<h3 className="mt-5 font-medium text-lg text-primary">
+													{product.name}
+												</h3>
+												<p
+													className={clsx(
+														"text-sm",
+														featured ? "text-white" : "text-slate-400",
+													)}
+												>
+													{product.description}
+												</p>
 
-													<ul
-														className={clsx(
-															" mt-4 flex flex-col gap-y-2 text-sm",
-															featured ? "text-white" : "text-slate-200",
+												<ul
+													className={clsx(
+														" mt-4 flex flex-col gap-y-2 text-sm",
+														featured ? "text-white" : "text-slate-200",
+													)}
+												>
+													{[
+														"All the features of Dokploy",
+														"Unlimited deployments",
+														"Self-hosted on your own infrastructure",
+														"Full access to all deployment features",
+														"Dokploy integration",
+														"Backups",
+														"All Incoming features",
+													].map((feature) => (
+														<li
+															key={feature}
+															className="flex text-muted-foreground"
+														>
+															<CheckIcon />
+															<span className="ml-4">{feature}</span>
+														</li>
+													))}
+												</ul>
+												<div className="flex flex-col gap-2 mt-4">
+													<div className="flex items-center gap-2 justify-center">
+														<span className="text-sm text-muted-foreground">
+															{serverQuantity} Servers
+														</span>
+													</div>
+
+													<div className="flex items-center space-x-2">
+														<Button
+															disabled={serverQuantity <= 1}
+															variant="outline"
+															onClick={() => {
+																if (serverQuantity <= 1) return;
+
+																setServerQuantity(serverQuantity - 1);
+															}}
+														>
+															<MinusIcon className="h-4 w-4" />
+														</Button>
+														<NumberInput
+															value={serverQuantity}
+															onChange={(e) => {
+																setServerQuantity(
+																	e.target.value as unknown as number,
+																);
+															}}
+														/>
+
+														<Button
+															variant="outline"
+															onClick={() => {
+																setServerQuantity(serverQuantity + 1);
+															}}
+														>
+															<PlusIcon className="h-4 w-4" />
+														</Button>
+													</div>
+													<div
+														className={cn(
+															data?.subscriptions &&
+																data?.subscriptions?.length > 0
+																? "justify-between"
+																: "justify-end",
+															"flex flex-row  items-center gap-2 mt-4",
 														)}
 													>
-														{[
-															"All the features of Dokploy",
-															"Unlimited deployments",
-															"Self-hosted on your own infrastructure",
-															"Full access to all deployment features",
-															"Dokploy integration",
-															"Backups",
-															"All Incoming features",
-														].map((feature) => (
-															<li
-																key={feature}
-																className="flex text-muted-foreground"
-															>
-																<CheckIcon />
-																<span className="ml-4">{feature}</span>
-															</li>
-														))}
-													</ul>
-													<div className="flex flex-col gap-2 mt-4">
-														<div className="flex items-center gap-2 justify-center">
-															<span className="text-sm text-muted-foreground">
-																{serverQuantity} Servers
-															</span>
-														</div>
-
-														<div className="flex items-center space-x-2">
+														{admin?.user.stripeCustomerId && (
 															<Button
-																disabled={serverQuantity <= 1}
-																variant="outline"
-																onClick={() => {
-																	if (serverQuantity <= 1) return;
+																variant="secondary"
+																className="w-full"
+																onClick={async () => {
+																	const session =
+																		await createCustomerPortalSession();
 
-																	setServerQuantity(serverQuantity - 1);
+																	window.open(session.url);
 																}}
 															>
-																<MinusIcon className="h-4 w-4" />
+																Manage Subscription
 															</Button>
-															<NumberInput
-																value={serverQuantity}
-																onChange={(e) => {
-																	setServerQuantity(
-																		e.target.value as unknown as number,
-																	);
-																}}
-															/>
+														)}
 
-															<Button
-																variant="outline"
-																onClick={() => {
-																	setServerQuantity(serverQuantity + 1);
-																}}
-															>
-																<PlusIcon className="h-4 w-4" />
-															</Button>
-														</div>
-														<div
-															className={cn(
-																data?.subscriptions &&
-																	data?.subscriptions?.length > 0
-																	? "justify-between"
-																	: "justify-end",
-																"flex flex-row  items-center gap-2 mt-4",
-															)}
-														>
-															{admin?.user.stripeCustomerId && (
+														{data?.subscriptions?.length === 0 && (
+															<div className="justify-end w-full">
 																<Button
-																	variant="secondary"
 																	className="w-full"
 																	onClick={async () => {
-																		const session =
-																			await createCustomerPortalSession();
-
-																		window.open(session.url);
+																		handleCheckout(product.id);
 																	}}
+																	disabled={serverQuantity < 1}
 																>
-																	Manage Subscription
+																	Subscribe
 																</Button>
-															)}
-
-															{data?.subscriptions?.length === 0 && (
-																<div className="justify-end w-full">
-																	<Button
-																		className="w-full"
-																		onClick={async () => {
-																			handleCheckout(product.id);
-																		}}
-																		disabled={serverQuantity < 1}
-																	>
-																		Subscribe
-																	</Button>
-																</div>
-															)}
-														</div>
+															</div>
+														)}
 													</div>
-												</section>
-											</div>
-										);
-									})}
-								</>
+												</div>
+											</section>
+										</div>
+									);
+								})
 							)}
 						</div>
 					</CardContent>
+					<div className="flex flex-col gap-4 pb-10">
+						<ShowProviders />
+					</div>
 				</div>
 			</Card>
 		</div>

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

@@ -0,0 +1,355 @@
+import { zodResolver } from "@hookform/resolvers/zod";
+import {
+	Cpu,
+	EuroIcon,
+	HardDrive,
+	Loader2,
+	MapPin,
+	MemoryStick,
+	Zap,
+} from "lucide-react";
+import { useForm } from "react-hook-form";
+import * as z from "zod";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import {
+	Card,
+	CardContent,
+	CardDescription,
+	CardHeader,
+	CardTitle,
+} from "@/components/ui/card";
+import {
+	Form,
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+} from "@/components/ui/form";
+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
+import { api } from "@/utils/api";
+
+// Function to classify servers by type
+function getServerCategory(cpuType: string) {
+	if (cpuType === "shared") {
+		return {
+			category: "Shared CPU",
+			icon: Cpu,
+			badge: "shared",
+			color: "bg-blue-500",
+			description: "Perfect for small and medium projects",
+		};
+	}
+
+	return {
+		category: "Dedicated CPU",
+		icon: Zap,
+		badge: "dedicated",
+		color: "bg-purple-500",
+		description: "Maximum performance for demanding applications",
+	};
+}
+
+const formSchema = z.object({
+	location: z.string().min(1, "Please select a location"),
+	architecture: z.enum(["x86", "arm"], {
+		required_error: "Please select an architecture",
+	}),
+	selectedServerId: z.string().optional(),
+});
+
+type FormValues = z.infer<typeof formSchema>;
+
+export const ShowHetznerProviders = () => {
+	const { data: serverTypesData, isLoading: isLoadingTypes } =
+		api.hetzner.serverTypes.useQuery();
+	const { data: locationsData, isLoading: isLoadingLocations } =
+		api.hetzner.locations.useQuery();
+
+	const form = useForm<FormValues>({
+		resolver: zodResolver(formSchema),
+		defaultValues: {
+			location: "",
+			architecture: "x86",
+			selectedServerId: "",
+		},
+	});
+
+	const selectedLocation = form.watch("location");
+	const selectedArchitecture = form.watch("architecture");
+
+	if (isLoadingTypes || isLoadingLocations) {
+		return (
+			<div className="flex items-center justify-center p-4">
+				<Loader2 className="h-6 w-6 animate-spin" />
+			</div>
+		);
+	}
+
+	const locations = locationsData?.locations ?? [];
+	const serverTypes = serverTypesData?.server_types ?? [];
+
+	// Filter server types by selected location AND architecture
+	const filteredServerTypes = serverTypes.filter(
+		(type) =>
+			type.prices.some((price) => price.location === selectedLocation) &&
+			type.architecture === selectedArchitecture,
+	);
+
+	// Group by CPU type (shared/dedicated)
+	const sharedServers = filteredServerTypes.filter(
+		(type) => type.cpu_type === "shared",
+	);
+	const dedicatedServers = filteredServerTypes.filter(
+		(type) => type.cpu_type === "dedicated",
+	);
+
+	const renderServerGrid = (
+		servers: typeof serverTypes,
+		category: ReturnType<typeof getServerCategory>,
+	) => {
+		if (!servers.length) return null;
+		const IconComponent = category.icon;
+
+		return (
+			<div className="space-y-4">
+				<div className="flex items-center gap-2">
+					<IconComponent className="h-5 w-5" />
+					<h3 className="text-lg font-semibold">{category.category}</h3>
+					<Badge variant="outline" className={`text-white ${category.color}`}>
+						{category.badge}
+					</Badge>
+					<Badge variant="outline" className="text-xs text-muted-foreground">
+						Sorted by price
+					</Badge>
+				</div>
+				<p className="text-sm text-muted-foreground mb-4">
+					{category.description}
+				</p>
+				<FormField
+					control={form.control}
+					name="selectedServerId"
+					render={({ field }) => (
+						<FormItem className="space-y-0">
+							<FormControl>
+								<RadioGroup
+									onValueChange={field.onChange}
+									value={field.value}
+									className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4"
+								>
+									{servers.map((server) => (
+										<div key={server.id} className="relative">
+											<RadioGroupItem
+												value={server.id.toString()}
+												id={`server-${server.id}`}
+												className="absolute right-4 top-4 z-10"
+											/>
+											<label htmlFor={`server-${server.id}`}>
+												<Card
+													className={`relative bg-transparent transition-all duration-200 cursor-pointer ${
+														field.value === server.id.toString()
+															? "border-primary bg-primary/5"
+															: "hover:bg-primary/5"
+													}`}
+												>
+													<CardHeader>
+														<CardTitle>{server.name}</CardTitle>
+														<CardDescription>
+															{server.description}
+														</CardDescription>
+													</CardHeader>
+													<CardContent>
+														<div className="flex flex-col gap-3">
+															<div className="flex items-center gap-2">
+																<Cpu className="h-4 w-4 text-blue-500" />
+																<div>
+																	<strong>Cores:</strong> {server.cores}
+																</div>
+															</div>
+															<div className="flex items-center gap-2">
+																<MemoryStick className="h-4 w-4 text-green-500" />
+																<div>
+																	<strong>Memory:</strong> {server.memory} GB
+																</div>
+															</div>
+															<div className="flex items-center gap-2">
+																<HardDrive className="h-4 w-4 text-purple-500" />
+																<div>
+																	<strong>Disk:</strong> {server.disk} GB
+																</div>
+															</div>
+															{/* Show price for selected location */}
+															{server.prices
+																.filter((p) => p.location === selectedLocation)
+																.map((p) => (
+																	<div
+																		key={p.location}
+																		className="flex items-center gap-2"
+																	>
+																		<EuroIcon className="h-4 w-4 text-yellow-500" />
+																		<div>
+																			<strong>Price (monthly):</strong> €
+																			{Number.parseFloat(
+																				p.price_monthly.net,
+																			).toFixed(2)}
+																		</div>
+																	</div>
+																))}
+														</div>
+													</CardContent>
+												</Card>
+											</label>
+										</div>
+									))}
+								</RadioGroup>
+							</FormControl>
+						</FormItem>
+					)}
+				/>
+			</div>
+		);
+	};
+
+	function onSubmit(values: FormValues) {
+		console.log("Form submitted:", values);
+		// Here you can handle the form submission with the selected server
+	}
+
+	return (
+		<Form {...form}>
+			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
+				{/* Filters Card */}
+				<Card className="bg-transparent">
+					<CardHeader>
+						<CardTitle className="flex items-center gap-2 text-xl">
+							<MapPin className="h-5 w-5" />
+							Filters
+						</CardTitle>
+						<CardDescription>
+							Choose a region and architecture to see location-specific pricing
+						</CardDescription>
+					</CardHeader>
+					<CardContent className="space-y-6">
+						<Form {...form}>
+							<div className="space-y-6">
+								{/* Region Selector */}
+								<FormField
+									control={form.control}
+									name="location"
+									render={({ field }) => (
+										<FormItem>
+											<FormLabel>Region</FormLabel>
+											<Select
+												value={field.value}
+												onValueChange={field.onChange}
+											>
+												<SelectTrigger>
+													<SelectValue placeholder="Select a region" />
+												</SelectTrigger>
+												<SelectContent>
+													{locations.map((loc) => (
+														<SelectItem key={loc.id} value={loc.name}>
+															{loc.description}
+														</SelectItem>
+													))}
+												</SelectContent>
+											</Select>
+										</FormItem>
+									)}
+								/>
+
+								{/* Architecture Selector */}
+								<FormField
+									control={form.control}
+									name="architecture"
+									render={({ field }) => (
+										<FormItem>
+											<FormLabel>Architecture</FormLabel>
+											<FormControl>
+												<RadioGroup
+													onValueChange={field.onChange}
+													defaultValue={field.value}
+													className="grid grid-cols-2 gap-4"
+												>
+													<FormItem className="flex items-center space-x-3 space-y-0">
+														<FormControl>
+															<RadioGroupItem value="x86" />
+														</FormControl>
+														<FormLabel className="font-normal">
+															x86 (Intel/AMD)
+														</FormLabel>
+													</FormItem>
+													<FormItem className="flex items-center space-x-3 space-y-0">
+														<FormControl>
+															<RadioGroupItem value="arm" />
+														</FormControl>
+														<FormLabel className="font-normal">ARM</FormLabel>
+													</FormItem>
+												</RadioGroup>
+											</FormControl>
+										</FormItem>
+									)}
+								/>
+							</div>
+						</Form>
+					</CardContent>
+				</Card>
+
+				{/* Architecture Information */}
+				<div className="grid md:grid-cols-2 gap-4">
+					<div className="p-4 bg-blue-900 rounded-lg border border-blue-600">
+						<div className="flex items-start gap-2">
+							<Cpu className="h-5 w-5 text-blue-600 mt-0.5" />
+							<div className="text-sm text-blue-200">
+								<strong>x86 Architecture:</strong> Traditional Intel/AMD
+								processors. Most compatible with existing software and
+								applications. Best choice for general-purpose workloads.
+							</div>
+						</div>
+					</div>
+
+					<div className="p-4 bg-green-900 rounded-lg border border-green-600">
+						<div className="flex items-start gap-2">
+							<Cpu className="h-5 w-5 text-green-600 mt-0.5" />
+							<div className="text-sm text-green-200">
+								<strong>ARM Architecture:</strong> Modern, energy-efficient
+								processors. Excellent price-to-performance ratio. Perfect for
+								cloud-native and containerized applications.
+							</div>
+						</div>
+					</div>
+				</div>
+
+				{/* Server Types Grid */}
+				{selectedLocation && (
+					<>
+						{renderServerGrid(sharedServers, getServerCategory("shared"))}
+						{renderServerGrid(dedicatedServers, getServerCategory("dedicated"))}
+						{sharedServers.length === 0 && dedicatedServers.length === 0 && (
+							<p className="text-center text-muted-foreground py-10">
+								No server types available for this region and architecture
+								combination. <br />
+								Please try a different region or architecture.
+							</p>
+						)}
+					</>
+				)}
+
+				{selectedLocation && form.watch("selectedServerId") && (
+					<div className="flex justify-end">
+						<Button type="submit" className="bg-primary">
+							Continue with Selected Server
+						</Button>
+					</div>
+				)}
+			</form>
+		</Form>
+	);
+};

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

@@ -0,0 +1,423 @@
+import { zodResolver } from "@hookform/resolvers/zod";
+import {
+	Calendar,
+	Cpu,
+	DollarSign,
+	Globe,
+	HardDrive,
+	Loader2,
+	MemoryStick,
+	Server,
+} from "lucide-react";
+import { useForm } from "react-hook-form";
+import * as z from "zod";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import {
+	Card,
+	CardContent,
+	CardDescription,
+	CardHeader,
+	CardTitle,
+} from "@/components/ui/card";
+import {
+	Form,
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
+} from "@/components/ui/form";
+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
+import { api } from "@/utils/api";
+
+const formSchema = z.object({
+	datacenter: z.string({
+		required_error: "Please select a datacenter",
+	}),
+	plan: z.string({
+		required_error: "Please select a server plan",
+	}),
+	billingPeriod: z.object(
+		{
+			unit: z.enum(["month", "year"]),
+			period: z.number(),
+		},
+		{
+			required_error: "Please select a billing period",
+		},
+	),
+});
+
+// Format billing period
+function formatBillingPeriod(period: number, unit: string): string {
+	if (unit === "month") {
+		return period === 1 ? "Monthly" : `${period} months`;
+	}
+	if (unit === "year") {
+		return period === 1 ? "Yearly" : `${period} years`;
+	}
+	return `${period} ${unit}`;
+}
+
+// Convert price from cents to dollars
+function formatPrice(priceInCents: number): string {
+	return (priceInCents / 100).toFixed(2);
+}
+
+// Calculate yearly savings
+function calculateSavings(
+	monthlyPriceInCents: number,
+	yearlyPriceInCents: number,
+): number {
+	return (monthlyPriceInCents * 12 - yearlyPriceInCents) / 100;
+}
+
+type FormData = z.infer<typeof formSchema>;
+
+export const ShowHostingerServers = () => {
+	const { data: vpsPlans, isLoading: plansLoading } =
+		api.hostinger.vpsPlans.useQuery();
+	const { data: dataCenters, isLoading: centersLoading } =
+		api.hostinger.dataCenters.useQuery();
+
+	const form = useForm<FormData>({
+		resolver: zodResolver(formSchema),
+		defaultValues: {
+			datacenter: "",
+			plan: "",
+			billingPeriod: {
+				unit: "month",
+				period: 1,
+			},
+		},
+	});
+
+	const isLoading = plansLoading || centersLoading;
+
+	function onSubmit(data: FormData) {
+		console.log(data);
+		// Handle form submission here
+	}
+
+	if (isLoading) {
+		return (
+			<div className="flex items-center justify-center p-4">
+				<Loader2 className="h-6 w-6 animate-spin" />
+			</div>
+		);
+	}
+
+	return (
+		<div className="space-y-4">
+			<Card className="bg-transparent">
+				<CardHeader>
+					<CardTitle className="flex items-center gap-2">
+						<Server className="h-5 w-5" />
+						Hostinger VPS Plans
+						<Badge variant="outline" className="text-xs text-muted-foreground">
+							Sorted by price
+						</Badge>
+					</CardTitle>
+					<CardDescription>
+						VPS plans with real pricing from Hostinger API
+						<br />
+						<span className="text-xs text-orange-600">
+							💡 Promotional pricing applies to first billing period only
+						</span>
+					</CardDescription>
+				</CardHeader>
+				<CardContent>
+					<Form {...form}>
+						<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
+							{/* Data Center Selection */}
+							<FormField
+								control={form.control}
+								name="datacenter"
+								render={({ field }) => (
+									<FormItem className="space-y-4">
+										<FormLabel>
+											<div className="flex items-center gap-2">
+												<Globe className="h-5 w-5 text-muted-foreground" />
+												<span className="text-lg font-medium">
+													Select Data Center
+												</span>
+											</div>
+										</FormLabel>
+										<FormControl>
+											<RadioGroup
+												onValueChange={field.onChange}
+												defaultValue={field.value}
+												className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4"
+											>
+												{dataCenters?.map((center) => (
+													<FormItem key={center.id}>
+														<FormControl>
+															<RadioGroupItem
+																value={center.id?.toString() || ""}
+																className="peer sr-only"
+															/>
+														</FormControl>
+														<FormLabel className="p-4 rounded-lg border-2 transition-all duration-200 flex flex-col items-center gap-2 peer-aria-checked:border-purple-500 peer-aria-checked:bg-purple-50 dark:peer-aria-checked:bg-purple-950 hover:border-purple-300 cursor-pointer">
+															<Globe className="h-6 w-6 text-muted-foreground" />
+															<span className="text-sm font-medium text-center">
+																{center.city} / {center.continent}
+															</span>
+														</FormLabel>
+													</FormItem>
+												))}
+											</RadioGroup>
+										</FormControl>
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
+
+							{/* Billing Period Selection */}
+							<FormField
+								control={form.control}
+								name="billingPeriod"
+								render={({ field }) => (
+									<FormItem className="space-y-4">
+										<FormLabel>
+											<div className="flex items-center gap-2">
+												<Calendar className="h-5 w-5 text-muted-foreground" />
+												<span className="text-lg font-medium">
+													Billing Period
+												</span>
+											</div>
+										</FormLabel>
+										<FormControl>
+											<RadioGroup
+												onValueChange={(value) => {
+													switch (value) {
+														case "monthly":
+															field.onChange({ unit: "month", period: 1 });
+															break;
+														case "yearly":
+															field.onChange({ unit: "year", period: 1 });
+															break;
+														case "2years":
+															field.onChange({ unit: "year", period: 2 });
+															break;
+													}
+												}}
+												defaultValue="monthly"
+												className="grid w-full grid-cols-3 lg:w-[600px] gap-4"
+											>
+												<FormItem>
+													<FormControl>
+														<RadioGroupItem
+															value="monthly"
+															className="peer sr-only"
+														/>
+													</FormControl>
+													<FormLabel className="flex items-center justify-center p-3 rounded-lg border-2 transition-all duration-200 peer-aria-checked:border-purple-500 peer-aria-checked:bg-purple-50 dark:peer-aria-checked:bg-purple-950 hover:border-purple-300 cursor-pointer">
+														Monthly Billing
+													</FormLabel>
+												</FormItem>
+												<FormItem>
+													<FormControl>
+														<RadioGroupItem
+															value="yearly"
+															className="peer sr-only"
+														/>
+													</FormControl>
+													<FormLabel className="flex items-center justify-center p-3 rounded-lg border-2 transition-all duration-200 peer-aria-checked:border-purple-500 peer-aria-checked:bg-purple-50 dark:peer-aria-checked:bg-purple-950 hover:border-purple-300 cursor-pointer">
+														Annual Billing
+													</FormLabel>
+												</FormItem>
+												<FormItem>
+													<FormControl>
+														<RadioGroupItem
+															value="2years"
+															className="peer sr-only"
+														/>
+													</FormControl>
+													<FormLabel className="flex items-center justify-center p-3 rounded-lg border-2 transition-all duration-200 peer-aria-checked:border-purple-500 peer-aria-checked:bg-purple-50 dark:peer-aria-checked:bg-purple-950 hover:border-purple-300 cursor-pointer">
+														2 Year Billing
+													</FormLabel>
+												</FormItem>
+											</RadioGroup>
+										</FormControl>
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
+
+							{/* VPS Plans Selection */}
+							<FormField
+								control={form.control}
+								name="plan"
+								render={({ field }) => (
+									<FormItem className="space-y-4">
+										<FormLabel>
+											<div className="flex items-center gap-2">
+												<Server className="h-5 w-5 text-muted-foreground" />
+												<span className="text-lg font-medium">
+													Select Server Plan
+												</span>
+											</div>
+										</FormLabel>
+										<FormControl>
+											<RadioGroup
+												onValueChange={field.onChange}
+												defaultValue={field.value}
+												className="grid grid-cols-1 lg:grid-cols-2 gap-6"
+											>
+												{vpsPlans
+													?.sort((a, b) => {
+														const billingPeriod = form.watch("billingPeriod");
+														const priceA =
+															a.prices?.find(
+																(p) =>
+																	p.period_unit === billingPeriod.unit &&
+																	p.period === billingPeriod.period,
+															)?.price || 0;
+														const priceB =
+															b.prices?.find(
+																(p) =>
+																	p.period_unit === billingPeriod.unit &&
+																	p.period === billingPeriod.period,
+															)?.price || 0;
+														return priceA - priceB;
+													})
+													?.map((plan) => {
+														const monthlyPrice =
+															plan.prices?.find(
+																(p) =>
+																	p.period === 1 && p.period_unit === "month",
+															)?.price || 0;
+
+														const selectedPrice = plan.prices?.find(
+															(p) =>
+																p.period_unit ===
+																	form.watch("billingPeriod.unit") &&
+																p.period === form.watch("billingPeriod.period"),
+														);
+
+														if (!selectedPrice) return null;
+
+														return (
+															<FormItem key={plan.id}>
+																<FormControl>
+																	<RadioGroupItem
+																		value={plan.id || ""}
+																		className="peer sr-only"
+																	/>
+																</FormControl>
+																<FormLabel className="w-full cursor-pointer">
+																	<Card
+																		className={`border-2 transition-all duration-200 relative bg-transparent hover:border-purple-300 hover:shadow-lg ${field.value === plan.id ? "border-purple-500 bg-purple-950/40" : ""}`}
+																	>
+																		{plan.name === "KVM 2" && (
+																			<div className="absolute -top-2 -right-2 bg-green-500 text-white px-2 py-1 rounded-full text-xs font-semibold">
+																				MOST POPULAR
+																			</div>
+																		)}
+																		<CardHeader>
+																			<CardTitle>{plan.name}</CardTitle>
+																			<CardDescription>
+																				{"High-performance VPS hosting"}
+																			</CardDescription>
+																		</CardHeader>
+																		<CardContent>
+																			<div className="flex flex-col gap-4">
+																				<div className="grid grid-cols-3 gap-4">
+																					<div className="flex flex-col items-center p-2 bg-muted rounded-lg">
+																						<Cpu className="h-4 w-4 mb-1 text-muted-foreground" />
+																						<span className="text-sm font-medium">
+																							{plan.metadata?.cpus || 1} vCPU
+																						</span>
+																						<span className="text-xs text-muted-foreground">
+																							Cores
+																						</span>
+																					</div>
+																					<div className="flex flex-col items-center p-2 bg-muted rounded-lg">
+																						<MemoryStick className="h-4 w-4 mb-1 text-muted-foreground" />
+																						<span className="text-sm font-medium">
+																							{Number.parseInt(
+																								plan.metadata?.memory || "2048",
+																							) / 1024}{" "}
+																							GB
+																						</span>
+																						<span className="text-xs text-muted-foreground">
+																							RAM
+																						</span>
+																					</div>
+																					<div className="flex flex-col items-center p-2 bg-muted rounded-lg">
+																						<HardDrive className="h-4 w-4 mb-1 text-muted-foreground" />
+																						<span className="text-sm font-medium">
+																							{Number.parseInt(
+																								plan.metadata?.disk_space ||
+																									"20480",
+																							) / 1024}{" "}
+																							GB
+																						</span>
+																						<span className="text-xs text-muted-foreground">
+																							SSD
+																						</span>
+																					</div>
+																				</div>
+
+																				<div className="mt-2">
+																					<div className="flex items-center justify-between p-3 bg-primary/5 rounded-lg">
+																						<div className="flex items-center">
+																							<Calendar className="h-4 w-4 mr-2 text-muted-foreground" />
+																							<span className="text-sm">
+																								{formatBillingPeriod(
+																									selectedPrice.period || 1,
+																									selectedPrice.period_unit ||
+																										"month",
+																								)}
+																							</span>
+																						</div>
+																						<div className="flex items-center">
+																							<DollarSign className="h-4 w-4 mr-1 text-primary" />
+																							<span className="text-lg font-semibold">
+																								$
+																								{formatPrice(
+																									selectedPrice.price || 0,
+																								)}
+																							</span>
+																							{selectedPrice.period_unit ===
+																								"year" && (
+																								<Badge
+																									variant="outline"
+																									className="ml-2 text-xs"
+																								>
+																									Save $
+																									{calculateSavings(
+																										monthlyPrice,
+																										selectedPrice.price || 0,
+																									).toFixed(2)}
+																									/yr
+																								</Badge>
+																							)}
+																						</div>
+																					</div>
+																				</div>
+																			</div>
+																		</CardContent>
+																	</Card>
+																</FormLabel>
+															</FormItem>
+														);
+													})}
+											</RadioGroup>
+										</FormControl>
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
+
+							<Button type="submit" className="w-full">
+								Create Server
+							</Button>
+						</form>
+					</Form>
+				</CardContent>
+			</Card>
+		</div>
+	);
+};

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

@@ -0,0 +1,47 @@
+import { DollarSign } from "lucide-react";
+import {
+	Card,
+	CardContent,
+	CardDescription,
+	CardHeader,
+	CardTitle,
+} from "@/components/ui/card";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { ShowHetznerProviders } from "./show-hetzner-providers";
+import { ShowHostingerServers } from "./show-hostinger-servers";
+
+export const ShowProviders = () => {
+	return (
+		<Card className="w-full bg-transparent border-none">
+			<CardHeader>
+				<CardTitle className="flex items-center gap-2">
+					<DollarSign className="h-6 w-6 text-green-600" />
+					Servers
+				</CardTitle>
+				<CardDescription>
+					Manage and view available server types from Hetzner and Hostinger for
+					your business. Here you can see updated pricing and specifications for
+					each plan.
+				</CardDescription>
+			</CardHeader>
+			<CardContent>
+				<Tabs defaultValue="hetzner" className="w-full">
+					<TabsList className="grid w-full grid-cols-2">
+						<TabsTrigger value="hetzner" className="flex items-center gap-2">
+							🇩🇪 Hetzner Cloud
+						</TabsTrigger>
+						<TabsTrigger value="hostinger" className="flex items-center gap-2">
+							🌍 Hostinger VPS
+						</TabsTrigger>
+					</TabsList>
+					<TabsContent value="hetzner" className="mt-4">
+						<ShowHetznerProviders />
+					</TabsContent>
+					<TabsContent value="hostinger" className="mt-4">
+						<ShowHostingerServers />
+					</TabsContent>
+				</Tabs>
+			</CardContent>
+		</Card>
+	);
+};

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

@@ -1,6 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { ExternalLink } from "lucide-react";
 import Link from "next/link";
+import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
@@ -26,12 +27,18 @@ import {
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { api } from "@/utils/api";
+import { useUrl } from "@/utils/hooks/use-url";
 
 const Schema = z.object({
-	name: z.string().min(1, { message: "Name is required" }),
-	username: z.string().min(1, { message: "Username is required" }),
-	email: z.string().email().optional(),
-	apiToken: z.string().min(1, { message: "API Token is required" }),
+	name: z.string().min(1, {
+		message: "Name is required",
+	}),
+	username: z.string().min(1, {
+		message: "Username is required",
+	}),
+	password: z.string().min(1, {
+		message: "App Password is required",
+	}),
 	workspaceName: z.string().optional(),
 });
 
@@ -40,12 +47,14 @@ type Schema = z.infer<typeof Schema>;
 export const AddBitbucketProvider = () => {
 	const utils = api.useUtils();
 	const [isOpen, setIsOpen] = useState(false);
+	const _url = useUrl();
 	const { mutateAsync, error, isError } = api.bitbucket.create.useMutation();
 	const { data: auth } = api.user.get.useQuery();
+	const _router = useRouter();
 	const form = useForm<Schema>({
 		defaultValues: {
 			username: "",
-			apiToken: "",
+			password: "",
 			workspaceName: "",
 		},
 		resolver: zodResolver(Schema),
@@ -54,8 +63,7 @@ export const AddBitbucketProvider = () => {
 	useEffect(() => {
 		form.reset({
 			username: "",
-			email: "",
-			apiToken: "",
+			password: "",
 			workspaceName: "",
 		});
 	}, [form, isOpen]);
@@ -63,11 +71,10 @@ export const AddBitbucketProvider = () => {
 	const onSubmit = async (data: Schema) => {
 		await mutateAsync({
 			bitbucketUsername: data.username,
-			apiToken: data.apiToken,
+			appPassword: data.password,
 			bitbucketWorkspaceName: data.workspaceName || "",
 			authId: auth?.id || "",
 			name: data.name || "",
-			bitbucketEmail: data.email || "",
 		})
 			.then(async () => {
 				await utils.gitProvider.getAll.invalidate();
@@ -106,46 +113,37 @@ export const AddBitbucketProvider = () => {
 					>
 						<CardContent className="p-0">
 							<div className="flex flex-col gap-4">
-								<AlertBlock type="warning">
-									Bitbucket App Passwords are deprecated for new providers. Use
-									an API Token instead. Existing providers with App Passwords
-									will continue to work until 9th June 2026.
-								</AlertBlock>
-
-								<div className="mt-1 text-sm">
-									Manage tokens in
-									<Link
-										href="https://id.atlassian.com/manage-profile/security/api-tokens"
-										target="_blank"
-										className="inline-flex items-center gap-1 ml-1"
-									>
-										<span>Bitbucket settings</span>
-										<ExternalLink className="w-fit text-primary size-4" />
-									</Link>
-								</div>
-								<ul className="list-disc list-inside ml-4 text-sm text-muted-foreground">
-									<li className="text-muted-foreground text-sm">
-										Click on Create API token with scopes
-									</li>
-									<li className="text-muted-foreground text-sm">
-										Select the expiration date (Max 1 year)
-									</li>
-									<li className="text-muted-foreground text-sm">
-										Select Bitbucket product.
-									</li>
-								</ul>
 								<p className="text-muted-foreground text-sm">
-									Select the following scopes:
+									To integrate your Bitbucket account, you need to create a new
+									App Password in your Bitbucket settings. Follow these steps:
 								</p>
-
-								<ul className="list-disc list-inside ml-4 text-sm text-muted-foreground">
-									<li>read:repository:bitbucket</li>
-									<li>read:pullrequest:bitbucket</li>
-									<li>read:webhook:bitbucket</li>
-									<li>read:workspace:bitbucket</li>
-									<li>write:webhook:bitbucket</li>
-								</ul>
-
+								<ol className="list-decimal list-inside text-sm text-muted-foreground">
+									<li className="flex flex-row gap-2 items-center">
+										Create new App Password{" "}
+										<Link
+											href="https://bitbucket.org/account/settings/app-passwords/new"
+											target="_blank"
+										>
+											<ExternalLink className="w-fit text-primary size-4" />
+										</Link>
+									</li>
+									<li>
+										When creating the App Password, ensure you grant the
+										following permissions:
+										<ul className="list-disc list-inside ml-4">
+											<li>Account: Read</li>
+											<li>Workspace membership: Read</li>
+											<li>Projects: Read</li>
+											<li>Repositories: Read</li>
+											<li>Pull requests: Read</li>
+											<li>Webhooks: Read and write</li>
+										</ul>
+									</li>
+									<li>
+										After creating, you'll receive an App Password. Copy it and
+										paste it below along with your Bitbucket username.
+									</li>
+								</ol>
 								<FormField
 									control={form.control}
 									name="name"
@@ -154,7 +152,7 @@ export const AddBitbucketProvider = () => {
 											<FormLabel>Name</FormLabel>
 											<FormControl>
 												<Input
-													placeholder="Your Bitbucket Provider, eg: my-personal-account"
+													placeholder="Random Name eg(my-personal-account)"
 													{...field}
 												/>
 											</FormControl>
@@ -181,27 +179,14 @@ export const AddBitbucketProvider = () => {
 
 								<FormField
 									control={form.control}
-									name="email"
+									name="password"
 									render={({ field }) => (
 										<FormItem>
-											<FormLabel>Bitbucket Email</FormLabel>
-											<FormControl>
-												<Input placeholder="Your Bitbucket email" {...field} />
-											</FormControl>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-
-								<FormField
-									control={form.control}
-									name="apiToken"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>API Token</FormLabel>
+											<FormLabel>App Password</FormLabel>
 											<FormControl>
 												<Input
-													placeholder="Paste your Bitbucket API token"
+													type="password"
+													placeholder="ATBBPDYUC94nR96Nj7Cqpp4pfwKk03573DD2"
 													{...field}
 												/>
 											</FormControl>
@@ -215,7 +200,7 @@ export const AddBitbucketProvider = () => {
 									name="workspaceName"
 									render={({ field }) => (
 										<FormItem>
-											<FormLabel>Workspace Name (optional)</FormLabel>
+											<FormLabel>Workspace Name (Optional)</FormLabel>
 											<FormControl>
 												<Input
 													placeholder="For organization accounts"

apps/dokploy/components/dashboard/settings/git/bitbucket/edit-bitbucket-provider.tsx

@@ -33,10 +33,7 @@ const Schema = z.object({
 	username: z.string().min(1, {
 		message: "Username is required",
 	}),
-	email: z.string().email().optional(),
 	workspaceName: z.string().optional(),
-	apiToken: z.string().optional(),
-	appPassword: z.string().optional(),
 });
 
 type Schema = z.infer<typeof Schema>;
@@ -63,28 +60,19 @@ export const EditBitbucketProvider = ({ bitbucketId }: Props) => {
 	const form = useForm<Schema>({
 		defaultValues: {
 			username: "",
-			email: "",
 			workspaceName: "",
-			apiToken: "",
-			appPassword: "",
 		},
 		resolver: zodResolver(Schema),
 	});
 
 	const username = form.watch("username");
-	const email = form.watch("email");
 	const workspaceName = form.watch("workspaceName");
-	const apiToken = form.watch("apiToken");
-	const appPassword = form.watch("appPassword");
 
 	useEffect(() => {
 		form.reset({
 			username: bitbucket?.bitbucketUsername || "",
-			email: bitbucket?.bitbucketEmail || "",
 			workspaceName: bitbucket?.bitbucketWorkspaceName || "",
 			name: bitbucket?.gitProvider.name || "",
-			apiToken: bitbucket?.apiToken || "",
-			appPassword: bitbucket?.appPassword || "",
 		});
 	}, [form, isOpen, bitbucket]);
 
@@ -93,11 +81,8 @@ export const EditBitbucketProvider = ({ bitbucketId }: Props) => {
 			bitbucketId,
 			gitProviderId: bitbucket?.gitProviderId || "",
 			bitbucketUsername: data.username,
-			bitbucketEmail: data.email || "",
 			bitbucketWorkspaceName: data.workspaceName || "",
 			name: data.name || "",
-			apiToken: data.apiToken || "",
-			appPassword: data.appPassword || "",
 		})
 			.then(async () => {
 				await utils.gitProvider.getAll.invalidate();
@@ -136,12 +121,6 @@ export const EditBitbucketProvider = ({ bitbucketId }: Props) => {
 					>
 						<CardContent className="p-0">
 							<div className="flex flex-col gap-4">
-								<p className="text-muted-foreground text-sm">
-									Update your Bitbucket authentication. Use API Token for
-									enhanced security (recommended) or App Password for legacy
-									support.
-								</p>
-
 								<FormField
 									control={form.control}
 									name="name"
@@ -175,24 +154,6 @@ export const EditBitbucketProvider = ({ bitbucketId }: Props) => {
 									)}
 								/>
 
-								<FormField
-									control={form.control}
-									name="email"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Email (Required for API Tokens)</FormLabel>
-											<FormControl>
-												<Input
-													type="email"
-													placeholder="Your Bitbucket email address"
-													{...field}
-												/>
-											</FormControl>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-
 								<FormField
 									control={form.control}
 									name="workspaceName"
@@ -210,49 +171,6 @@ export const EditBitbucketProvider = ({ bitbucketId }: Props) => {
 									)}
 								/>
 
-								<div className="flex flex-col gap-2 border-t pt-4">
-									<h3 className="text-sm font-medium mb-2">
-										Authentication (Update to use API Token)
-									</h3>
-									<FormField
-										control={form.control}
-										name="apiToken"
-										render={({ field }) => (
-											<FormItem>
-												<FormLabel>API Token (Recommended)</FormLabel>
-												<FormControl>
-													<Input
-														type="password"
-														placeholder="Enter your Bitbucket API Token"
-														{...field}
-													/>
-												</FormControl>
-												<FormMessage />
-											</FormItem>
-										)}
-									/>
-
-									<FormField
-										control={form.control}
-										name="appPassword"
-										render={({ field }) => (
-											<FormItem>
-												<FormLabel>
-													App Password (Legacy - will be deprecated June 2026)
-												</FormLabel>
-												<FormControl>
-													<Input
-														type="password"
-														placeholder="Enter your Bitbucket App Password"
-														{...field}
-													/>
-												</FormControl>
-												<FormMessage />
-											</FormItem>
-										)}
-									/>
-								</div>
-
 								<div className="flex w-full justify-between gap-4 mt-4">
 									<Button
 										type="button"
@@ -262,10 +180,7 @@ export const EditBitbucketProvider = ({ bitbucketId }: Props) => {
 											await testConnection({
 												bitbucketId,
 												bitbucketUsername: username,
-												bitbucketEmail: email,
 												workspaceName: workspaceName,
-												apiToken: apiToken,
-												appPassword: appPassword,
 											})
 												.then(async (message) => {
 													toast.info(`Message: ${message}`);

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

@@ -30,9 +30,6 @@ const Schema = z.object({
 	name: z.string().min(1, {
 		message: "Name is required",
 	}),
-	appName: z.string().min(1, {
-		message: "App Name is required",
-	}),
 });
 
 type Schema = z.infer<typeof Schema>;
@@ -58,7 +55,6 @@ export const EditGithubProvider = ({ githubId }: Props) => {
 	const form = useForm<Schema>({
 		defaultValues: {
 			name: "",
-			appName: "",
 		},
 		resolver: zodResolver(Schema),
 	});
@@ -66,7 +62,6 @@ export const EditGithubProvider = ({ githubId }: Props) => {
 	useEffect(() => {
 		form.reset({
 			name: github?.gitProvider.name || "",
-			appName: github?.githubAppName || "",
 		});
 	}, [form, isOpen]);
 
@@ -75,7 +70,6 @@ export const EditGithubProvider = ({ githubId }: Props) => {
 			githubId,
 			name: data.name || "",
 			gitProviderId: github?.gitProviderId || "",
-			githubAppName: data.appName || "",
 		})
 			.then(async () => {
 				await utils.gitProvider.getAll.invalidate();
@@ -130,22 +124,6 @@ export const EditGithubProvider = ({ githubId }: Props) => {
 										</FormItem>
 									)}
 								/>
-								<FormField
-									control={form.control}
-									name="appName"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>App Name</FormLabel>
-											<FormControl>
-												<Input
-													placeholder="pp Name eg(my-personal)"
-													{...field}
-												/>
-											</FormControl>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
 
 								<div className="flex w-full justify-between gap-4 mt-4">
 									<Button

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

@@ -157,13 +157,7 @@ export const ShowGitProviders = () => {
 																</div>
 															</div>
 
-															<div className="flex flex-row gap-1 items-center">
-																{isBitbucket &&
-																gitProvider.bitbucket?.appPassword &&
-																!gitProvider.bitbucket?.apiToken ? (
-																	<Badge variant="yellow">Deprecated</Badge>
-																) : null}
-
+															<div className="flex flex-row gap-1">
 																{!haveGithubRequirements && isGithub && (
 																	<div className="flex flex-row gap-1 items-center">
 																		<Badge

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

@@ -12,8 +12,6 @@ import { toast } from "sonner";
 import { z } from "zod";
 import {
 	DiscordIcon,
-	GotifyIcon,
-	NtfyIcon,
 	SlackIcon,
 	TelegramIcon,
 } from "@/components/icons/notification-icons";
@@ -132,11 +130,11 @@ export const notificationsMap = {
 		label: "Email",
 	},
 	gotify: {
-		icon: <GotifyIcon />,
+		icon: <MessageCircleMore size={29} className="text-muted-foreground" />,
 		label: "Gotify",
 	},
 	ntfy: {
-		icon: <NtfyIcon />,
+		icon: <MessageCircleMore size={29} className="text-muted-foreground" />,
 		label: "ntfy",
 	},
 };

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

@@ -2,8 +2,6 @@ import { Bell, Loader2, Mail, MessageCircleMore, Trash2 } from "lucide-react";
 import { toast } from "sonner";
 import {
 	DiscordIcon,
-	GotifyIcon,
-	NtfyIcon,
 	SlackIcon,
 	TelegramIcon,
 } from "@/components/icons/notification-icons";
@@ -87,12 +85,12 @@ export const ShowNotifications = () => {
 															)}
 															{notification.notificationType === "gotify" && (
 																<div className="flex  items-center justify-center rounded-lg ">
-																	<GotifyIcon className="size-6" />
+																	<MessageCircleMore className="size-6 text-muted-foreground" />
 																</div>
 															)}
 															{notification.notificationType === "ntfy" && (
 																<div className="flex  items-center justify-center rounded-lg ">
-																	<NtfyIcon className="size-6" />
+																	<MessageCircleMore className="size-6 text-muted-foreground" />
 																</div>
 															)}
 

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

@@ -33,10 +33,7 @@ import { Disable2FA } from "./disable-2fa";
 import { Enable2FA } from "./enable-2fa";
 
 const profileSchema = z.object({
-	email: z
-		.string()
-		.email("Please enter a valid email address")
-		.min(1, "Email is required"),
+	email: z.string(),
 	password: z.string().nullable(),
 	currentPassword: z.string().nullable(),
 	image: z.string().optional(),
@@ -257,16 +254,8 @@ export const ProfileForm = () => {
 																onValueChange={(e) => {
 																	field.onChange(e);
 																}}
-																defaultValue={
-																	field.value?.startsWith("data:")
-																		? "upload"
-																		: field.value
-																}
-																value={
-																	field.value?.startsWith("data:")
-																		? "upload"
-																		: field.value
-																}
+																defaultValue={field.value}
+																value={field.value}
 																className="flex flex-row flex-wrap gap-2 max-xl:justify-center"
 															>
 																<FormItem key="no-avatar">
@@ -287,71 +276,6 @@ export const ProfileForm = () => {
 																		</Avatar>
 																	</FormLabel>
 																</FormItem>
-																<FormItem key="custom-upload">
-																	<FormLabel className="[&:has([data-state=checked])>.upload-avatar]:border-primary [&:has([data-state=checked])>.upload-avatar]:border-1 [&:has([data-state=checked])>.upload-avatar]:p-px cursor-pointer">
-																		<FormControl>
-																			<RadioGroupItem
-																				value="upload"
-																				className="sr-only"
-																			/>
-																		</FormControl>
-																		<div
-																			className="upload-avatar h-12 w-12 rounded-full border border-dashed border-muted-foreground hover:border-primary transition-colors flex items-center justify-center bg-muted/50 hover:bg-muted overflow-hidden"
-																			onClick={() =>
-																				document
-																					.getElementById("avatar-upload")
-																					?.click()
-																			}
-																		>
-																			{field.value?.startsWith("data:") ? (
-																				<img
-																					src={field.value}
-																					alt="Custom avatar"
-																					className="h-full w-full object-cover rounded-full"
-																				/>
-																			) : (
-																				<svg
-																					className="h-5 w-5 text-muted-foreground"
-																					fill="none"
-																					stroke="currentColor"
-																					viewBox="0 0 24 24"
-																				>
-																					<path
-																						strokeLinecap="round"
-																						strokeLinejoin="round"
-																						strokeWidth={2}
-																						d="M12 4v16m8-8H4"
-																					/>
-																				</svg>
-																			)}
-																		</div>
-																		<input
-																			id="avatar-upload"
-																			type="file"
-																			accept="image/*"
-																			className="hidden"
-																			onChange={async (e) => {
-																				const file = e.target.files?.[0];
-																				if (file) {
-																					// max file size 2mb
-																					if (file.size > 2 * 1024 * 1024) {
-																						toast.error(
-																							"Image size must be less than 2MB",
-																						);
-																						return;
-																					}
-																					const reader = new FileReader();
-																					reader.onload = (event) => {
-																						const result = event.target
-																							?.result as string;
-																						field.onChange(result);
-																					};
-																					reader.readAsDataURL(file);
-																				}
-																			}}
-																		/>
-																	</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/users/add-permissions.tsx

@@ -1,6 +1,6 @@
 import type { findEnvironmentById } from "@dokploy/server/index";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
+import { useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
@@ -161,13 +161,11 @@ const addPermissions = z.object({
 	canCreateServices: z.boolean().optional().default(false),
 	canDeleteProjects: z.boolean().optional().default(false),
 	canDeleteServices: z.boolean().optional().default(false),
-	canDeleteEnvironments: z.boolean().optional().default(false),
 	canAccessToTraefikFiles: z.boolean().optional().default(false),
 	canAccessToDocker: z.boolean().optional().default(false),
 	canAccessToAPI: z.boolean().optional().default(false),
 	canAccessToSSHKeys: z.boolean().optional().default(false),
 	canAccessToGitProviders: z.boolean().optional().default(false),
-	canCreateEnvironments: z.boolean().optional().default(false),
 });
 
 type AddPermissions = z.infer<typeof addPermissions>;
@@ -177,7 +175,6 @@ interface Props {
 }
 
 export const AddUserPermissions = ({ userId }: Props) => {
-	const [isOpen, setIsOpen] = useState(false);
 	const { data: projects } = api.project.all.useQuery();
 
 	const { data, refetch } = api.user.one.useQuery(
@@ -195,25 +192,13 @@ export const AddUserPermissions = ({ userId }: Props) => {
 	const form = useForm<AddPermissions>({
 		defaultValues: {
 			accessedProjects: [],
-			accessedEnvironments: [],
 			accessedServices: [],
-			canDeleteEnvironments: false,
-			canCreateProjects: false,
-			canCreateServices: false,
-			canDeleteProjects: false,
-			canDeleteServices: false,
-			canAccessToTraefikFiles: false,
-			canAccessToDocker: false,
-			canAccessToAPI: false,
-			canAccessToSSHKeys: false,
-			canAccessToGitProviders: false,
-			canCreateEnvironments: false,
 		},
 		resolver: zodResolver(addPermissions),
 	});
 
 	useEffect(() => {
-		if (data && isOpen) {
+		if (data) {
 			form.reset({
 				accessedProjects: data.accessedProjects || [],
 				accessedEnvironments: data.accessedEnvironments || [],
@@ -222,16 +207,14 @@ export const AddUserPermissions = ({ userId }: Props) => {
 				canCreateServices: data.canCreateServices,
 				canDeleteProjects: data.canDeleteProjects,
 				canDeleteServices: data.canDeleteServices,
-				canDeleteEnvironments: data.canDeleteEnvironments || false,
 				canAccessToTraefikFiles: data.canAccessToTraefikFiles,
 				canAccessToDocker: data.canAccessToDocker,
 				canAccessToAPI: data.canAccessToAPI,
 				canAccessToSSHKeys: data.canAccessToSSHKeys,
 				canAccessToGitProviders: data.canAccessToGitProviders,
-				canCreateEnvironments: data.canCreateEnvironments,
 			});
 		}
-	}, [form, form.reset, data, isOpen]);
+	}, [form, form.formState.isSubmitSuccessful, form.reset, data]);
 
 	const onSubmit = async (data: AddPermissions) => {
 		await mutateAsync({
@@ -240,7 +223,6 @@ export const AddUserPermissions = ({ userId }: Props) => {
 			canCreateProjects: data.canCreateProjects,
 			canDeleteServices: data.canDeleteServices,
 			canDeleteProjects: data.canDeleteProjects,
-			canDeleteEnvironments: data.canDeleteEnvironments,
 			canAccessToTraefikFiles: data.canAccessToTraefikFiles,
 			accessedProjects: data.accessedProjects || [],
 			accessedEnvironments: data.accessedEnvironments || [],
@@ -249,19 +231,17 @@ export const AddUserPermissions = ({ userId }: Props) => {
 			canAccessToAPI: data.canAccessToAPI,
 			canAccessToSSHKeys: data.canAccessToSSHKeys,
 			canAccessToGitProviders: data.canAccessToGitProviders,
-			canCreateEnvironments: data.canCreateEnvironments,
 		})
 			.then(async () => {
 				toast.success("Permissions updated");
 				refetch();
-				setIsOpen(false);
 			})
 			.catch(() => {
 				toast.error("Error updating the permissions");
 			});
 	};
 	return (
-		<Dialog open={isOpen} onOpenChange={setIsOpen}>
+		<Dialog>
 			<DialogTrigger className="" asChild>
 				<DropdownMenuItem
 					className="w-full cursor-pointer"
@@ -363,46 +343,6 @@ export const AddUserPermissions = ({ userId }: Props) => {
 								</FormItem>
 							)}
 						/>
-						<FormField
-							control={form.control}
-							name="canCreateEnvironments"
-							render={({ field }) => (
-								<FormItem className="flex flex-row items-center justify-between rounded-lg border p-3 shadow-sm">
-									<div className="space-y-0.5">
-										<FormLabel>Create Environments</FormLabel>
-										<FormDescription>
-											Allow the user to create environments
-										</FormDescription>
-									</div>
-									<FormControl>
-										<Switch
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-									</FormControl>
-								</FormItem>
-							)}
-						/>
-						<FormField
-							control={form.control}
-							name="canDeleteEnvironments"
-							render={({ field }) => (
-								<FormItem className="flex flex-row items-center justify-between rounded-lg border p-3 shadow-sm">
-									<div className="space-y-0.5">
-										<FormLabel>Delete Environments</FormLabel>
-										<FormDescription>
-											Allow the user to delete environments
-										</FormDescription>
-									</div>
-									<FormControl>
-										<Switch
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-									</FormControl>
-								</FormItem>
-							)}
-						/>
 						<FormField
 							control={form.control}
 							name="canAccessToTraefikFiles"

apps/dokploy/components/dashboard/settings/web-domain.tsx

@@ -5,7 +5,6 @@ import { useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
-import { AlertBlock } from "@/components/shared/alert-block";
 import { Button } from "@/components/ui/button";
 import {
 	Card,
@@ -77,9 +76,6 @@ export const WebDomain = () => {
 		resolver: zodResolver(addServerDomain),
 	});
 	const https = form.watch("https");
-	const domain = form.watch("domain") || "";
-	const host = data?.user?.host || "";
-	const hasChanged = domain !== host;
 	useEffect(() => {
 		if (data) {
 			form.reset({
@@ -123,19 +119,6 @@ export const WebDomain = () => {
 						</div>
 					</CardHeader>
 					<CardContent className="space-y-2 py-6 border-t">
-						{/* Warning for GitHub webhook URL changes */}
-						{hasChanged && (
-							<AlertBlock type="warning">
-								<div className="space-y-2">
-									<p className="font-medium">⚠️ Important: URL Change Impact</p>
-									<p>
-										If you change the Dokploy Server URL make sure to update
-										your Github Apps to keep the auto-deploy working and preview
-										deployments working.
-									</p>
-								</div>
-							</AlertBlock>
-						)}
 						<Form {...form}>
 							<form
 								onSubmit={form.handleSubmit(onSubmit)}

apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx

@@ -13,6 +13,7 @@ import {
 	DialogTitle,
 	DialogTrigger,
 } from "@/components/ui/dialog";
+import { Label } from "@/components/ui/label";
 import {
 	Select,
 	SelectContent,
@@ -39,26 +40,18 @@ interface Props {
 	appName: string;
 	children?: React.ReactNode;
 	serverId?: string;
-	appType?: "stack" | "docker-compose";
 }
 
-export const DockerTerminalModal = ({
-	children,
-	appName,
-	serverId,
-	appType,
-}: Props) => {
+export const DockerTerminalModal = ({ children, appName, serverId }: Props) => {
 	const { data, isLoading } = api.docker.getContainersByAppNameMatch.useQuery(
 		{
 			appName,
-			appType,
 			serverId,
 		},
 		{
 			enabled: !!appName,
 		},
 	);
-
 	const [containerId, setContainerId] = useState<string | undefined>();
 	const [mainDialogOpen, setMainDialogOpen] = useState(false);
 	const [confirmDialogOpen, setConfirmDialogOpen] = useState(false);
@@ -90,7 +83,7 @@ export const DockerTerminalModal = ({
 		<Dialog open={mainDialogOpen} onOpenChange={handleMainDialogOpenChange}>
 			<DialogTrigger asChild>{children}</DialogTrigger>
 			<DialogContent
-				className="max-h-[85vh] sm:max-w-7xl"
+				className="max-h-[85vh]    sm:max-w-7xl"
 				onEscapeKeyDown={(event) => event.preventDefault()}
 			>
 				<DialogHeader>
@@ -99,6 +92,7 @@ export const DockerTerminalModal = ({
 						Easy way to access to docker container
 					</DialogDescription>
 				</DialogHeader>
+				<Label>Select a container to view logs</Label>
 				<Select onValueChange={setContainerId} value={containerId}>
 					<SelectTrigger>
 						{isLoading ? (

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

@@ -88,121 +88,3 @@ export const DiscordIcon = ({ className }: Props) => {
 		</svg>
 	);
 };
-
-export const GotifyIcon = ({ className }: Props) => {
-	return (
-		<svg
-			viewBox="0 0 500 500"
-			className={cn("size-8", className)}
-			xmlns="http://www.w3.org/2000/svg"
-		>
-			<defs>
-				<style>
-					{`
-						.gotify-st0{fill:#DDCBA2;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
-						.gotify-st1{fill:#71CAEE;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
-						.gotify-st2{fill:#FFFFFF;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
-						.gotify-st3{fill:#888E93;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
-						.gotify-st4{fill:#F0F0F0;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
-						.gotify-st5{fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
-						.gotify-st8{fill:#FFFFFF;}
-					`}
-				</style>
-				<linearGradient
-					id="gotify-gradient"
-					x1="265"
-					y1="280"
-					x2="275"
-					y2="302"
-					gradientUnits="userSpaceOnUse"
-				>
-					<stop offset="0" stopColor="#71CAEE" />
-					<stop offset="0.04" stopColor="#83CAE2" />
-					<stop offset="0.12" stopColor="#9FCACE" />
-					<stop offset="0.21" stopColor="#B6CBBE" />
-					<stop offset="0.31" stopColor="#C7CBB1" />
-					<stop offset="0.44" stopColor="#D4CBA8" />
-					<stop offset="0.61" stopColor="#DBCBA3" />
-					<stop offset="1" stopColor="#DDCBA2" />
-				</linearGradient>
-			</defs>
-			<g transform="matrix(2.33,0,0,2.33,-432,-323)">
-				<g transform="translate(-25,26)">
-					<path
-						className="gotify-st1"
-						d="m258.9,119.7c-3,-0.9-6,-1.8-9,-2.7-4.6,-1.4-9.2,-2.8-14,-2.5-2.8,0.2-6.1,1.3-6.9,4-0.6,2-1.6,7.3-1.3,7.9 1.5,3.4 13.9,6.7 18.3,6.7"
-					/>
-					<path d="m392.6,177.9c-1.4,1.4-2.2,3.5-2.5,5.5-0.2,1.4-0.1,3 0.5,4.3 0.6,1.3 1.8,2.3 3.1,3 1.3,0.6 2.8,0.9 4.3,0.9 1.1,0 2.3,-0.1 3.1,-0.9 0.6,-0.7 0.8,-1.6 0.9,-2.5 0.2,-2.3-0.1,-4.7-0.9,-6.9-0.4,-1.1-0.9,-2.3-1.8,-3.1-1.7,-1.8-4.5,-2.2-6.4,-0.5-0.1,0-0.2,0.1-0.3,0.2z" />
-					<path
-						className="gotify-st2"
-						d="m358.5,164.2c-1,-1 0,-2.7 1,-3.7 5.8,-5.2 15.1,-4.6 21.8,-0.6 10.9,6.6 15.6,19.9 17.2,32.5 0.6,5.2 0.9,10.6-0.5,15.7-1.4,5.1-4.6,9.9-9.3,12.1-1.1,0.5-2.3,0.9-3.4,0.5-1.1,-0.4-1.9,-1.8-1.2,-2.8-9.4,-13.6-19,-26.8-20.9,-43.2-0.5,-4.1-1.8,-7.4-4.7,-10.5z"
-					/>
-					<path
-						className="gotify-st1"
-						d="m220.1,133c34.6,-18 79.3,-19.6 112.2,-8.7 23.7,7.9 41.3,26.7 49.5,50 7.1,20.6 7.1,43.6 3,65.7-7.5,40.2-26.2,77.9-49,112.6-12.6,19-24.6,36-44.2,48.5-38.7,24.6-88.9,22.1-129.3,11.5-19.5,-5.1-38.4,-17.3-44.3,-37.3-3.8,-12.8-2.1,-27.6 4.6,-40 13.5,-24.8 46.2,-38.4 50.8,-67.9 1.4,-8.7-0.3,-17.3-1.6,-25.7-3.8,-23.4-5.4,-45.8 6.7,-68.7 9.5,-17.7 24.3,-31 41.7,-40z"
-					/>
-					<path
-						className="gotify-st2"
-						d="m264.5,174.9c-0.5,0.5-0.9,1-1.3,1.6-9,11.6-12,27.9-9.3,42.1 1.7,9 5.9,17.9 13.2,23.4 19.3,14.6 51.5,13.5 68.4,-1.5 24.4,-21.7 13,-67.6-14,-78.8-17.6,-7.2-43.7,-1.6-57,13.2z"
-					/>
-					<path
-						className="gotify-st2"
-						d="m382.1,237.1c1.4,-0.1 2.9,-0.1 4.3,0.1 0.3,0 0.7,0.1 1,0.4 0.2,0.3 0.4,0.7 0.5,1.1 1,3.9 0.5,8.2 0.1,12.4-0.1,0.9-0.2,1.8-0.6,2.6-1,2.1-3.1,2.7-4.7,2.7-0.1,0-0.2,0-0.3,-0.1-0.3,-0.2-0.3,-0.7-0.2,-1.2 0.3,-5.9-0.1,-11.9-0.1,-18z"
-					/>
-					<path
-						className="gotify-st2"
-						d="m378.7,236.8c-1.4,0.4-2.5,2-2.8,4.4-0.5,4.4-0.7,8.9-0.5,13.4 0,0.9 0.1,1.9 0.5,2.4 0.2,0.3 0.5,0.4 0.8,0.4 1.6,0.3 4.1,-0.6 5.6,-1 0,0 0,-5.2-0.1,-8-0.1,-2.8-0.1,-6.1-0.2,-8.9 0,-0.6 0,-1.5 0,-2.2 0.1,-0.7-2.6,-0.7-3.3,-0.5z"
-					/>
-					<path
-						className="gotify-st0"
-						d="m358.3,231.8c-0.3,2.2 0.1,4.7 1.7,7.4 2.6,4.4 7,6.1 11.9,5.8 8.9,-0.6 25.3,-5.4 27.5,-15.7 0.6,-3-0.3,-6.1-2.2,-8.5-6.2,-7.8-17.8,-5.7-25.6,-2-5.9,2.7-12.4,7-13.3,13z"
-					/>
-					<path
-						className="gotify-st3"
-						d="m386.4,208.6c2.2,1.4 3.7,3.8 4,7 0.3,3.6-1.4,7.5-5,8.8-2.9,1.1-6.2,0.6-9.1,-0.4-2.9,-1-5.8,-2.8-6.8,-5.7-0.7,-2-0.3,-4.3 0.7,-6.1 1.1,-1.8 2.8,-3.2 4.7,-4.1 3.9,-1.8 8.4,-1.6 11.5,0.5z"
-					/>
-					<path
-						className="gotify-st0"
-						d="m414.7,262.6c2.4,0.6 4.8,2.1 5.6,4.4 0.8,2.3 0.1,4.9-1.6,6.7-1.7,1.8-4.2,2.5-6.6,2.5-0.8,0-1.7,-0.1-2.4,-0.5-2.5,-1.1-3.5,-4-4.2,-6.6-1.8,-6.8 3.6,-7.8 9.2,-6.5z"
-					/>
-					<path
-						className="gotify-st4"
-						d="m267.1,284.7c2.3,-4.5 141.3,-36.2 144.7,-31.6 3.4,4.5 15.8,88.2 9,90.4-6.8,2.3-119.8,37.3-126.6,35-6.8,-2.3-29.4,-89.3-27.1,-93.8z"
-					/>
-					<path
-						className="gotify-st5"
-						d="m294.2,378.5c0,0 54.3,-74.6 59.9,-76.9 5.7,-2.3 67.3,41.3 67.3,41.3"
-					/>
-					<path
-						className="gotify-st4"
-						d="m267,287.7c0,0 86,38.8 91.6,36.6 5.7,-2.3 53.1,-71.2 53.1,-71.2"
-					/>
-					<path
-						fill="url(#gotify-gradient)"
-						d="m261.9,283.5c-0.1,4.2 4.3,7.3 8.4,7.6 4.1,0.3 8.2,-1.3 12.2,-2.6 1.4,-0.4 2.9,-0.8 4.2,-0.2 1.8,0.9 2.7,4.1 1.8,5.9-0.9,1.8-3.4,3.5-5.3,4.4-6.5,3-12.9,3.6-19.9,2-5.3,-1.2-11.3,-4.3-13,-13.5"
-					/>
-					<path d="m318.4,198.4c-2,-0.3-4.1,0.1-5.9,1.3-3.2,2.1-4.7,6.2-4.7,9.9 0,1.9 0.4,3.8 1.4,5.3 1.2,1.7 3.1,2.9 5.2,3.4 3.4,0.8 8.2,0.7 10.5,-2.5 1,-1.5 1.4,-3.3 1.5,-5.1 0.5,-5.7-1.8,-11.4-8,-12.3z" />
-					<path
-						className="gotify-st8"
-						d="m320.4,203.3c0.9,0.3 1.7,0.8 2.1,1.7 0.4,0.8 0.4,1.7 0.3,2.5-0.1,1-0.6,2-1.5,2.7-0.7,0.5-1.7,0.7-2.6,0.5-0.9,-0.2-1.7,-0.8-2.2,-1.6-1.1,-1.6-0.9,-4.4 0.9,-5.5 0.9,-0.4 2,-0.6 3,-0.3z"
-					/>
-				</g>
-			</g>
-		</svg>
-	);
-};
-
-export const NtfyIcon = ({ className }: Props) => {
-	return (
-		<svg
-			viewBox="0 0 24 24"
-			className={cn("size-8", className)}
-			xmlns="http://www.w3.org/2000/svg"
-		>
-			<path
-				fill="currentColor"
-				d="M12.597 13.693v2.156h6.205v-2.156ZM5.183 6.549v2.363l3.591 1.901 0.023 0.01 -0.023 0.009 -3.591 1.901v2.35l0.386 -0.211 5.456 -2.969V9.729ZM3.659 2.037C1.915 2.037 0.42 3.41 0.42 5.154v0.002L0.438 18.73 0 21.963l5.956 -1.583h14.806c1.744 0 3.238 -1.374 3.238 -3.118V5.154c0 -1.744 -1.493 -3.116 -3.237 -3.117h-0.001zm0 2.2h17.104c0.613 0.001 1.037 0.447 1.037 0.917v12.108c0 0.47 -0.424 0.916 -1.038 0.916H5.633l-3.026 0.915 0.031 -0.179 -0.017 -13.76c0 -0.47 0.424 -0.917 1.038 -0.917z"
-			/>
-		</svg>
-	);
-};

apps/dokploy/components/shared/status-tooltip.tsx

@@ -7,14 +7,7 @@ import {
 import { cn } from "@/lib/utils";
 
 interface Props {
-	status:
-		| "running"
-		| "error"
-		| "done"
-		| "idle"
-		| "cancelled"
-		| undefined
-		| null;
+	status: "running" | "error" | "done" | "idle" | undefined | null;
 	className?: string;
 }
 
@@ -41,14 +34,6 @@ export const StatusTooltip = ({ status, className }: Props) => {
 							className={cn("size-3.5 rounded-full bg-green-500", className)}
 						/>
 					)}
-					{status === "cancelled" && (
-						<div
-							className={cn(
-								"size-3.5 rounded-full bg-muted-foreground",
-								className,
-							)}
-						/>
-					)}
 					{status === "running" && (
 						<div
 							className={cn("size-3.5 rounded-full bg-yellow-500", className)}
@@ -61,7 +46,6 @@ export const StatusTooltip = ({ status, className }: Props) => {
 						{status === "error" && "Error"}
 						{status === "done" && "Done"}
 						{status === "running" && "Running"}
-						{status === "cancelled" && "Cancelled"}
 					</span>
 				</TooltipContent>
 			</Tooltip>

apps/dokploy/drizzle/0111_mushy_wolfsbane.sql

@@ -1 +0,0 @@
-ALTER TABLE "bitbucket" ADD COLUMN "apiToken" text;

apps/dokploy/drizzle/0112_freezing_skrulls.sql

@@ -1 +0,0 @@
-ALTER TABLE "bitbucket" ADD COLUMN "bitbucketEmail" text;

apps/dokploy/drizzle/0113_complete_rafael_vega.sql

@@ -1 +0,0 @@
-ALTER TYPE "public"."deploymentStatus" ADD VALUE 'cancelled';

apps/dokploy/drizzle/0114_dry_black_tom.sql

@@ -1,6 +0,0 @@
-ALTER TABLE "application" ADD COLUMN "stopGracePeriodSwarm" bigint;--> statement-breakpoint
-ALTER TABLE "mariadb" ADD COLUMN "stopGracePeriodSwarm" bigint;--> statement-breakpoint
-ALTER TABLE "mongo" ADD COLUMN "stopGracePeriodSwarm" bigint;--> statement-breakpoint
-ALTER TABLE "mysql" ADD COLUMN "stopGracePeriodSwarm" bigint;--> statement-breakpoint
-ALTER TABLE "postgres" ADD COLUMN "stopGracePeriodSwarm" bigint;--> statement-breakpoint
-ALTER TABLE "redis" ADD COLUMN "stopGracePeriodSwarm" bigint;

apps/dokploy/drizzle/0115_serious_black_bird.sql

@@ -1 +0,0 @@
-ALTER TABLE "member" ADD COLUMN "canCreateEnvironments" boolean DEFAULT false NOT NULL;

apps/dokploy/drizzle/0116_amusing_firedrake.sql

@@ -1 +0,0 @@
-ALTER TABLE "member" ADD COLUMN "canDeleteEnvironments" boolean DEFAULT false NOT NULL;

apps/dokploy/drizzle/meta/_journal.json

@@ -778,48 +778,6 @@
       "when": 1757189541734,
       "tag": "0110_red_psynapse",
       "breakpoints": true
-    },
-    {
-      "idx": 111,
-      "version": "7",
-      "when": 1758445844561,
-      "tag": "0111_mushy_wolfsbane",
-      "breakpoints": true
-    },
-    {
-      "idx": 112,
-      "version": "7",
-      "when": 1758483520214,
-      "tag": "0112_freezing_skrulls",
-      "breakpoints": true
-    },
-    {
-      "idx": 113,
-      "version": "7",
-      "when": 1758960816504,
-      "tag": "0113_complete_rafael_vega",
-      "breakpoints": true
-    },
-    {
-      "idx": 114,
-      "version": "7",
-      "when": 1759643172958,
-      "tag": "0114_dry_black_tom",
-      "breakpoints": true
-    },
-    {
-      "idx": 115,
-      "version": "7",
-      "when": 1759644540829,
-      "tag": "0115_serious_black_bird",
-      "breakpoints": true
-    },
-    {
-      "idx": 116,
-      "version": "7",
-      "when": 1759645163834,
-      "tag": "0116_amusing_firedrake",
-      "breakpoints": true
     }
   ]
 }

apps/dokploy/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dokploy",
-	"version": "v0.25.5",
+	"version": "v0.25.1",
 	"private": true,
 	"license": "Apache-2.0",
 	"type": "module",
@@ -112,7 +112,7 @@
 		"i18next": "^23.16.8",
 		"input-otp": "^1.4.2",
 		"js-cookie": "^3.0.5",
-		"yaml": "2.8.1",
+		"js-yaml": "4.1.0",
 		"lodash": "4.17.21",
 		"lucide-react": "^0.469.0",
 		"micromatch": "4.0.8",
@@ -160,6 +160,7 @@
 		"@types/adm-zip": "^0.5.7",
 		"@types/bcrypt": "5.0.2",
 		"@types/js-cookie": "^3.0.6",
+		"@types/js-yaml": "4.0.9",
 		"@types/lodash": "4.17.4",
 		"@types/micromatch": "4.0.9",
 		"@types/node": "^18.19.104",
@@ -181,7 +182,8 @@
 		"tsx": "^4.16.2",
 		"typescript": "^5.8.3",
 		"vite-tsconfig-paths": "4.3.2",
-		"vitest": "^1.6.1"
+		"vitest": "^1.6.1",
+		"openapi-typescript": "7.8.0"
 	},
 	"ct3aMetadata": {
 		"initVersion": "7.25.2"

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

@@ -1,9 +1,4 @@
-import {
-	type Bitbucket,
-	getBitbucketHeaders,
-	IS_CLOUD,
-	shouldDeploy,
-} from "@dokploy/server";
+import { IS_CLOUD, shouldDeploy } from "@dokploy/server";
 import { eq } from "drizzle-orm";
 import type { NextApiRequest, NextApiResponse } from "next";
 import { db } from "@/server/db";
@@ -151,10 +146,10 @@ export default async function handler(
 
 			const commitedPaths = await extractCommitedPaths(
 				req.body,
-				application.bitbucket,
+				application.bitbucketOwner,
+				application.bitbucket?.appPassword || "",
 				application.bitbucketRepository || "",
 			);
-
 			const shouldDeployPaths = shouldDeploy(
 				application.watchPaths,
 				commitedPaths,
@@ -359,8 +354,9 @@ export const getProviderByHeader = (headers: any) => {
 
 export const extractCommitedPaths = async (
 	body: any,
-	bitbucket: Bitbucket | null,
-	repository: string,
+	bitbucketUsername: string | null,
+	bitbucketAppPassword: string | null,
+	repository: string | null,
 ) => {
 	const changes = body.push?.changes || [];
 
@@ -369,16 +365,18 @@ export const extractCommitedPaths = async (
 		.filter(Boolean);
 	const commitedPaths: string[] = [];
 	for (const commit of commitHashes) {
-		const url = `https://api.bitbucket.org/2.0/repositories/${bitbucket?.bitbucketUsername}/${repository}/diffstat/${commit}`;
+		const url = `https://api.bitbucket.org/2.0/repositories/${bitbucketUsername}/${repository}/diffstat/${commit}`;
 
 		try {
 			const response = await fetch(url, {
-				headers: getBitbucketHeaders(bitbucket!),
+				headers: {
+					Authorization: `Basic ${Buffer.from(`${bitbucketUsername}:${bitbucketAppPassword}`).toString("base64")}`,
+				},
 			});
 
 			const data = await response.json();
 			for (const value of data.values) {
-				if (value?.new?.path) commitedPaths.push(value.new.path);
+				commitedPaths.push(value.new?.path);
 			}
 		} catch (error) {
 			console.error(

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

@@ -99,7 +99,8 @@ export default async function handler(
 
 			const commitedPaths = await extractCommitedPaths(
 				req.body,
-				composeResult.bitbucket,
+				composeResult.bitbucketOwner,
+				composeResult.bitbucket?.appPassword || "",
 				composeResult.bitbucketRepository || "",
 			);
 

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

@@ -226,7 +226,6 @@ const Service = (
 											<TabsTrigger value="general">General</TabsTrigger>
 											<TabsTrigger value="environment">Environment</TabsTrigger>
 											<TabsTrigger value="domains">Domains</TabsTrigger>
-											<TabsTrigger value="deployments">Deployments</TabsTrigger>
 											<TabsTrigger value="preview-deployments">
 												Preview Deployments
 											</TabsTrigger>
@@ -234,6 +233,7 @@ const Service = (
 											<TabsTrigger value="volume-backups">
 												Volume Backups
 											</TabsTrigger>
+											<TabsTrigger value="deployments">Deployments</TabsTrigger>
 											<TabsTrigger value="logs">Logs</TabsTrigger>
 											{((data?.serverId && isCloud) || !data?.server) && (
 												<TabsTrigger value="monitoring">Monitoring</TabsTrigger>

apps/dokploy/server/api/root.ts

@@ -16,6 +16,8 @@ import { gitProviderRouter } from "./routers/git-provider";
 import { giteaRouter } from "./routers/gitea";
 import { githubRouter } from "./routers/github";
 import { gitlabRouter } from "./routers/gitlab";
+import { hetznerRouter } from "./routers/hetzner";
+import { hostingerRouter } from "./routers/hostinger";
 import { mariadbRouter } from "./routers/mariadb";
 import { mongoRouter } from "./routers/mongo";
 import { mountRouter } from "./routers/mount";
@@ -85,6 +87,8 @@ export const appRouter = createTRPCRouter({
 	schedule: scheduleRouter,
 	rollback: rollbackRouter,
 	volumeBackups: volumeBackupsRouter,
+	hetzner: hetznerRouter,
+	hostinger: hostingerRouter,
 	environment: environmentRouter,
 });
 

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

@@ -524,7 +524,7 @@ export const applicationRouter = createTRPCRouter({
 
 			return true;
 		}),
-	saveGitProvider: protectedProcedure
+	saveGitProdiver: protectedProcedure
 		.input(apiSaveGitProvider)
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);

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

@@ -7,7 +7,7 @@ import {
 } from "@dokploy/server";
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
-import { getLocalServerIp } from "@/server/wss/terminal";
+import { getPublicIpWithFallback } from "@/server/wss/terminal";
 import { createTRPCRouter, protectedProcedure } from "../trpc";
 export const clusterRouter = createTRPCRouter({
 	getNodes: protectedProcedure
@@ -61,7 +61,7 @@ export const clusterRouter = createTRPCRouter({
 			const result = await docker.swarmInspect();
 			const docker_version = await docker.version();
 
-			let ip = await getLocalServerIp();
+			let ip = await getPublicIpWithFallback();
 			if (input.serverId) {
 				const server = await findServerById(input.serverId);
 				ip = server?.ipAddress;
@@ -85,7 +85,7 @@ export const clusterRouter = createTRPCRouter({
 			const result = await docker.swarmInspect();
 			const docker_version = await docker.version();
 
-			let ip = await getLocalServerIp();
+			let ip = await getPublicIpWithFallback();
 			if (input.serverId) {
 				const server = await findServerById(input.serverId);
 				ip = server?.ipAddress;

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

@@ -39,10 +39,10 @@ import {
 import { processTemplate } from "@dokploy/server/templates/processors";
 import { TRPCError } from "@trpc/server";
 import { eq } from "drizzle-orm";
+import { dump } from "js-yaml";
 import _ from "lodash";
 import { nanoid } from "nanoid";
 import { parse } from "toml";
-import { stringify } from "yaml";
 import { z } from "zod";
 import { slugify } from "@/lib/slug";
 import { db } from "@/server/db";
@@ -364,7 +364,7 @@ export const composeRouter = createTRPCRouter({
 			}
 			const domains = await findDomainsByComposeId(input.composeId);
 			const composeFile = await addDomainToCompose(compose, domains);
-			return stringify(composeFile, {
+			return dump(composeFile, {
 				lineWidth: 1000,
 			});
 		}),

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

@@ -1,8 +1,6 @@
 import {
 	addNewEnvironment,
 	checkEnvironmentAccess,
-	checkEnvironmentCreationPermission,
-	checkEnvironmentDeletionPermission,
 	createEnvironment,
 	deleteEnvironment,
 	duplicateEnvironment,
@@ -56,12 +54,9 @@ export const environmentRouter = createTRPCRouter({
 		.input(apiCreateEnvironment)
 		.mutation(async ({ input, ctx }) => {
 			try {
-				// Check if user has permission to create environments
-				await checkEnvironmentCreationPermission(
-					ctx.user.id,
-					input.projectId,
-					ctx.session.activeOrganizationId,
-				);
+				// Check if user has access to the project
+				// This would typically involve checking project ownership/membership
+				// For now, we'll use a basic organization check
 
 				if (input.name === "production") {
 					throw new TRPCError({
@@ -81,9 +76,6 @@ export const environmentRouter = createTRPCRouter({
 				}
 				return environment;
 			} catch (error) {
-				if (error instanceof TRPCError) {
-					throw error;
-				}
 				throw new TRPCError({
 					code: "BAD_REQUEST",
 					message: `Error creating the environment: ${error instanceof Error ? error.message : error}`,
@@ -195,6 +187,14 @@ export const environmentRouter = createTRPCRouter({
 		.input(apiRemoveEnvironment)
 		.mutation(async ({ input, ctx }) => {
 			try {
+				if (ctx.user.role === "member") {
+					await checkEnvironmentAccess(
+						ctx.user.id,
+						input.environmentId,
+						ctx.session.activeOrganizationId,
+						"access",
+					);
+				}
 				const environment = await findEnvironmentById(input.environmentId);
 				if (
 					environment.project.organizationId !==
@@ -206,33 +206,27 @@ export const environmentRouter = createTRPCRouter({
 					});
 				}
 
-				// Check environment deletion permission
-				await checkEnvironmentDeletionPermission(
-					ctx.user.id,
-					environment.projectId,
-					ctx.session.activeOrganizationId,
-				);
-
-				// Additional check for environment access for members
+				// Check environment access for members
 				if (ctx.user.role === "member") {
-					await checkEnvironmentAccess(
+					const { accessedEnvironments } = await findMemberById(
 						ctx.user.id,
-						input.environmentId,
 						ctx.session.activeOrganizationId,
-						"access",
 					);
+
+					if (!accessedEnvironments.includes(environment.environmentId)) {
+						throw new TRPCError({
+							code: "FORBIDDEN",
+							message: "You are not allowed to delete this environment",
+						});
+					}
 				}
 
 				const deletedEnvironment = await deleteEnvironment(input.environmentId);
 				return deletedEnvironment;
 			} catch (error) {
-				if (error instanceof TRPCError) {
-					throw error;
-				}
 				throw new TRPCError({
 					code: "BAD_REQUEST",
 					message: `Error deleting the environment: ${error instanceof Error ? error.message : error}`,
-					cause: error,
 				});
 			}
 		}),

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

@@ -3,7 +3,6 @@ import {
 	getGithubBranches,
 	getGithubRepositories,
 	haveGithubRequirements,
-	updateGithub,
 	updateGitProvider,
 } from "@dokploy/server";
 import { TRPCError } from "@trpc/server";
@@ -135,9 +134,5 @@ export const githubRouter = createTRPCRouter({
 				name: input.name,
 				organizationId: ctx.session.activeOrganizationId,
 			});
-
-			await updateGithub(input.githubId, {
-				...input,
-			});
 		}),
 });

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

@@ -0,0 +1,21 @@
+import {
+	fetchHetznerLocations,
+	fetchHetznerServers,
+	fetchHetznerServerTypes,
+} from "@dokploy/server/index";
+import { createTRPCRouter, protectedProcedure } from "../trpc";
+
+export const hetznerRouter = createTRPCRouter({
+	locations: protectedProcedure.query(async () => {
+		const locations = await fetchHetznerLocations();
+		return locations;
+	}),
+
+	serverTypes: protectedProcedure.query(async () => {
+		return await fetchHetznerServerTypes();
+	}),
+
+	servers: protectedProcedure.query(async () => {
+		return await fetchHetznerServers();
+	}),
+});

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

@@ -0,0 +1,16 @@
+import {
+	fetchHostingerCatalog,
+	fetchHostingerDataCenters,
+} from "@dokploy/server/index";
+import { createTRPCRouter, protectedProcedure } from "../trpc";
+
+export const hostingerRouter = createTRPCRouter({
+	vpsPlans: protectedProcedure.query(async () => {
+		const catalogItems = await fetchHostingerCatalog();
+		return catalogItems.filter((item) => item?.name?.startsWith("KVM"));
+	}),
+
+	dataCenters: protectedProcedure.query(async () => {
+		return await fetchHostingerDataCenters();
+	}),
+});

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

@@ -1,5 +1,4 @@
 import {
-	addNewEnvironment,
 	addNewProject,
 	checkProjectAccess,
 	createApplication,
@@ -86,12 +85,6 @@ export const projectRouter = createTRPCRouter({
 						project.project.projectId,
 						ctx.session.activeOrganizationId,
 					);
-
-					await addNewEnvironment(
-						ctx.user.id,
-						project?.environment?.environmentId || "",
-						ctx.session.activeOrganizationId,
-					);
 				}
 
 				return project;

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

@@ -46,8 +46,8 @@ import {
 import { generateOpenApiDocument } from "@dokploy/trpc-openapi";
 import { TRPCError } from "@trpc/server";
 import { eq, sql } from "drizzle-orm";
+import { dump, load } from "js-yaml";
 import { scheduledJobs, scheduleJob } from "node-schedule";
-import { parse, stringify } from "yaml";
 import { z } from "zod";
 import { db } from "@/server/db";
 import {
@@ -657,7 +657,7 @@ export const settingsRouter = createTRPCRouter({
 		const config = readMainConfig();
 
 		if (!config) return false;
-		const parsedConfig = parse(config) as {
+		const parsedConfig = load(config) as {
 			accessLog?: {
 				filePath: string;
 			};
@@ -678,7 +678,7 @@ export const settingsRouter = createTRPCRouter({
 			const mainConfig = readMainConfig();
 			if (!mainConfig) return false;
 
-			const currentConfig = parse(mainConfig) as {
+			const currentConfig = load(mainConfig) as {
 				accessLog?: {
 					filePath: string;
 				};
@@ -701,7 +701,7 @@ export const settingsRouter = createTRPCRouter({
 				currentConfig.accessLog = undefined;
 			}
 
-			writeMainConfig(stringify(currentConfig));
+			writeMainConfig(dump(currentConfig));
 
 			return true;
 		}),

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

@@ -192,16 +192,7 @@ export const userRouter = createTRPCRouter({
 					})
 					.where(eq(account.userId, ctx.user.id));
 			}
-
-			try {
-				return await updateUser(ctx.user.id, input);
-			} catch (error) {
-				throw new TRPCError({
-					code: "BAD_REQUEST",
-					message:
-						error instanceof Error ? error.message : "Failed to update user",
-				});
-			}
+			return await updateUser(ctx.user.id, input);
 		}),
 	getUserByToken: publicProcedure
 		.input(apiFindOneToken)

apps/dokploy/server/server.ts

@@ -8,7 +8,6 @@ import {
 	initializeNetwork,
 	initSchedules,
 	initVolumeBackupsCronJobs,
-	initCancelDeployments,
 	sendDokployRestartNotifications,
 	setupDirectories,
 } from "@dokploy/server";
@@ -53,7 +52,6 @@ void app.prepare().then(async () => {
 			await migration();
 			await initCronJobs();
 			await initSchedules();
-			await initCancelDeployments();
 			await initVolumeBackupsCronJobs();
 			await sendDokployRestartNotifications();
 		}

apps/dokploy/server/wss/terminal.ts

@@ -1,10 +1,5 @@
 import type http from "node:http";
-import {
-	execAsync,
-	findServerById,
-	IS_CLOUD,
-	validateRequest,
-} from "@dokploy/server";
+import { findServerById, IS_CLOUD, validateRequest } from "@dokploy/server";
 import { publicIpv4, publicIpv6 } from "public-ip";
 import { Client, type ConnectConfig } from "ssh2";
 import { WebSocketServer } from "ws";
@@ -49,21 +44,6 @@ export const getPublicIpWithFallback = async () => {
 	return ip;
 };
 
-export const getLocalServerIp = async () => {
-	try {
-		const command = `ip addr show | grep -E "inet (192\.168\.|10\.|172\.1[6-9]\.|172\.2[0-9]\.|172\.3[0-1]\.)" | head -n1 | awk '{print $2}' | cut -d/ -f1`;
-		const { stdout } = await execAsync(command);
-		const ip = stdout.trim();
-		return (
-			ip ||
-			"We were unable to obtain the local server IP, please use your private IP address"
-		);
-	} catch (error) {
-		console.error("Error to obtain local server IP", error);
-		return "We were unable to obtain the local server IP, please use your private IP address";
-	}
-};
-
 export const setupTerminalWebSocketServer = (
 	server: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>,
 ) => {

apps/dokploy/setup.ts

@@ -1,4 +1,3 @@
-import { exit } from "node:process";
 import { execAsync } from "@dokploy/server";
 import { setupDirectories } from "@dokploy/server/setup/config-paths";
 import { initializePostgres } from "@dokploy/server/setup/postgres-setup";
@@ -26,8 +25,6 @@ import {
 		await initializeStandaloneTraefik();
 		await initializeRedis();
 		await initializePostgres();
-		console.log("Dokploy setup completed");
-		exit(0);
 	} catch (e) {
 		console.error("Error in dokploy setup", e);
 	}

apps/schedules/src/index.ts

@@ -11,7 +11,7 @@ import {
 } from "./queue.js";
 import { jobQueueSchema } from "./schema.js";
 import { initializeJobs } from "./utils.js";
-import { firstWorker, secondWorker, thirdWorker } from "./workers.js";
+import { firstWorker, secondWorker } from "./workers.js";
 
 const app = new Hono();
 
@@ -91,7 +91,6 @@ export const gracefulShutdown = async (signal: string) => {
 	logger.warn(`Received ${signal}, closing server...`);
 	await firstWorker.close();
 	await secondWorker.close();
-	await thirdWorker.close();
 	process.exit(0);
 };
 

apps/schedules/src/workers.ts

@@ -7,34 +7,22 @@ import { runJobs } from "./utils.js";
 export const firstWorker = new Worker(
 	"backupQueue",
 	async (job: Job<QueueJob>) => {
-		logger.info({ data: job.data }, "Running job first worker");
+		logger.info({ data: job.data }, "Running job");
 		await runJobs(job.data);
 	},
 	{
-		concurrency: 100,
+		concurrency: 50,
 		connection,
 	},
 );
 export const secondWorker = new Worker(
 	"backupQueue",
 	async (job: Job<QueueJob>) => {
-		logger.info({ data: job.data }, "Running job second worker");
+		logger.info({ data: job.data }, "Running job");
 		await runJobs(job.data);
 	},
 	{
-		concurrency: 100,
-		connection,
-	},
-);
-
-export const thirdWorker = new Worker(
-	"backupQueue",
-	async (job: Job<QueueJob>) => {
-		logger.info({ data: job.data }, "Running job third worker");
-		await runJobs(job.data);
-	},
-	{
-		concurrency: 100,
+		concurrency: 50,
 		connection,
 	},
 );

packages/server/package.json

@@ -28,6 +28,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
+    "openapi-fetch": "0.14.0",
     "@ai-sdk/anthropic": "^2.0.5",
     "@ai-sdk/azure": "^2.0.16",
     "@ai-sdk/cohere": "^2.0.4",
@@ -57,7 +58,7 @@
     "drizzle-orm": "^0.39.3",
     "drizzle-zod": "0.5.1",
     "hi-base32": "^0.5.1",
-    "yaml": "2.8.1",
+    "js-yaml": "4.1.0",
     "lodash": "4.17.21",
     "micromatch": "4.0.8",
     "nanoid": "3.3.11",
@@ -85,6 +86,7 @@
     "@types/adm-zip": "^0.5.7",
     "@types/bcrypt": "5.0.2",
     "@types/dockerode": "3.3.23",
+    "@types/js-yaml": "4.0.9",
     "@types/lodash": "4.17.4",
     "@types/micromatch": "4.0.9",
     "@types/node": "^18.19.104",

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

@@ -108,12 +108,6 @@ export const member = pgTable("member", {
 	canAccessToTraefikFiles: boolean("canAccessToTraefikFiles")
 		.notNull()
 		.default(false),
-	canDeleteEnvironments: boolean("canDeleteEnvironments")
-		.notNull()
-		.default(false),
-	canCreateEnvironments: boolean("canCreateEnvironments")
-		.notNull()
-		.default(false),
 	accessedProjects: text("accesedProjects")
 		.array()
 		.notNull()

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

@@ -1,6 +1,5 @@
 import { relations } from "drizzle-orm";
 import {
-	bigint,
 	boolean,
 	integer,
 	json,
@@ -21,6 +20,7 @@ import { gitlab } from "./gitlab";
 import { mounts } from "./mount";
 import { ports } from "./port";
 import { previewDeployments } from "./preview-deployments";
+import { projects } from "./project";
 import { redirects } from "./redirects";
 import { registry } from "./registry";
 import { security } from "./security";
@@ -164,7 +164,6 @@ export const applications = pgTable("application", {
 	modeSwarm: json("modeSwarm").$type<ServiceModeSwarm>(),
 	labelsSwarm: json("labelsSwarm").$type<LabelsSwarm>(),
 	networkSwarm: json("networkSwarm").$type<NetworkSwarm[]>(),
-	stopGracePeriodSwarm: bigint("stopGracePeriodSwarm", { mode: "bigint" }),
 	//
 	replicas: integer("replicas").default(1).notNull(),
 	applicationStatus: applicationStatus("applicationStatus")
@@ -313,7 +312,6 @@ const createSchema = createInsertSchema(applications, {
 	watchPaths: z.array(z.string()).optional(),
 	previewLabels: z.array(z.string()).optional(),
 	cleanCache: z.boolean().optional(),
-	stopGracePeriodSwarm: z.bigint().nullable(),
 });
 
 export const apiCreateApplication = createSchema.pick({

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

@@ -11,9 +11,7 @@ export const bitbucket = pgTable("bitbucket", {
 		.primaryKey()
 		.$defaultFn(() => nanoid()),
 	bitbucketUsername: text("bitbucketUsername"),
-	bitbucketEmail: text("bitbucketEmail"),
 	appPassword: text("appPassword"),
-	apiToken: text("apiToken"),
 	bitbucketWorkspaceName: text("bitbucketWorkspaceName"),
 	gitProviderId: text("gitProviderId")
 		.notNull()
@@ -31,9 +29,7 @@ const createSchema = createInsertSchema(bitbucket);
 
 export const apiCreateBitbucket = createSchema.extend({
 	bitbucketUsername: z.string().optional(),
-	bitbucketEmail: z.string().email().optional(),
 	appPassword: z.string().optional(),
-	apiToken: z.string().optional(),
 	bitbucketWorkspaceName: z.string().optional(),
 	gitProviderId: z.string().optional(),
 	authId: z.string().min(1),
@@ -50,19 +46,9 @@ export const apiBitbucketTestConnection = createSchema
 	.extend({
 		bitbucketId: z.string().min(1),
 		bitbucketUsername: z.string().optional(),
-		bitbucketEmail: z.string().email().optional(),
 		workspaceName: z.string().optional(),
-		apiToken: z.string().optional(),
-		appPassword: z.string().optional(),
 	})
-	.pick({
-		bitbucketId: true,
-		bitbucketUsername: true,
-		bitbucketEmail: true,
-		workspaceName: true,
-		apiToken: true,
-		appPassword: true,
-	});
+	.pick({ bitbucketId: true, bitbucketUsername: true, workspaceName: true });
 
 export const apiFindBitbucketBranches = z.object({
 	owner: z.string(),
@@ -74,9 +60,6 @@ export const apiUpdateBitbucket = createSchema.extend({
 	bitbucketId: z.string().min(1),
 	name: z.string().min(1),
 	bitbucketUsername: z.string().optional(),
-	bitbucketEmail: z.string().email().optional(),
-	appPassword: z.string().optional(),
-	apiToken: z.string().optional(),
 	bitbucketWorkspaceName: z.string().optional(),
 	organizationId: z.string().optional(),
 });

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

@@ -21,7 +21,6 @@ export const deploymentStatus = pgEnum("deploymentStatus", [
 	"running",
 	"done",
 	"error",
-	"cancelled",
 ]);
 
 export const deployments = pgTable("deployment", {

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

@@ -58,5 +58,4 @@ export const apiUpdateGithub = createSchema.extend({
 	githubId: z.string().min(1),
 	name: z.string().min(1),
 	gitProviderId: z.string().min(1),
-	githubAppName: z.string().min(1),
 });

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

@@ -1,5 +1,5 @@
 import { relations } from "drizzle-orm";
-import { bigint, integer, json, pgTable, text } from "drizzle-orm/pg-core";
+import { integer, json, pgTable, text } from "drizzle-orm/pg-core";
 import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
@@ -62,7 +62,6 @@ export const mariadb = pgTable("mariadb", {
 	modeSwarm: json("modeSwarm").$type<ServiceModeSwarm>(),
 	labelsSwarm: json("labelsSwarm").$type<LabelsSwarm>(),
 	networkSwarm: json("networkSwarm").$type<NetworkSwarm[]>(),
-	stopGracePeriodSwarm: bigint("stopGracePeriodSwarm", { mode: "bigint" }),
 	replicas: integer("replicas").default(1).notNull(),
 	createdAt: text("createdAt")
 		.notNull()
@@ -129,7 +128,6 @@ const createSchema = createInsertSchema(mariadb, {
 	modeSwarm: ServiceModeSwarmSchema.nullable(),
 	labelsSwarm: LabelsSwarmSchema.nullable(),
 	networkSwarm: NetworkSwarmSchema.nullable(),
-	stopGracePeriodSwarm: z.bigint().nullable(),
 });
 
 export const apiCreateMariaDB = createSchema

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

@@ -1,12 +1,5 @@
 import { relations } from "drizzle-orm";
-import {
-	bigint,
-	boolean,
-	integer,
-	json,
-	pgTable,
-	text,
-} from "drizzle-orm/pg-core";
+import { boolean, integer, json, pgTable, text } from "drizzle-orm/pg-core";
 import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
@@ -65,7 +58,6 @@ export const mongo = pgTable("mongo", {
 	modeSwarm: json("modeSwarm").$type<ServiceModeSwarm>(),
 	labelsSwarm: json("labelsSwarm").$type<LabelsSwarm>(),
 	networkSwarm: json("networkSwarm").$type<NetworkSwarm[]>(),
-	stopGracePeriodSwarm: bigint("stopGracePeriodSwarm", { mode: "bigint" }),
 	replicas: integer("replicas").default(1).notNull(),
 	createdAt: text("createdAt")
 		.notNull()
@@ -126,7 +118,6 @@ const createSchema = createInsertSchema(mongo, {
 	modeSwarm: ServiceModeSwarmSchema.nullable(),
 	labelsSwarm: LabelsSwarmSchema.nullable(),
 	networkSwarm: NetworkSwarmSchema.nullable(),
-	stopGracePeriodSwarm: z.bigint().nullable(),
 });
 
 export const apiCreateMongo = createSchema

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

@@ -1,5 +1,5 @@
 import { relations } from "drizzle-orm";
-import { bigint, integer, json, pgTable, text } from "drizzle-orm/pg-core";
+import { integer, json, pgTable, text } from "drizzle-orm/pg-core";
 import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
@@ -60,7 +60,6 @@ export const mysql = pgTable("mysql", {
 	modeSwarm: json("modeSwarm").$type<ServiceModeSwarm>(),
 	labelsSwarm: json("labelsSwarm").$type<LabelsSwarm>(),
 	networkSwarm: json("networkSwarm").$type<NetworkSwarm[]>(),
-	stopGracePeriodSwarm: bigint("stopGracePeriodSwarm", { mode: "bigint" }),
 	replicas: integer("replicas").default(1).notNull(),
 	createdAt: text("createdAt")
 		.notNull()
@@ -126,7 +125,6 @@ const createSchema = createInsertSchema(mysql, {
 	modeSwarm: ServiceModeSwarmSchema.nullable(),
 	labelsSwarm: LabelsSwarmSchema.nullable(),
 	networkSwarm: NetworkSwarmSchema.nullable(),
-	stopGracePeriodSwarm: z.bigint().nullable(),
 });
 
 export const apiCreateMySql = createSchema

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

@@ -1,5 +1,5 @@
 import { relations } from "drizzle-orm";
-import { bigint, integer, json, pgTable, text } from "drizzle-orm/pg-core";
+import { integer, json, pgTable, text } from "drizzle-orm/pg-core";
 import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
@@ -60,7 +60,6 @@ export const postgres = pgTable("postgres", {
 	modeSwarm: json("modeSwarm").$type<ServiceModeSwarm>(),
 	labelsSwarm: json("labelsSwarm").$type<LabelsSwarm>(),
 	networkSwarm: json("networkSwarm").$type<NetworkSwarm[]>(),
-	stopGracePeriodSwarm: bigint("stopGracePeriodSwarm", { mode: "bigint" }),
 	replicas: integer("replicas").default(1).notNull(),
 	createdAt: text("createdAt")
 		.notNull()
@@ -119,7 +118,6 @@ const createSchema = createInsertSchema(postgres, {
 	modeSwarm: ServiceModeSwarmSchema.nullable(),
 	labelsSwarm: LabelsSwarmSchema.nullable(),
 	networkSwarm: NetworkSwarmSchema.nullable(),
-	stopGracePeriodSwarm: z.bigint().nullable(),
 });
 
 export const apiCreatePostgres = createSchema