fix: use swarm advertise address in docker swarm join command (#4567)

This commit is contained in:
Mauricio Siu
2026-06-07 00:15:09 -06:00
committed by GitHub
parent 0f76d8f385
commit 4900204107

View File

@@ -96,9 +96,11 @@ export const clusterRouter = createTRPCRouter({
const docker = await getRemoteDocker(input.serverId); const docker = await getRemoteDocker(input.serverId);
const result = await docker.swarmInspect(); const result = await docker.swarmInspect();
const docker_version = await docker.version(); const docker_version = await docker.version();
const info = await docker.info();
let ip = await getLocalServerIp(); const swarmNodeAddr = info?.Swarm?.NodeAddr;
if (input.serverId) { let ip = swarmNodeAddr || (await getLocalServerIp());
if (!swarmNodeAddr && input.serverId) {
const server = await findServerById(input.serverId); const server = await findServerById(input.serverId);
ip = server?.ipAddress; ip = server?.ipAddress;
} }
@@ -128,9 +130,11 @@ export const clusterRouter = createTRPCRouter({
const docker = await getRemoteDocker(input.serverId); const docker = await getRemoteDocker(input.serverId);
const result = await docker.swarmInspect(); const result = await docker.swarmInspect();
const docker_version = await docker.version(); const docker_version = await docker.version();
const info = await docker.info();
let ip = await getLocalServerIp(); const swarmNodeAddr = info?.Swarm?.NodeAddr;
if (input.serverId) { let ip = swarmNodeAddr || (await getLocalServerIp());
if (!swarmNodeAddr && input.serverId) {
const server = await findServerById(input.serverId); const server = await findServerById(input.serverId);
ip = server?.ipAddress; ip = server?.ipAddress;
} }