Skip to content

The Unified and Autonomous Development Platform

Fix issue #606 - Agent ip address is detected incorrectly if agent runs inside container with overlay network

Robin Shen4ada2381d74a
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java
index 104ee0605a..b72486f1a5 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java
@@ -154,7 +154,7 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
agent.setCpu(data.getCpu());
agent.setMemory(data.getMemory());
agent.setTemporal(data.isTemporal());
- agent.setIpAddress(session.getRemoteAddress().getAddress().getHostAddress());
+ agent.setIpAddress(data.getIpAddress());
save(agent);
for (Map.Entry<String, String> entry: data.getAttributes().entrySet()) {
@@ -171,7 +171,7 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
agent.setOsName(data.getOsInfo().getOsName());
agent.setOsVersion(data.getOsInfo().getOsVersion());
agent.setOsArch(data.getOsInfo().getOsArch());
- agent.setIpAddress(session.getRemoteAddress().getAddress().getHostAddress());
+ agent.setIpAddress(data.getIpAddress());
agent.setCpu(data.getCpu());
agent.setMemory(data.getMemory());
agent.setTemporal(data.isTemporal());
diff --git a/server-core/src/main/java/io/onedev/server/model/Agent.java b/server-core/src/main/java/io/onedev/server/model/Agent.java
index 83a5ebff3e..48739f7f90 100644
--- a/server-core/src/main/java/io/onedev/server/model/Agent.java
+++ b/server-core/src/main/java/io/onedev/server/model/Agent.java
@@ -259,7 +259,7 @@ public class Agent extends AbstractEntity {
public AgentData getAgentData() {
return new AgentData(getToken().getValue(), new OsInfo(osName, osVersion, osArch),
- name, cpu, memory, temporal, getAttributeMap());
+ name, ipAddress, cpu, memory, temporal, getAttributeMap());
}
}