From b024060eed08b29360ac4dd282e9a3aac334b856 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Thu, 6 Feb 2025 00:38:04 -0600 Subject: [PATCH] refactor: delete unneeded container_name --- apps/dokploy/templates/templates.ts | 5 ++-- packages/server/src/utils/docker/collision.ts | 5 ---- .../utils/docker/collision/container-name.ts | 26 ------------------- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 packages/server/src/utils/docker/collision/container-name.ts diff --git a/apps/dokploy/templates/templates.ts b/apps/dokploy/templates/templates.ts index 650d3b13e..2b801ccf0 100644 --- a/apps/dokploy/templates/templates.ts +++ b/apps/dokploy/templates/templates.ts @@ -1467,8 +1467,8 @@ export const templates: TemplateData[] = [ }, tags: ["hrms", "payroll", "leaves", "expenses", "attendance", "performace"], load: () => import("./frappe-hr/index").then((m) => m.generate), - }, - { + }, + { id: "formbricks", name: "Formbricks", version: "v3.1.3", @@ -1482,6 +1482,5 @@ export const templates: TemplateData[] = [ }, tags: ["forms", "analytics"], load: () => import("./formbricks/index").then((m) => m.generate), - }, ]; diff --git a/packages/server/src/utils/docker/collision.ts b/packages/server/src/utils/docker/collision.ts index ff17fc609..b905d4866 100644 --- a/packages/server/src/utils/docker/collision.ts +++ b/packages/server/src/utils/docker/collision.ts @@ -1,6 +1,5 @@ import { findComposeById } from "@dokploy/server/services/compose"; import { dump, load } from "js-yaml"; -import { addAppNameToAllContainerNames } from "./collision/container-name"; import { addAppNameToAllServiceNames } from "./collision/root-network"; import { generateRandomHash } from "./compose"; import { addSuffixToAllVolumes } from "./compose/volume"; @@ -12,10 +11,6 @@ export const addAppNameToPreventCollision = ( ): ComposeSpecification => { let updatedComposeData = { ...composeData }; - updatedComposeData = addAppNameToAllContainerNames( - updatedComposeData, - appName, - ); updatedComposeData = addAppNameToAllServiceNames(updatedComposeData, appName); updatedComposeData = addSuffixToAllVolumes(updatedComposeData, appName); return updatedComposeData; diff --git a/packages/server/src/utils/docker/collision/container-name.ts b/packages/server/src/utils/docker/collision/container-name.ts deleted file mode 100644 index 3b1f5888a..000000000 --- a/packages/server/src/utils/docker/collision/container-name.ts +++ /dev/null @@ -1,26 +0,0 @@ -import _ from "lodash"; -import type { ComposeSpecification, DefinitionsService } from "../types"; - -export const addAppNameToContainerNames = ( - services: { [key: string]: DefinitionsService }, - appName: string, -): { [key: string]: DefinitionsService } => { - return _.mapValues(services, (service, serviceName) => { - service.container_name = `${appName}-${serviceName}`; - return service; - }); -}; - -export const addAppNameToAllContainerNames = ( - composeData: ComposeSpecification, - appName: string, -): ComposeSpecification => { - const updatedComposeData = { ...composeData }; - if (updatedComposeData.services) { - updatedComposeData.services = addAppNameToContainerNames( - updatedComposeData.services, - appName, - ); - } - return updatedComposeData; -};