feat(rollbacks): enhance fullContext type and refactor createRollback logic

- Updated fullContext type in rollbacks schema to include Application and Project types.
- Refactored createRollback function to separate fullContext from input and handle it more efficiently.
- Integrated environment variable preparation into the rollback process.
This commit is contained in:
Mauricio Siu
2025-06-22 09:56:36 -06:00
parent 892f272108
commit 24bff96898
2 changed files with 15 additions and 3 deletions

View File

@@ -4,6 +4,8 @@ import { createInsertSchema } from "drizzle-zod";
import { nanoid } from "nanoid";
import { z } from "zod";
import { deployments } from "./deployment";
import type { Application } from "@dokploy/server/services/application";
import type { Project } from "@dokploy/server/services/project";
export const rollbacks = pgTable("rollback", {
rollbackId: text("rollbackId")
@@ -20,7 +22,7 @@ export const rollbacks = pgTable("rollback", {
createdAt: text("createdAt")
.notNull()
.$defaultFn(() => new Date().toISOString()),
fullContext: jsonb("fullContext"),
fullContext: jsonb("fullContext").$type<Application & { project: Project }>(),
});
export type Rollback = typeof rollbacks.$inferSelect;

View File

@@ -12,14 +12,16 @@ import type { ApplicationNested } from "../utils/builders";
import { execAsync, execAsyncRemote } from "../utils/process/execAsync";
import type { CreateServiceOptions } from "dockerode";
import { findDeploymentById } from "./deployment";
import { prepareEnvironmentVariables } from "../utils/docker/utils";
export const createRollback = async (
input: z.infer<typeof createRollbackSchema>,
) => {
await db.transaction(async (tx) => {
const { fullContext, ...other } = input;
const rollback = await tx
.insert(rollbacks)
.values(input)
.values(other)
.returning()
.then((res) => res[0]);
@@ -47,7 +49,7 @@ export const createRollback = async (
.update(rollbacks)
.set({
image: tagImage,
fullContext: JSON.stringify(rest),
fullContext: rest,
})
.where(eq(rollbacks.rollbackId, rollback.rollbackId));
@@ -150,10 +152,16 @@ export const rollback = async (rollbackId: string) => {
const application = await findApplicationById(deployment.applicationId);
const envVariables = prepareEnvironmentVariables(
result?.fullContext?.env || "",
result.fullContext?.project?.env || "",
);
await rollbackApplication(
application.appName,
result.image || "",
application.serverId,
envVariables,
);
};
@@ -161,6 +169,7 @@ const rollbackApplication = async (
appName: string,
image: string,
serverId?: string | null,
env: string[] = [],
) => {
const docker = await getRemoteDocker(serverId);
@@ -169,6 +178,7 @@ const rollbackApplication = async (
TaskTemplate: {
ContainerSpec: {
Image: image,
Env: env,
},
},
};