mirror of
https://github.com/andwati/dokploy.git
synced 2026-11-17 09:25:20 +00:00
Merge pull request #2289 from Dokploy/2282-custom-compose-path-not-being-used-when-manually-restarting-service
refactor(compose): reorganize imports and simplify command execution …
This commit is contained in:
@@ -1,8 +1,12 @@
|
|||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
import { paths } from "@dokploy/server/constants";
|
import { paths } from "@dokploy/server/constants";
|
||||||
import { db } from "@dokploy/server/db";
|
import { db } from "@dokploy/server/db";
|
||||||
import { type apiCreateCompose, compose } from "@dokploy/server/db/schema";
|
import {
|
||||||
import { buildAppName, cleanAppName } from "@dokploy/server/db/schema";
|
type apiCreateCompose,
|
||||||
|
buildAppName,
|
||||||
|
cleanAppName,
|
||||||
|
compose,
|
||||||
|
} from "@dokploy/server/db/schema";
|
||||||
import {
|
import {
|
||||||
buildCompose,
|
buildCompose,
|
||||||
getBuildComposeCommand,
|
getBuildComposeCommand,
|
||||||
@@ -516,19 +520,20 @@ export const startCompose = async (composeId: string) => {
|
|||||||
const compose = await findComposeById(composeId);
|
const compose = await findComposeById(composeId);
|
||||||
try {
|
try {
|
||||||
const { COMPOSE_PATH } = paths(!!compose.serverId);
|
const { COMPOSE_PATH } = paths(!!compose.serverId);
|
||||||
|
|
||||||
|
const projectPath = join(COMPOSE_PATH, compose.appName, "code");
|
||||||
|
const path =
|
||||||
|
compose.sourceType === "raw" ? "docker-compose.yml" : compose.composePath;
|
||||||
|
const baseCommand = `docker compose -p ${compose.appName} -f ${path} up -d`;
|
||||||
if (compose.composeType === "docker-compose") {
|
if (compose.composeType === "docker-compose") {
|
||||||
if (compose.serverId) {
|
if (compose.serverId) {
|
||||||
await execAsyncRemote(
|
await execAsyncRemote(
|
||||||
compose.serverId,
|
compose.serverId,
|
||||||
`cd ${join(
|
`cd ${projectPath} && ${baseCommand}`,
|
||||||
COMPOSE_PATH,
|
|
||||||
compose.appName,
|
|
||||||
"code",
|
|
||||||
)} && docker compose -p ${compose.appName} up -d`,
|
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
await execAsync(`docker compose -p ${compose.appName} up -d`, {
|
await execAsync(baseCommand, {
|
||||||
cwd: join(COMPOSE_PATH, compose.appName, "code"),
|
cwd: projectPath,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user