Skip to content

Commit b8d9ce1

Browse files
committed
Fix url and add node container internal ip
1 parent 11410d9 commit b8d9ce1

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

framework/components/clnode/clnode.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ type NodeOut struct {
7171
HostURL string `toml:"url"`
7272
DockerURL string `toml:"docker_internal_url"`
7373
DockerP2PUrl string `toml:"p2p_docker_internal_url"`
74+
InternalIP string `toml:"internal_ip"`
7475
}
7576

7677
// NewNodeWithDB create a new Chainlink node with some image:tag and one or several configs
@@ -301,6 +302,10 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
301302
if err != nil {
302303
return nil, err
303304
}
305+
ip, err := c.ContainerIP(ctx)
306+
if err != nil {
307+
return nil, err
308+
}
304309
host, err := framework.GetHost(c)
305310
if err != nil {
306311
return nil, err
@@ -315,6 +320,7 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
315320
HostURL: fmt.Sprintf("http://%s:%s", host, mp.Port()),
316321
DockerURL: fmt.Sprintf("http://%s:%s", containerName, DefaultHTTPPort),
317322
DockerP2PUrl: fmt.Sprintf("http://%s:%s", containerName, DefaultP2PPort),
323+
InternalIP: ip,
318324
}, nil
319325
}
320326

framework/components/jd/jd.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ func NewJD(in *Input) (*Output, error) {
121121
}
122122
out := &Output{
123123
UseCache: true,
124-
HostGRPCUrl: fmt.Sprintf("http://%s:%s", host, in.GRPCPort),
125-
DockerGRPCUrl: fmt.Sprintf("http://%s:%s", containerName, in.GRPCPort),
126-
HostWSRPCUrl: fmt.Sprintf("ws://%s:%s", host, in.WSRPCPort),
127-
DockerWSRPCUrl: fmt.Sprintf("ws://%s:%s", containerName, in.WSRPCPort),
124+
HostGRPCUrl: fmt.Sprintf("%s:%s", host, in.GRPCPort),
125+
DockerGRPCUrl: fmt.Sprintf("%s:%s", containerName, in.GRPCPort),
126+
HostWSRPCUrl: fmt.Sprintf("%s:%s", host, in.WSRPCPort),
127+
DockerWSRPCUrl: fmt.Sprintf("%s:%s", containerName, in.WSRPCPort),
128128
}
129129
in.Out = out
130130
return out, nil

0 commit comments

Comments
 (0)