Skip to content

Commit 5ceb88b

Browse files
committed
fix(compose): regenerate mapping domain labels
1 parent 92b628c commit 5ceb88b

2 files changed

Lines changed: 73 additions & 22 deletions

File tree

‎apps/dokploy/__test__/compose/domain/enabled-filter.test.ts‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,59 @@ describe("addDomainToCompose enabled filtering", () => {
237237
},
238238
);
239239

240+
it.each([
241+
[
242+
"docker-compose",
243+
`services:
244+
frigate:
245+
image: frigate
246+
labels:
247+
traefik.enable: "true"
248+
traefik.http.routers.test-app-1-web.rule: Host(\`old.example.com\`)
249+
traefik.http.services.test-app-1-web.loadbalancer.server.port: 8971
250+
custom.label: preserved
251+
`,
252+
"traefik.docker.network",
253+
],
254+
[
255+
"stack",
256+
`services:
257+
frigate:
258+
image: frigate
259+
deploy:
260+
labels:
261+
traefik.enable: "true"
262+
traefik.http.routers.test-app-1-web.rule: Host(\`old.example.com\`)
263+
traefik.http.services.test-app-1-web.loadbalancer.server.port: 8971
264+
custom.label: preserved
265+
`,
266+
"traefik.swarm.network",
267+
],
268+
] as const)(
269+
"regenerates routing in mapping labels for an enabled domain in %s",
270+
async (composeType, mappingComposeYaml, networkLabel) => {
271+
composeYaml = mappingComposeYaml;
272+
273+
const result = await addDomainToCompose({ ...baseCompose, composeType }, [
274+
{ ...baseDomain, enabled: true },
275+
]);
276+
277+
const service = result?.services?.frigate;
278+
const labels =
279+
composeType === "docker-compose"
280+
? service?.labels
281+
: service?.deploy?.labels;
282+
expect(labels).toMatchObject({
283+
"custom.label": "preserved",
284+
"traefik.enable": "true",
285+
[networkLabel]: "dokploy-network",
286+
"traefik.http.routers.test-app-1-web.rule":
287+
"Host(`frigate.example.com`)",
288+
"traefik.http.services.test-app-1-web.loadbalancer.server.port": "8971",
289+
});
290+
},
291+
);
292+
240293
it("emits labels only for the enabled domain when both are present", async () => {
241294
const result = await addDomainToCompose(baseCompose, [
242295
{ ...baseDomain, host: "enabled.example.com", enabled: true },

‎packages/server/src/utils/docker/domain.ts‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -282,33 +282,31 @@ export const addDomainToCompose = async (
282282
labels = result.services[serviceName].deploy.labels;
283283
}
284284

285+
const networkLabel =
286+
compose.composeType === "docker-compose"
287+
? "traefik.docker.network"
288+
: "traefik.swarm.network";
289+
const networkName = compose.isolatedDeployment
290+
? compose.suffix || compose.appName
291+
: "dokploy-network";
292+
285293
if (Array.isArray(labels)) {
286294
if (!labels.includes("traefik.enable=true")) {
287295
labels.unshift("traefik.enable=true");
288296
}
289297
labels.unshift(...httpLabels);
290-
if (!compose.isolatedDeployment) {
291-
if (compose.composeType === "docker-compose") {
292-
if (!labels.includes("traefik.docker.network=dokploy-network")) {
293-
labels.unshift("traefik.docker.network=dokploy-network");
294-
}
295-
} else {
296-
// Stack Case
297-
if (!labels.includes("traefik.swarm.network=dokploy-network")) {
298-
labels.unshift("traefik.swarm.network=dokploy-network");
299-
}
300-
}
301-
} else {
302-
const isolatedNetwork = compose.suffix || compose.appName;
303-
if (compose.composeType === "docker-compose") {
304-
if (!labels.includes(`traefik.docker.network=${isolatedNetwork}`)) {
305-
labels.unshift(`traefik.docker.network=${isolatedNetwork}`);
306-
}
307-
} else {
308-
if (!labels.includes(`traefik.swarm.network=${isolatedNetwork}`)) {
309-
labels.unshift(`traefik.swarm.network=${isolatedNetwork}`);
310-
}
311-
}
298+
const networkLabelEntry = `${networkLabel}=${networkName}`;
299+
if (!labels.includes(networkLabelEntry)) {
300+
labels.unshift(networkLabelEntry);
301+
}
302+
} else if (labels) {
303+
labels["traefik.enable"] = "true";
304+
labels[networkLabel] = networkName;
305+
for (const label of httpLabels) {
306+
const separatorIndex = label.indexOf("=");
307+
labels[label.slice(0, separatorIndex)] = label.slice(
308+
separatorIndex + 1,
309+
);
312310
}
313311
}
314312

0 commit comments

Comments
 (0)