mirror of
https://github.com/Dokploy/dokploy.git
synced 2026-07-07 15:05:23 +02:00
feat(database): add isolatedDeploymentsVolume column to compose table
- Introduced a new boolean column "isolatedDeploymentsVolume" to the "compose" table with a default value of false. - Updated existing records to set "isolatedDeploymentsVolume" to true. - Modified related functions to handle the new column for improved deployment isolation management.
This commit is contained in:
@@ -79,6 +79,10 @@ export const compose = pgTable("compose", {
|
||||
suffix: text("suffix").notNull().default(""),
|
||||
randomize: boolean("randomize").notNull().default(false),
|
||||
isolatedDeployment: boolean("isolatedDeployment").notNull().default(false),
|
||||
// Keep this for backward compatibility since we will not add the prefix anymore to volumes
|
||||
isolatedDeploymentsVolume: boolean("isolatedDeploymentsVolume")
|
||||
.notNull()
|
||||
.default(false),
|
||||
triggerType: triggerType("triggerType").default("push"),
|
||||
composeStatus: applicationStatus("composeStatus").notNull().default("idle"),
|
||||
projectId: text("projectId")
|
||||
|
||||
@@ -1,16 +1,21 @@
|
||||
import { findComposeById } from "@dokploy/server/services/compose";
|
||||
import { dump, load } from "js-yaml";
|
||||
import { addAppNameToAllServiceNames } from "./collision/root-network";
|
||||
import { addSuffixToAllVolumes } from "./compose/volume";
|
||||
import { generateRandomHash } from "./compose";
|
||||
import type { ComposeSpecification } from "./types";
|
||||
|
||||
export const addAppNameToPreventCollision = (
|
||||
composeData: ComposeSpecification,
|
||||
appName: string,
|
||||
isolatedDeploymentsVolume: boolean,
|
||||
): ComposeSpecification => {
|
||||
let updatedComposeData = { ...composeData };
|
||||
|
||||
updatedComposeData = addAppNameToAllServiceNames(updatedComposeData, appName);
|
||||
if (isolatedDeploymentsVolume) {
|
||||
updatedComposeData = addSuffixToAllVolumes(updatedComposeData, appName);
|
||||
}
|
||||
return updatedComposeData;
|
||||
};
|
||||
|
||||
@@ -27,6 +32,7 @@ export const randomizeIsolatedDeploymentComposeFile = async (
|
||||
const newComposeFile = addAppNameToPreventCollision(
|
||||
composeData,
|
||||
randomSuffix,
|
||||
compose.isolatedDeploymentsVolume,
|
||||
);
|
||||
|
||||
return dump(newComposeFile);
|
||||
@@ -34,11 +40,16 @@ export const randomizeIsolatedDeploymentComposeFile = async (
|
||||
|
||||
export const randomizeDeployableSpecificationFile = (
|
||||
composeSpec: ComposeSpecification,
|
||||
isolatedDeploymentsVolume: boolean,
|
||||
suffix?: string,
|
||||
) => {
|
||||
if (!suffix) {
|
||||
return composeSpec;
|
||||
}
|
||||
const newComposeFile = addAppNameToPreventCollision(composeSpec, suffix);
|
||||
const newComposeFile = addAppNameToPreventCollision(
|
||||
composeSpec,
|
||||
suffix,
|
||||
isolatedDeploymentsVolume,
|
||||
);
|
||||
return newComposeFile;
|
||||
};
|
||||
|
||||
@@ -202,6 +202,7 @@ export const addDomainToCompose = async (
|
||||
if (compose.isolatedDeployment) {
|
||||
const randomized = randomizeDeployableSpecificationFile(
|
||||
result,
|
||||
compose.isolatedDeploymentsVolume,
|
||||
compose.suffix || compose.appName,
|
||||
);
|
||||
result = randomized;
|
||||
|
||||
Reference in New Issue
Block a user