Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: added env support to Dokploy stack compose #637

Open
wants to merge 11 commits into
base: canary
Choose a base branch
from
+62 −22
Open

Feat: added env support to Dokploy stack compose #637

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
94786c7
feat: added env support for dokploy
xenonwellz Nov 1, 2024
cb02deb
fix(builder): fixed docker-compose issue
xenonwellz Nov 1, 2024
dc1e12d
feat(compose): added stop functionality for stack
xenonwellz Nov 1, 2024
0608162
refactor: used docker stack config
xenonwellz Nov 1, 2024
9c355bc
refactor(builder): removed unused and redundant code
xenonwellz Nov 2, 2024
06cbd1f
refactor(bundler): removed redundant code
xenonwellz Nov 3, 2024
f772fec
fix(bundler): docker-compose bug
xenonwellz Nov 4, 2024
dafed30
refactor(builder): removed path log
xenonwellz Nov 4, 2024
c9b570e
fix(builder): fixed issues on non-raw compose and external servers
xenonwellz Nov 9, 2024
65ee0a3
fix(builder): created processed file in the same directory as main st…
xenonwellz Nov 11, 2024
79b7335
Merge branch 'canary' into feat/stack-env-support
Siumauricio Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions packages/server/src/utils/builders/compose.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,17 @@ export const createCommand = (compose: ComposeNested) => {

let path = "";

if (sourceType !== "raw") {
path = compose.composePath;
} else {
if (sourceType === "raw") {
path =
composeType === "stack"
? "docker-compose.processed.yml"
: "docker-compose.yml";
} else {
path = compose.composePath;
}

console.log(path);
xenonwellz marked this conversation as resolved.
Show resolved Hide resolved

let command = "";

if (composeType === "docker-compose") {
Expand Down Expand Up @@ -203,11 +205,12 @@ const createEnvFile = (compose: ComposeNested) => {

export const processComposeFile = async (compose: ComposeNested) => {
const { COMPOSE_PATH } = paths();
const command = getProcessComposeFileCommand(compose);

await execAsync(command, {
cwd: join(COMPOSE_PATH, compose.appName, "code"),
});
if (compose.composeType === "stack") {
const command = getProcessComposeFileCommand(compose);
await execAsync(command, {
cwd: join(COMPOSE_PATH, compose.appName, "code"),
});
}
};

export const getProcessComposeFileCommand = (compose: ComposeNested) => {
Expand Down