dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: compose file location

Browse Source
This commit is contained in:
Andras Bacsai
2023-01-16 09:48:15 +01:00
parent 18064ef6a2
commit d641d32413
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/api/src/jobs/deployApplication.ts
View File

@@ -196,7 +196,7 @@ import * as buildpacks from '../lib/buildPacks';
await executeCommand({ await executeCommand({
debug: true, debug: true,
dockerId: destinationDocker.id, dockerId: destinationDocker.id,
command: `docker compose --project-directory ${workdir} up -d` command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
}); });
await saveBuildLog({ line: 'Deployed 🎉', buildId, applicationId }); await saveBuildLog({ line: 'Deployed 🎉', buildId, applicationId });
} catch (error) { } catch (error) {
@@ -726,7 +726,7 @@ import * as buildpacks from '../lib/buildPacks';
await executeCommand({ await executeCommand({
debug, debug,
dockerId: destinationDocker.id, dockerId: destinationDocker.id,
command: `docker compose --project-directory ${workdir} up -d` command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
}); });
await saveBuildLog({ line: 'Deployed 🎉', buildId, applicationId }); await saveBuildLog({ line: 'Deployed 🎉', buildId, applicationId });
} catch (error) { } catch (error) {

4
apps/api/src/routes/api/v1/applications/handlers.ts
View File

@@ -670,7 +670,7 @@ export async function restartApplication(
await executeCommand({ await executeCommand({
dockerId, dockerId,
command: `docker compose --project-directory ${workdir} up -d` command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
}); });
return reply.code(201).send(); return reply.code(201).send();
} }
@@ -1451,7 +1451,7 @@ export async function restartPreview(
await executeCommand({ dockerId, command: `docker rm ${id}-${pullmergeRequestId}` }); await executeCommand({ dockerId, command: `docker rm ${id}-${pullmergeRequestId}` });
await executeCommand({ await executeCommand({
dockerId, dockerId,
command: `docker compose --project-directory ${workdir} up -d` command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
}); });
return reply.code(201).send(); return reply.code(201).send();
} }

4
apps/server/src/jobs/applicationBuildQueue.ts
View File

@@ -195,7 +195,7 @@ import { defaultComposeConfiguration } from '../lib/docker';
await executeCommand({ await executeCommand({
debug: true, debug: true,
dockerId: destinationDocker.id, dockerId: destinationDocker.id,
command: `docker compose --project-directory ${workdir} up -d` command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
}); });
await saveBuildLog({ line: 'Deployed 🎉', buildId, applicationId }); await saveBuildLog({ line: 'Deployed 🎉', buildId, applicationId });
} catch (error) { } catch (error) {
@@ -765,7 +765,7 @@ import { defaultComposeConfiguration } from '../lib/docker';
await executeCommand({ await executeCommand({
debug, debug,
dockerId: destinationDocker.id, dockerId: destinationDocker.id,
command: `docker compose --project-directory ${workdir} up -d` command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
}); });
await saveBuildLog({ line: 'Deployed 🎉', buildId, applicationId }); await saveBuildLog({ line: 'Deployed 🎉', buildId, applicationId });
} catch (error) { } catch (error) {

4
apps/server/src/trpc/routers/applications/index.ts
View File

@@ -177,7 +177,7 @@ export const applicationsRouter = router({
await executeCommand({ dockerId, command: `docker rm ${id}-${pullmergeRequestId}` }); await executeCommand({ dockerId, command: `docker rm ${id}-${pullmergeRequestId}` });
await executeCommand({ await executeCommand({
dockerId, dockerId,
command: `docker compose --project-directory ${workdir} up -d` command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
}); });
} }
}), }),
@@ -1311,7 +1311,7 @@ export const applicationsRouter = router({
await executeCommand({ await executeCommand({
dockerId, dockerId,
command: `docker compose --project-directory ${workdir} up -d` command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
}); });
} }
return {}; return {};