diff --git a/apps/dokploy/components/dashboard/compose/general/compose-file-editor.tsx b/apps/dokploy/components/dashboard/compose/general/compose-file-editor.tsx index 9b17e267a..cb727e2a9 100644 --- a/apps/dokploy/components/dashboard/compose/general/compose-file-editor.tsx +++ b/apps/dokploy/components/dashboard/compose/general/compose-file-editor.tsx @@ -74,6 +74,7 @@ export const ComposeFileEditor = ({ composeId }: Props) => { await mutateAsync({ composeId, composeFile: data.composeFile, + composePath: "./docker-compose.yml", sourceType: "raw", }) .then(async () => { diff --git a/packages/server/src/db/schema/compose.ts b/packages/server/src/db/schema/compose.ts index 958c2c32c..7b8e93c7a 100644 --- a/packages/server/src/db/schema/compose.ts +++ b/packages/server/src/db/schema/compose.ts @@ -12,7 +12,6 @@ import { gitea } from "./gitea"; import { github } from "./github"; import { gitlab } from "./gitlab"; import { mounts } from "./mount"; -import { projects } from "./project"; import { schedules } from "./schedule"; import { server } from "./server"; import { applicationStatus, triggerType } from "./shared"; diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts index 7bff94953..667b46b74 100644 --- a/packages/server/src/utils/builders/compose.ts +++ b/packages/server/src/utils/builders/compose.ts @@ -187,13 +187,12 @@ export const createCommand = (compose: ComposeNested) => { const createEnvFile = (compose: ComposeNested) => { const { COMPOSE_PATH } = paths(); - const { env, appName, sourceType } = compose; - const composePath = - sourceType === "raw" ? "docker-compose.yml" : compose.composePath; - const composeFilePath = join(COMPOSE_PATH, appName, "code", composePath); + const { env, composePath, appName } = compose; + const composeFilePath = + join(COMPOSE_PATH, appName, "code", composePath) || + join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); const envFilePath = join(dirname(composeFilePath), ".env"); - console.log("envFilePath", envFilePath); let envContent = `APP_NAME=${appName}\n`; envContent += env || ""; if (!envContent.includes("DOCKER_CONFIG")) { @@ -218,10 +217,10 @@ const createEnvFile = (compose: ComposeNested) => { export const getCreateEnvFileCommand = (compose: ComposeNested) => { const { COMPOSE_PATH } = paths(true); - const { env, appName, sourceType } = compose; - const composePath = - sourceType === "raw" ? "docker-compose.yml" : compose.composePath; - const composeFilePath = join(COMPOSE_PATH, appName, "code", composePath); + const { env, composePath, appName } = compose; + const composeFilePath = + join(COMPOSE_PATH, appName, "code", composePath) || + join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); const envFilePath = join(dirname(composeFilePath), ".env");