-
- -
-
-
-### [Tuple, the premier screen sharing app for developers](https://tuple.app/dokploy)
-[Available for MacOS & Windows](https://tuple.app/dokploy)- -
-
-
-### [Tuple, the premier screen sharing app for developers](https://tuple.app/dokploy)
-[Available for MacOS & Windows](https://tuple.app/dokploy)
| 🎖 Hero Sponsor |
-| [LX Aer](https://www.lxaer.com/?ref=dokploy) | 
| 🎖 Hero Sponsor |
-| [LinkDR](https://linkdr.com/?ref=dokploy) | 
| 🎖 Hero Sponsor |
-| [LambdaTest](https://www.lambdatest.com/?utm_source=dokploy&utm_medium=sponsor) | 
| 🎖 Hero Sponsor |
-| [Awesome Tools](https://awesome.tools/) | 
| 🎖 Hero Sponsor |
-| [Supafort](https://supafort.com/?ref=dokploy) | 
| 🥇 Premium Supporter |
-| [Agentdock](https://agentdock.ai/?ref=dokploy) | 
| 🥇 Premium Supporter |
-| [AmericanCloud](https://americancloud.com/?ref=dokploy) | 
| 🥈 Elite Contributor |
-| [Tolgee](https://tolgee.io/?utm_source=github_dokploy&utm_medium=banner&utm_campaign=dokploy) | 
| 🥈 Elite Contributor |
-| [Cloudblast](https://cloudblast.io/?ref=dokploy) | 
| 🥉 Supporting Member |
-| [Synexa](https://synexa.ai/?ref=dokploy) | 
| 🥉 Supporting Member |
-
-### Community Backers 🤝
-
-#### Organizations:
-
-[Sponsors on Open Collective](https://opencollective.com/dokploy)
-
-#### Individuals:
-
-[](https://opencollective.com/dokploy)
-
### Contributors 🤝
diff --git a/apps/api/package.json b/apps/api/package.json
index 0f4b1044f..71d948076 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -14,16 +14,16 @@
"@hono/node-server": "^1.14.3",
"@hono/zod-validator": "0.3.0",
"dotenv": "^16.4.5",
- "hono": "^4.7.10",
+ "hono": "^4.11.7",
"pino": "9.4.0",
"pino-pretty": "11.2.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"redis": "4.7.0",
- "zod": "^3.25.32"
+ "zod": "^3.25.76"
},
"devDependencies": {
- "@types/node": "^20.17.51",
+ "@types/node": "^20.16.0",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"tsx": "^4.16.2",
diff --git a/apps/dokploy/.env.production.example b/apps/dokploy/.env.production.example
index 41e934c3a..560faf9e6 100644
--- a/apps/dokploy/.env.production.example
+++ b/apps/dokploy/.env.production.example
@@ -1,3 +1,2 @@
-DATABASE_URL="postgres://dokploy:amukds4wi9001583845717ad2@dokploy-postgres:5432/dokploy"
PORT=3000
NODE_ENV=production
\ No newline at end of file
diff --git a/apps/dokploy/__test__/compose/domain/network-service.test.ts b/apps/dokploy/__test__/compose/domain/network-service.test.ts
index b8d03c751..83fe8a166 100644
--- a/apps/dokploy/__test__/compose/domain/network-service.test.ts
+++ b/apps/dokploy/__test__/compose/domain/network-service.test.ts
@@ -4,21 +4,30 @@ import { describe, expect, it } from "vitest";
describe("addDokployNetworkToService", () => {
it("should add network to an empty array", () => {
const result = addDokployNetworkToService([]);
- expect(result).toEqual(["dokploy-network"]);
+ expect(result).toEqual(["dokploy-network", "default"]);
});
it("should not add duplicate network to an array", () => {
const result = addDokployNetworkToService(["dokploy-network"]);
- expect(result).toEqual(["dokploy-network"]);
+ expect(result).toEqual(["dokploy-network", "default"]);
});
it("should add network to an existing array with other networks", () => {
const result = addDokployNetworkToService(["other-network"]);
- expect(result).toEqual(["other-network", "dokploy-network"]);
+ expect(result).toEqual(["other-network", "dokploy-network", "default"]);
});
it("should add network to an object if networks is an object", () => {
const result = addDokployNetworkToService({ "other-network": {} });
- expect(result).toEqual({ "other-network": {}, "dokploy-network": {} });
+ expect(result).toEqual({
+ "other-network": {},
+ "dokploy-network": {},
+ default: {},
+ });
+ });
+
+ it("should not duplicate default network when already present", () => {
+ const result = addDokployNetworkToService(["default", "dokploy-network"]);
+ expect(result).toEqual(["default", "dokploy-network"]);
});
});
diff --git a/apps/dokploy/__test__/deploy/github.test.ts b/apps/dokploy/__test__/deploy/github.test.ts
index 46be44883..d2e773dfc 100644
--- a/apps/dokploy/__test__/deploy/github.test.ts
+++ b/apps/dokploy/__test__/deploy/github.test.ts
@@ -83,6 +83,14 @@ describe("GitHub Webhook Skip CI", () => {
{ commits: [{ message: "[skip ci] test" }] },
),
).toBe("[skip ci] test");
+
+ // Soft Serve
+ expect(
+ extractCommitMessage(
+ { "x-softserve-event": "push" },
+ { commits: [{ message: "[skip ci] test" }] },
+ ),
+ ).toBe("[skip ci] test");
});
it("should handle missing commit message", () => {
@@ -99,6 +107,9 @@ describe("GitHub Webhook Skip CI", () => {
expect(extractCommitMessage({ "x-gitea-event": "push" }, {})).toBe(
"NEW COMMIT",
);
+ expect(extractCommitMessage({ "x-softserve-event": "push" }, {})).toBe(
+ "NEW COMMIT",
+ );
});
});
diff --git a/apps/dokploy/__test__/deploy/soft-serve.test.ts b/apps/dokploy/__test__/deploy/soft-serve.test.ts
new file mode 100644
index 000000000..609f15dee
--- /dev/null
+++ b/apps/dokploy/__test__/deploy/soft-serve.test.ts
@@ -0,0 +1,49 @@
+import { describe, expect, it } from "vitest";
+import {
+ extractBranchName,
+ extractCommitMessage,
+ extractHash,
+ getProviderByHeader,
+} from "@/pages/api/deploy/[refreshToken]";
+
+describe("Soft Serve Webhook", () => {
+ const mockSoftServeHeaders = {
+ "x-softserve-event": "push",
+ };
+
+ const createMockBody = (message: string, hash: string, branch: string) => ({
+ event: "push",
+ ref: `refs/heads/${branch}`,
+ after: hash,
+ commits: [{ message: message }],
+ });
+ const message: string = "feat: add new feature";
+ const hash: string = "3c91c24ef9560bddc695bce138bf8a7094ec3df5";
+ const branch: string = "feat/add-new";
+ const goodWebhook = createMockBody(message, hash, branch);
+
+ it("should properly extract the provider name", () => {
+ expect(getProviderByHeader(mockSoftServeHeaders)).toBe("soft-serve");
+ });
+
+ it("should properly extract the commit message", () => {
+ expect(extractCommitMessage(mockSoftServeHeaders, goodWebhook)).toBe(
+ message,
+ );
+ });
+
+ it("should properly extract hash", () => {
+ expect(extractHash(mockSoftServeHeaders, goodWebhook)).toBe(hash);
+ });
+
+ it("should properly extract branch name", () => {
+ expect(extractBranchName(mockSoftServeHeaders, goodWebhook)).toBe(branch);
+ });
+
+ it("should gracefully handle invalid webhook", () => {
+ expect(getProviderByHeader({})).toBeNull();
+ expect(extractCommitMessage(mockSoftServeHeaders, {})).toBe("NEW COMMIT");
+ expect(extractHash(mockSoftServeHeaders, {})).toBe("NEW COMMIT");
+ expect(extractBranchName(mockSoftServeHeaders, {})).toBeNull();
+ });
+});
diff --git a/apps/dokploy/__test__/drop/drop.test.ts b/apps/dokploy/__test__/drop/drop.test.ts
index a67d866bf..dc795fd35 100644
--- a/apps/dokploy/__test__/drop/drop.test.ts
+++ b/apps/dokploy/__test__/drop/drop.test.ts
@@ -29,6 +29,7 @@ const baseApp: ApplicationNested = {
applicationId: "",
previewLabels: [],
createEnvFile: true,
+ bitbucketRepositorySlug: "",
herokuVersion: "",
giteaBranch: "",
buildServerId: "",
@@ -146,6 +147,7 @@ const baseApp: ApplicationNested = {
dockerContextPath: null,
rollbackActive: false,
stopGracePeriodSwarm: null,
+ ulimitsSwarm: null,
};
describe("unzipDrop using real zip files", () => {
diff --git a/apps/dokploy/__test__/env/environment-access-fallback.test.ts b/apps/dokploy/__test__/env/environment-access-fallback.test.ts
new file mode 100644
index 000000000..a4b56393a
--- /dev/null
+++ b/apps/dokploy/__test__/env/environment-access-fallback.test.ts
@@ -0,0 +1,294 @@
+import { describe, expect, it } from "vitest";
+
+// Type definitions matching the project structure
+type Environment = {
+ environmentId: string;
+ name: string;
+ isDefault: boolean;
+};
+
+type Project = {
+ projectId: string;
+ name: string;
+ environments: Environment[];
+};
+
+/**
+ * Helper function that selects the appropriate environment for a user
+ * This matches the logic used in search-command.tsx and show.tsx
+ */
+function selectAccessibleEnvironment(
+ project: Project | null | undefined,
+): Environment | null {
+ if (!project || !project.environments || project.environments.length === 0) {
+ return null;
+ }
+
+ // Find default environment from accessible environments, or fall back to first accessible environment
+ const defaultEnvironment =
+ project.environments.find((environment) => environment.isDefault) ||
+ project.environments[0];
+
+ return defaultEnvironment || null;
+}
+
+describe("Environment Access Fallback", () => {
+ describe("selectAccessibleEnvironment", () => {
+ it("should return default environment when user has access to it", () => {
+ const project: Project = {
+ projectId: "proj-1",
+ name: "Test Project",
+ environments: [
+ {
+ environmentId: "env-prod",
+ name: "production",
+ isDefault: true,
+ },
+ {
+ environmentId: "env-dev",
+ name: "development",
+ isDefault: false,
+ },
+ ],
+ };
+
+ const result = selectAccessibleEnvironment(project);
+
+ expect(result).not.toBeNull();
+ expect(result?.environmentId).toBe("env-prod");
+ expect(result?.isDefault).toBe(true);
+ });
+
+ it("should return first accessible environment when user doesn't have access to default", () => {
+ // Simulating filtered environments (user only has access to development)
+ const project: Project = {
+ projectId: "proj-1",
+ name: "Test Project",
+ environments: [
+ // Note: production is not in the list because user doesn't have access
+ {
+ environmentId: "env-dev",
+ name: "development",
+ isDefault: false,
+ },
+ {
+ environmentId: "env-staging",
+ name: "staging",
+ isDefault: false,
+ },
+ ],
+ };
+
+ const result = selectAccessibleEnvironment(project);
+
+ expect(result).not.toBeNull();
+ expect(result?.environmentId).toBe("env-dev");
+ expect(result?.name).toBe("development");
+ });
+
+ it("should return first environment when no default is marked but environments exist", () => {
+ const project: Project = {
+ projectId: "proj-1",
+ name: "Test Project",
+ environments: [
+ {
+ environmentId: "env-dev",
+ name: "development",
+ isDefault: false,
+ },
+ {
+ environmentId: "env-staging",
+ name: "staging",
+ isDefault: false,
+ },
+ ],
+ };
+
+ const result = selectAccessibleEnvironment(project);
+
+ expect(result).not.toBeNull();
+ expect(result?.environmentId).toBe("env-dev");
+ });
+
+ it("should return null when project has no accessible environments", () => {
+ const project: Project = {
+ projectId: "proj-1",
+ name: "Test Project",
+ environments: [],
+ };
+
+ const result = selectAccessibleEnvironment(project);
+
+ expect(result).toBeNull();
+ });
+
+ it("should return null when project is null", () => {
+ const result = selectAccessibleEnvironment(null);
+
+ expect(result).toBeNull();
+ });
+
+ it("should return null when project is undefined", () => {
+ const result = selectAccessibleEnvironment(undefined);
+
+ expect(result).toBeNull();
+ });
+
+ it("should handle project with single accessible environment", () => {
+ const project: Project = {
+ projectId: "proj-1",
+ name: "Test Project",
+ environments: [
+ {
+ environmentId: "env-dev",
+ name: "development",
+ isDefault: false,
+ },
+ ],
+ };
+
+ const result = selectAccessibleEnvironment(project);
+
+ expect(result).not.toBeNull();
+ expect(result?.environmentId).toBe("env-dev");
+ });
+
+ it("should prioritize default environment even when it's not first in the array", () => {
+ const project: Project = {
+ projectId: "proj-1",
+ name: "Test Project",
+ environments: [
+ {
+ environmentId: "env-dev",
+ name: "development",
+ isDefault: false,
+ },
+ {
+ environmentId: "env-staging",
+ name: "staging",
+ isDefault: false,
+ },
+ {
+ environmentId: "env-prod",
+ name: "production",
+ isDefault: true,
+ },
+ ],
+ };
+
+ const result = selectAccessibleEnvironment(project);
+
+ expect(result).not.toBeNull();
+ expect(result?.environmentId).toBe("env-prod");
+ expect(result?.isDefault).toBe(true);
+ });
+
+ it("should handle multiple default environments by returning the first one found", () => {
+ // Edge case: multiple environments marked as default (shouldn't happen, but test it)
+ const project: Project = {
+ projectId: "proj-1",
+ name: "Test Project",
+ environments: [
+ {
+ environmentId: "env-prod-1",
+ name: "production-1",
+ isDefault: true,
+ },
+ {
+ environmentId: "env-prod-2",
+ name: "production-2",
+ isDefault: true,
+ },
+ ],
+ };
+
+ const result = selectAccessibleEnvironment(project);
+
+ expect(result).not.toBeNull();
+ expect(result?.isDefault).toBe(true);
+ // Should return the first default found
+ expect(result?.environmentId).toBe("env-prod-1");
+ });
+
+ it("should work correctly when user has access to multiple environments including default", () => {
+ const project: Project = {
+ projectId: "proj-1",
+ name: "Test Project",
+ environments: [
+ {
+ environmentId: "env-prod",
+ name: "production",
+ isDefault: true,
+ },
+ {
+ environmentId: "env-dev",
+ name: "development",
+ isDefault: false,
+ },
+ {
+ environmentId: "env-staging",
+ name: "staging",
+ isDefault: false,
+ },
+ ],
+ };
+
+ const result = selectAccessibleEnvironment(project);
+
+ expect(result).not.toBeNull();
+ expect(result?.environmentId).toBe("env-prod");
+ expect(result?.isDefault).toBe(true);
+ });
+
+ it("should handle real-world scenario: user with only development access", () => {
+ // This simulates the exact bug we're fixing:
+ // User has access to development but not production (default)
+ // The filtered environments array only contains development
+ const project: Project = {
+ projectId: "proj-1",
+ name: "My Project",
+ environments: [
+ // Only development is accessible (production was filtered out)
+ {
+ environmentId: "env-dev-123",
+ name: "development",
+ isDefault: false,
+ },
+ ],
+ };
+
+ const result = selectAccessibleEnvironment(project);
+
+ expect(result).not.toBeNull();
+ expect(result?.environmentId).toBe("env-dev-123");
+ expect(result?.name).toBe("development");
+ // Should not be null even though it's not the default
+ });
+ });
+
+ describe("Environment selection edge cases", () => {
+ it("should handle project with environments property as undefined", () => {
+ const project = {
+ projectId: "proj-1",
+ name: "Test Project",
+ environments: undefined,
+ } as unknown as Project;
+
+ const result = selectAccessibleEnvironment(project);
+
+ expect(result).toBeNull();
+ });
+
+ it("should handle project with null environments array", () => {
+ const project = {
+ projectId: "proj-1",
+ name: "Test Project",
+ environments: null,
+ } as unknown as Project;
+
+ const result = selectAccessibleEnvironment(project);
+
+ expect(result).toBeNull();
+ });
+ });
+});
diff --git a/apps/dokploy/__test__/server/mechanizeDockerContainer.test.ts b/apps/dokploy/__test__/server/mechanizeDockerContainer.test.ts
index c12a272bc..fb448e3af 100644
--- a/apps/dokploy/__test__/server/mechanizeDockerContainer.test.ts
+++ b/apps/dokploy/__test__/server/mechanizeDockerContainer.test.ts
@@ -6,6 +6,7 @@ type MockCreateServiceOptions = {
TaskTemplate?: {
ContainerSpec?: {
StopGracePeriod?: number;
+ Ulimits?: Array<{ Name: string; Soft: number; Hard: number }>;
};
};
[key: string]: unknown;
@@ -13,11 +14,11 @@ type MockCreateServiceOptions = {
const { inspectMock, getServiceMock, createServiceMock, getRemoteDockerMock } =
vi.hoisted(() => {
- const inspect = vi.fn<[], Promise