Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy.git synced 2026-06-15 20:25:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: update application deployment logic to utilize environment context for project name and organization ID, enhancing clarity and consistency across services

Browse Source
This commit is contained in:
Mauricio Siu
2025-09-01 22:51:35 -06:00
parent de3c845ab0
commit 3e7eff11cd
3 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/server/src/services/application.ts
View File

@@ -231,11 +231,11 @@ export const deployApplication = async ({
}
await sendBuildSuccessNotifications({
projectName: application.project.name,
projectName: application.environment.project.name,
applicationName: application.name,
applicationType: "application",
buildLink,
organizationId: application.project.organizationId,
organizationId: application.environment.project.organizationId,
domains: application.domains,
});
} catch (error) {
@@ -243,13 +243,13 @@ export const deployApplication = async ({
await updateApplicationStatus(applicationId, "error");
await sendBuildErrorNotifications({
projectName: application.project.name,
projectName: application.environment.project.name,
applicationName: application.name,
applicationType: "application",
// @ts-ignore
errorMessage: error?.message || "Error building",
buildLink,
organizationId: application.project.organizationId,
organizationId: application.environment.project.organizationId,
});
throw error;
@@ -367,11 +367,11 @@ export const deployRemoteApplication = async ({
}
await sendBuildSuccessNotifications({
projectName: application.project.name,
projectName: application.environment.project.name,
applicationName: application.name,
applicationType: "application",
buildLink,
organizationId: application.project.organizationId,
organizationId: application.environment.project.organizationId,
domains: application.domains,
});
} catch (error) {
@@ -391,12 +391,12 @@ export const deployRemoteApplication = async ({
await updateApplicationStatus(applicationId, "error");
await sendBuildErrorNotifications({
projectName: application.project.name,
projectName: application.environment.project.name,
applicationName: application.name,
applicationType: "application",
errorMessage: `Please check the logs for details: ${errorMessage}`,
buildLink,
organizationId: application.project.organizationId,
organizationId: application.environment.project.organizationId,
});
throw error;

15
packages/server/src/utils/builders/index.ts
View File

@@ -17,22 +17,13 @@ import { buildNixpacks, getNixpacksCommand } from "./nixpacks";
import { buildPaketo, getPaketoCommand } from "./paketo";
import { buildRailpack, getRailpackCommand } from "./railpack";
import { buildStatic, getStaticCommand } from "./static";
import { findApplicationById } from "@dokploy/server/services/application";
// NIXPACKS codeDirectory = where is the path of the code directory
// HEROKU codeDirectory = where is the path of the code directory
// PAKETO codeDirectory = where is the path of the code directory
// DOCKERFILE codeDirectory = where is the exact path of the (Dockerfile)
export type ApplicationNested = InferResultType<
"applications",
{
mounts: true;
security: true;
redirects: true;
ports: true;
registry: true;
project: true;
}
>;
export type ApplicationNested = Awaited<ReturnType<typeof findApplicationById>>;
export const buildApplication = async (
application: ApplicationNested,
@@ -148,7 +139,7 @@ export const mechanizeDockerContainer = async (
const filesMount = generateFileMounts(appName, application);
const envVariables = prepareEnvironmentVariables(
env,
application.project.env,
application.environment.project.env,
);
const image = getImageName(application);

4
packages/server/src/utils/builders/railpack.ts
View File

@@ -26,7 +26,7 @@ export const buildRailpack = async (
const buildAppDirectory = getBuildAppDirectory(application);
const envVariables = prepareEnvironmentVariables(
env,
application.project.env,
application.environment.project.env,
);
try {
@@ -123,7 +123,7 @@ export const getRailpackCommand = (
const buildAppDirectory = getBuildAppDirectory(application);
const envVariables = prepareEnvironmentVariables(
env,
application.project.env,
application.environment.project.env,
);
// Prepare command