andwati/dokploy
1
0
Fork 0
mirror of https://github.com/andwati/dokploy.git synced 2026-11-10 22:15:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'canary' into patches-impl

Browse Source
This commit is contained in:
Mauricio Siu
2026-02-18 14:39:54 -06:00
parent 309a411718 b0c6b1338d
commit 42e8320866
5 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+1 -1
View File
@@ -20,7 +20,7 @@ ENV NODE_ENV=production
RUN pnpm --filter=@dokploy/server build RUN pnpm --filter=@dokploy/server build
RUN pnpm --filter=./apps/dokploy run build RUN pnpm --filter=./apps/dokploy run build
RUN pnpm --filter=./apps/dokploy --prod deploy /prod/dokploy RUN pnpm --filter=./apps/dokploy --prod deploy --legacy /prod/dokploy
RUN cp -R /usr/src/app/apps/dokploy/.next /prod/dokploy/.next RUN cp -R /usr/src/app/apps/dokploy/.next /prod/dokploy/.next
RUN cp -R /usr/src/app/apps/dokploy/dist /prod/dokploy/dist RUN cp -R /usr/src/app/apps/dokploy/dist /prod/dokploy/dist
Dockerfile.cloud
+1 -1
View File
@@ -29,7 +29,7 @@ ENV NODE_ENV=production
RUN pnpm --filter=@dokploy/server build RUN pnpm --filter=@dokploy/server build
RUN pnpm --filter=./apps/dokploy run build RUN pnpm --filter=./apps/dokploy run build
RUN pnpm --filter=./apps/dokploy --prod deploy /prod/dokploy RUN pnpm --filter=./apps/dokploy --prod deploy --legacy /prod/dokploy
RUN cp -R /usr/src/app/apps/dokploy/.next /prod/dokploy/.next RUN cp -R /usr/src/app/apps/dokploy/.next /prod/dokploy/.next
RUN cp -R /usr/src/app/apps/dokploy/dist /prod/dokploy/dist RUN cp -R /usr/src/app/apps/dokploy/dist /prod/dokploy/dist
Dockerfile.schedule
+1 -1
View File
@@ -20,7 +20,7 @@ ENV NODE_ENV=production
RUN pnpm --filter=@dokploy/server build RUN pnpm --filter=@dokploy/server build
RUN pnpm --filter=./apps/schedules run build RUN pnpm --filter=./apps/schedules run build
RUN pnpm --filter=./apps/schedules --prod deploy /prod/schedules RUN pnpm --filter=./apps/schedules --prod deploy --legacy /prod/schedules
RUN cp -R /usr/src/app/apps/schedules/dist /prod/schedules/dist RUN cp -R /usr/src/app/apps/schedules/dist /prod/schedules/dist
Dockerfile.server
+1 -1
View File
@@ -20,7 +20,7 @@ ENV NODE_ENV=production
RUN pnpm --filter=@dokploy/server build RUN pnpm --filter=@dokploy/server build
RUN pnpm --filter=./apps/api run build RUN pnpm --filter=./apps/api run build
RUN pnpm --filter=./apps/api --prod deploy /prod/api RUN pnpm --filter=./apps/api --prod deploy --legacy /prod/api
RUN cp -R /usr/src/app/apps/api/dist /prod/api/dist RUN cp -R /usr/src/app/apps/api/dist /prod/api/dist
apps/dokploy/__test__/deploy/application.real.test.ts
+4 -12
View File
@@ -83,7 +83,7 @@ vi.mock("@dokploy/server/services/patch", async (importOriginal) => {
await importOriginal<typeof import("@dokploy/server/services/patch")>(); await importOriginal<typeof import("@dokploy/server/services/patch")>();
return { return {
...actual, ...actual,
findPatchesByApplicationId: vi.fn().mockResolvedValue([]), findPatchesByEntityId: vi.fn().mockResolvedValue([]),
}; };
}); });
@@ -99,7 +99,6 @@ import * as applicationService from "@dokploy/server/services/application";
import { deployApplication } from "@dokploy/server/services/application"; import { deployApplication } from "@dokploy/server/services/application";
import * as deploymentService from "@dokploy/server/services/deployment"; import * as deploymentService from "@dokploy/server/services/deployment";
import * as patchService from "@dokploy/server/services/patch"; import * as patchService from "@dokploy/server/services/patch";
import { generatePatch } from "@dokploy/server/services/patch";
import { mkdtemp, writeFile } from "node:fs/promises"; import { mkdtemp, writeFile } from "node:fs/promises";
import { tmpdir } from "node:os"; import { tmpdir } from "node:os";
import { join } from "node:path"; import { join } from "node:path";
@@ -546,24 +545,17 @@ describe(
patchApp as any, patchApp as any,
); );
// 3. Generate a patch // 3. Patch content is the raw file content (not a diff)
// We modify the file, generate patch, and then reset.
const newContent = "print('Patched App')\n"; const newContent = "print('Patched App')\n";
const patchContent = await generatePatch({
codePath: tempRepo,
filePath: "app.py",
newContent,
serverId: null,
});
// 4. Mock patch service to return this patch // 4. Mock patch service to return this patch
vi.mocked(patchService.findPatchesByApplicationId).mockResolvedValue([ vi.mocked(patchService.findPatchesByEntityId).mockResolvedValue([
{ {
patchId: "test-patch-1", patchId: "test-patch-1",
applicationId: "test-app-id", applicationId: "test-app-id",
composeId: null, composeId: null,
filePath: "app.py", filePath: "app.py",
content: patchContent, content: newContent,
enabled: true, enabled: true,
createdAt: new Date().toISOString(), createdAt: new Date().toISOString(),
} as any, } as any,