diff --git a/Dockerfile b/Dockerfile index 72fcd531f..ed936508f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ ENV NODE_ENV=production RUN pnpm --filter=@dokploy/server 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/dist /prod/dokploy/dist diff --git a/Dockerfile.cloud b/Dockerfile.cloud index e8fb7808e..05e7cde49 100644 --- a/Dockerfile.cloud +++ b/Dockerfile.cloud @@ -29,7 +29,7 @@ ENV NODE_ENV=production RUN pnpm --filter=@dokploy/server 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/dist /prod/dokploy/dist diff --git a/Dockerfile.schedule b/Dockerfile.schedule index 3c932396e..81b13fd64 100644 --- a/Dockerfile.schedule +++ b/Dockerfile.schedule @@ -20,7 +20,7 @@ ENV NODE_ENV=production RUN pnpm --filter=@dokploy/server 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 diff --git a/Dockerfile.server b/Dockerfile.server index 64a3b7d5a..8990ece4d 100644 --- a/Dockerfile.server +++ b/Dockerfile.server @@ -20,7 +20,7 @@ ENV NODE_ENV=production RUN pnpm --filter=@dokploy/server 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 diff --git a/apps/dokploy/__test__/deploy/application.real.test.ts b/apps/dokploy/__test__/deploy/application.real.test.ts index d440ad68d..dda90f056 100644 --- a/apps/dokploy/__test__/deploy/application.real.test.ts +++ b/apps/dokploy/__test__/deploy/application.real.test.ts @@ -83,7 +83,7 @@ vi.mock("@dokploy/server/services/patch", async (importOriginal) => { await importOriginal(); return { ...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 * as deploymentService from "@dokploy/server/services/deployment"; import * as patchService from "@dokploy/server/services/patch"; -import { generatePatch } from "@dokploy/server/services/patch"; import { mkdtemp, writeFile } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; @@ -546,24 +545,17 @@ describe( patchApp as any, ); - // 3. Generate a patch - // We modify the file, generate patch, and then reset. + // 3. Patch content is the raw file content (not a diff) 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 - vi.mocked(patchService.findPatchesByApplicationId).mockResolvedValue([ + vi.mocked(patchService.findPatchesByEntityId).mockResolvedValue([ { patchId: "test-patch-1", applicationId: "test-app-id", composeId: null, filePath: "app.py", - content: patchContent, + content: newContent, enabled: true, createdAt: new Date().toISOString(), } as any,