Fix url and add node container internal ip (#1477)

framework/components/clnode/clnode.go

@@ -71,6 +71,7 @@ type NodeOut struct {
 	HostURL         string `toml:"url"`
 	DockerURL       string `toml:"docker_internal_url"`
 	DockerP2PUrl    string `toml:"p2p_docker_internal_url"`
+	InternalIP      string `toml:"internal_ip"`
 }
 
 // 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) {
 	if err != nil {
 		return nil, err
 	}
+	ip, err := c.ContainerIP(ctx)
+	if err != nil {
+		return nil, err
+	}
 	host, err := framework.GetHost(c)
 	if err != nil {
 		return nil, err
@@ -315,6 +320,7 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
 		HostURL:         fmt.Sprintf("http://%s:%s", host, mp.Port()),
 		DockerURL:       fmt.Sprintf("http://%s:%s", containerName, DefaultHTTPPort),
 		DockerP2PUrl:    fmt.Sprintf("http://%s:%s", containerName, DefaultP2PPort),
+		InternalIP:      ip,
 	}, nil
 }
 

framework/components/jd/jd.go

@@ -121,10 +121,10 @@ func NewJD(in *Input) (*Output, error) {
 	}
 	out := &Output{
 		UseCache:       true,
-		HostGRPCUrl:    fmt.Sprintf("http://%s:%s", host, in.GRPCPort),
-		DockerGRPCUrl:  fmt.Sprintf("http://%s:%s", containerName, in.GRPCPort),
-		HostWSRPCUrl:   fmt.Sprintf("ws://%s:%s", host, in.WSRPCPort),
-		DockerWSRPCUrl: fmt.Sprintf("ws://%s:%s", containerName, in.WSRPCPort),
+		HostGRPCUrl:    fmt.Sprintf("%s:%s", host, in.GRPCPort),
+		DockerGRPCUrl:  fmt.Sprintf("%s:%s", containerName, in.GRPCPort),
+		HostWSRPCUrl:   fmt.Sprintf("%s:%s", host, in.WSRPCPort),
+		DockerWSRPCUrl: fmt.Sprintf("%s:%s", containerName, in.WSRPCPort),
 	}
 	in.Out = out
 	return out, nil