andwati/dokploy
1
0
Fork 0
mirror of https://github.com/andwati/dokploy.git synced 2026-11-13 23:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2527 from Dokploy/fix/connect-network-after-creation-remote-servers

Browse Source 
Fix/connect network after creation remote servers
This commit is contained in:
Mauricio Siu
2025-09-05 01:52:54 -06:00
committed by GitHub
parent e637a4ad99 3662c1a684
commit 3891798b17
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/services/settings.ts
+5 -1
View File
@@ -277,6 +277,7 @@ export const getDockerResourceType = async (
const { stdout } = await execAsync(command); const { stdout } = await execAsync(command);
result = stdout.trim(); result = stdout.trim();
} }
console.log("result", result);
if (result === "service") { if (result === "service") {
return "service"; return "service";
} }
@@ -291,11 +292,14 @@ export const reloadDockerResource = async (
serverId?: string, serverId?: string,
) => { ) => {
const resourceType = await getDockerResourceType(resourceName, serverId); const resourceType = await getDockerResourceType(resourceName, serverId);
console.log("resourceType", resourceType);
let command = ""; let command = "";
if (resourceType === "service") { if (resourceType === "service") {
command = `docker service update --force ${resourceName}`; command = `docker service update --force ${resourceName}`;
} else { } else if (resourceType === "standalone") {
command = `docker restart ${resourceName}`; command = `docker restart ${resourceName}`;
} else {
throw new Error("Resource type not found");
} }
if (serverId) { if (serverId) {
await execAsyncRemote(serverId, command); await execAsyncRemote(serverId, command);
packages/server/src/setup/server-setup.ts
+3 -2
View File
@@ -578,8 +578,7 @@ export const createTraefikInstance = () => {
TRAEFIK_VERSION=${TRAEFIK_VERSION} TRAEFIK_VERSION=${TRAEFIK_VERSION}
docker run -d \ docker run -d \
--name dokploy-traefik \ --name dokploy-traefik \
--network dokploy-network \ --restart always \
--restart unless-stopped \
-v /etc/dokploy/traefik/traefik.yml:/etc/traefik/traefik.yml \ -v /etc/dokploy/traefik/traefik.yml:/etc/traefik/traefik.yml \
-v /etc/dokploy/traefik/dynamic:/etc/dokploy/traefik/dynamic \ -v /etc/dokploy/traefik/dynamic:/etc/dokploy/traefik/dynamic \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
@@ -587,6 +586,8 @@ export const createTraefikInstance = () => {
-p ${TRAEFIK_PORT}:${TRAEFIK_PORT} \ -p ${TRAEFIK_PORT}:${TRAEFIK_PORT} \
-p ${TRAEFIK_HTTP3_PORT}:${TRAEFIK_HTTP3_PORT}/udp \ -p ${TRAEFIK_HTTP3_PORT}:${TRAEFIK_HTTP3_PORT}/udp \
traefik:v$TRAEFIK_VERSION traefik:v$TRAEFIK_VERSION
docker network connect dokploy-network dokploy-traefik;
echo "Traefik version $TRAEFIK_VERSION installed ✅" echo "Traefik version $TRAEFIK_VERSION installed ✅"
fi fi
`; `;