Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy.git synced 2026-07-21 05:45:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: restructure application and rollback context to encapsulate project within environment, improving data organization and clarity across services

Browse Source
This commit is contained in:
Mauricio Siu
2025-09-01 23:19:53 -06:00
parent c57c231c32
commit e8a5f9c0a8
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dokploy/pages/api/deploy/[refreshToken].ts
View File

@@ -20,7 +20,11 @@ export default async function handler(
const application = await db.query.applications.findFirst({ const application = await db.query.applications.findFirst({
where: eq(applications.refreshToken, refreshToken as string), where: eq(applications.refreshToken, refreshToken as string),
with: { with: {
project: true, environment: {
with: {
project: true,
},
},
bitbucket: true, bitbucket: true,
}, },
}); });

4
packages/server/src/db/schema/rollbacks.ts
View File

@@ -27,7 +27,9 @@ export const rollbacks = pgTable("rollback", {
.$defaultFn(() => new Date().toISOString()), .$defaultFn(() => new Date().toISOString()),
fullContext: jsonb("fullContext").$type< fullContext: jsonb("fullContext").$type<
Application & { Application & {
project: Project; environment: {
project: Project;
};
mounts: Mount[]; mounts: Mount[];
ports: Port[]; ports: Port[];
registry?: Registry | null; registry?: Registry | null;

6
packages/server/src/services/rollbacks.ts
View File

@@ -179,7 +179,9 @@ const rollbackApplication = async (
image: string, image: string,
serverId?: string | null, serverId?: string | null,
fullContext?: Application & { fullContext?: Application & {
project: Project; environment: {
project: Project;
};
mounts: Mount[]; mounts: Mount[];
ports: Port[]; ports: Port[];
}, },
@@ -225,7 +227,7 @@ const rollbackApplication = async (
const bindsMount = generateBindMounts(mounts); const bindsMount = generateBindMounts(mounts);
const envVariables = prepareEnvironmentVariables( const envVariables = prepareEnvironmentVariables(
env, env,
fullContext.project.env, fullContext.environment.project.env,
); );
// For rollback, we use the provided image instead of calculating it // For rollback, we use the provided image instead of calculating it