andwati/dokploy
1
0
Fork 0
mirror of https://github.com/andwati/dokploy.git synced 2026-10-19 11:42:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Dokploy:canary' into fix/chaining-canary

Browse Source
This commit is contained in:
Philipp Gasser
2026-08-07 13:00:57 +02:00
committed by GitHub
parent ac57e22b87 bcab5b059f
commit fe0a84dde8
14 changed files with 335 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/utils/docker/domain.ts
+11
View File
@@ -220,6 +220,17 @@ export const addDomainToCompose = async (
labels.unshift("traefik.swarm.network=dokploy-network");
}
}
} else {
const isolatedNetwork = compose.suffix || compose.appName;
if (compose.composeType === "docker-compose") {
if (!labels.includes(`traefik.docker.network=${isolatedNetwork}`)) {
labels.unshift(`traefik.docker.network=${isolatedNetwork}`);
}
} else {
if (!labels.includes(`traefik.swarm.network=${isolatedNetwork}`)) {
labels.unshift(`traefik.swarm.network=${isolatedNetwork}`);
}
}
}
}
packages/server/src/utils/schedules/utils.ts
+1 -1
View File
@@ -174,7 +174,7 @@ export const runCommand = async (scheduleId: string) => {
const { SCHEDULES_PATH } = paths(true);
const fullPath = path.join(SCHEDULES_PATH, appName || "");
const command = `
set -e
set -euo pipefail
echo "Running script" >> ${deployment.logPath};
bash -c ${fullPath}/script.sh 2>&1 | tee -a ${deployment.logPath} || {
echo "❌ Command failed" >> ${deployment.logPath};