diff --git a/packages/server/src/utils/docker/collision.ts b/packages/server/src/utils/docker/collision.ts index 86817da0..ff17fc60 100644 --- a/packages/server/src/utils/docker/collision.ts +++ b/packages/server/src/utils/docker/collision.ts @@ -1,10 +1,10 @@ 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"; import type { ComposeSpecification } from "./types"; -import { dump, load } from "js-yaml"; -import { generateRandomHash } from "./compose"; export const addAppNameToPreventCollision = ( composeData: ComposeSpecification, diff --git a/packages/server/src/utils/docker/collision/container-name.ts b/packages/server/src/utils/docker/collision/container-name.ts index 7838775f..3b1f5888 100644 --- a/packages/server/src/utils/docker/collision/container-name.ts +++ b/packages/server/src/utils/docker/collision/container-name.ts @@ -1,5 +1,5 @@ -import type { ComposeSpecification, DefinitionsService } from "../types"; import _ from "lodash"; +import type { ComposeSpecification, DefinitionsService } from "../types"; export const addAppNameToContainerNames = ( services: { [key: string]: DefinitionsService }, diff --git a/packages/server/src/utils/docker/collision/root-network.ts b/packages/server/src/utils/docker/collision/root-network.ts index dee15019..ed36d4bd 100644 --- a/packages/server/src/utils/docker/collision/root-network.ts +++ b/packages/server/src/utils/docker/collision/root-network.ts @@ -1,5 +1,5 @@ -import type { ComposeSpecification, DefinitionsService } from "../types"; import _ from "lodash"; +import type { ComposeSpecification, DefinitionsService } from "../types"; export const addAppNameToRootNetwork = ( composeData: ComposeSpecification, diff --git a/packages/server/src/utils/docker/domain.ts b/packages/server/src/utils/docker/domain.ts index 35db00cf..6846c830 100644 --- a/packages/server/src/utils/docker/domain.ts +++ b/packages/server/src/utils/docker/domain.ts @@ -26,6 +26,7 @@ import { createComposeFileRaw, createComposeFileRawRemote, } from "../providers/raw"; +import { randomizeDeployableSpecificationFile } from "./collision"; import { randomizeSpecificationFile } from "./compose"; import type { ComposeSpecification, @@ -33,7 +34,6 @@ import type { PropertiesNetworks, } from "./types"; import { encodeBase64 } from "./utils"; -import { randomizeDeployableSpecificationFile } from "./collision"; export const cloneCompose = async (compose: Compose) => { if (compose.sourceType === "github") {