Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: add dokploy network auutomatically

Browse Source
This commit is contained in:
Mauricio Siu
2024-08-17 00:28:32 -06:00
parent 7497671033
commit ca733addc2
2 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/dokploy/__test__/traefik/traefik.test.ts
View File

@@ -67,6 +67,9 @@ const baseDomain: Domain = {
https: false, https: false,
path: null, path: null,
port: null, port: null,
serviceName: "",
composeId: "",
domainType: "application",
uniqueConfigKey: 1, uniqueConfigKey: 1,
}; };

57
apps/dokploy/server/utils/docker/domain.ts
View File

@@ -106,16 +106,40 @@ export const addDomainToCompose = async (
httpLabels.push(...httpsLabels); httpLabels.push(...httpsLabels);
} }
if (Array.isArray(result.services[serviceName].labels)) { const labels = result.services[serviceName].labels;
const haveTraefikEnableLabel = result.services[
serviceName
].labels.includes("traefik.enable=true");
if (!haveTraefikEnableLabel) { if (Array.isArray(labels)) {
result.services[serviceName].labels.push("traefik.enable=true"); if (!labels.includes("traefik.enable=true")) {
labels.push("traefik.enable=true");
} }
result.services[serviceName].labels.push(...httpLabels); labels.push(...httpLabels);
} }
// Add the dokploy-network to the service but first check if it exists
if (!result.services[serviceName].networks) {
result.services[serviceName].networks = [];
}
const networks = result.services[serviceName].networks;
if (Array.isArray(networks)) {
if (!networks.includes("dokploy-network")) {
networks.push("dokploy-network");
}
} else if (networks && typeof networks === "object") {
if (!("dokploy-network" in networks)) {
networks["dokploy-network"] = {};
}
}
}
// Add dokploy-network to the root of the compose file
if (!result.networks) {
result.networks = {};
}
if (!result.networks["dokploy-network"]) {
result.networks["dokploy-network"] = {
external: true,
};
} }
return result; return result;
@@ -143,26 +167,29 @@ export const createDomainLabels = async (
entrypoint: "web" | "websecure", entrypoint: "web" | "websecure",
) => { ) => {
const { host, port, https, uniqueConfigKey, certificateType } = domain; const { host, port, https, uniqueConfigKey, certificateType } = domain;
const routerName = `${appName}-${uniqueConfigKey}-${entrypoint}`;
const labels = [ const labels = [
`traefik.http.routers.${appName}-${uniqueConfigKey}-${entrypoint}.rule=Host(\`${host}\`)`, `traefik.http.routers.${routerName}.rule=Host(\`${host}\`)`,
`traefik.http.services.${appName}-${uniqueConfigKey}-${entrypoint}.loadbalancer.server.port=${port}`, `traefik.http.routers.${routerName}.entrypoints=${entrypoint}`,
`traefik.http.routers.${appName}-${uniqueConfigKey}-${entrypoint}.entrypoints=${entrypoint}`,
]; ];
if (entrypoint === "web") {
labels.push(
`traefik.http.services.${routerName}.loadbalancer.server.port=${port}`,
);
}
if (entrypoint === "web" && https) { if (entrypoint === "web" && https) {
labels.push( labels.push(
"traefik.http.routers.redirect-to-https.middlewares=redirect-to-https", `traefik.http.routers.${routerName}.middlewares=redirect-to-https@file`,
); );
} }
if (entrypoint === "websecure") { if (entrypoint === "websecure") {
if (certificateType === "letsencrypt") { if (certificateType === "letsencrypt") {
labels.push( labels.push(
"traefik.http.routers.letsencrypt.tls.certresolver=letsencrypt", `traefik.http.routers.${routerName}.tls.certresolver=letsencrypt`,
); );
} else if (certificateType === "none") {
labels.push("traefik.http.routers.letsencrypt.tls=null");
} }
} }