bring the whole setup back

Author: skudasov

framework/components/clnode/clnode.go

@@ -184,9 +184,9 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
 		Name:            containerName,
 		Labels:          framework.DefaultTCLabels(),
 		Networks:        []string{framework.DefaultNetworkName},
-		//NetworkAliases: map[string][]string{
-		//	framework.DefaultNetworkName: {containerName},
-		//},
+		NetworkAliases: map[string][]string{
+			framework.DefaultNetworkName: {containerName},
+		},
 		ExposedPorts: exposedPorts,
 		Entrypoint: []string{
 			"/bin/sh", "-c",
@@ -295,8 +295,8 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
 		ContainerName:   containerName,
 		InternalIP:      ip,
 		HostURL:         fmt.Sprintf("http://%s:%s", host, mp.Port()),
-		DockerURL:       fmt.Sprintf("http://%s:%s", ip, DefaultHTTPPort),
-		DockerP2PUrl:    fmt.Sprintf("http://%s:%s", ip, DefaultP2PPort),
+		DockerURL:       fmt.Sprintf("http://%s:%s", host, DefaultHTTPPort),
+		DockerP2PUrl:    fmt.Sprintf("http://%s:%s", host, DefaultP2PPort),
 	}, nil
 }
 

framework/config.go

@@ -11,15 +11,15 @@ import (
 	"github.com/pelletier/go-toml/v2"
 	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/require"
+	"github.com/testcontainers/testcontainers-go"
+	"github.com/testcontainers/testcontainers-go/network"
 	"os"
 	"path/filepath"
 	"strings"
 	"sync"
 	"testing"
 	"text/template"
 	"time"
-
-	tc "github.com/testcontainers/testcontainers-go"
 )
 
 const (
@@ -146,22 +146,14 @@ func Load[X any](t *testing.T) (*X, error) {
 }
 
 func DefaultNetwork(once *sync.Once) error {
+	var net *testcontainers.DockerNetwork
 	var err error
-	name := "ctf"
 	once.Do(func() {
-		f := false
-		//nolint:staticcheck
-		_, err := tc.GenericNetwork(context.Background(), tc.GenericNetworkRequest{
-			//nolint:staticcheck
-			NetworkRequest: tc.NetworkRequest{
-				Name:       name,
-				EnableIPv6: &f,
-			},
-		})
-		if err != nil {
-			panic(fmt.Errorf("failed to create default network: %w", err))
-		}
-		DefaultNetworkName = name
+		net, err = network.New(
+			context.Background(),
+			network.WithLabels(map[string]string{"framework": "ctf"}),
+		)
+		DefaultNetworkName = net.Name
 	})
 	return err
 }