From bd49a7bdad243f454ba5fa430c29af51df58e8d8 Mon Sep 17 00:00:00 2001
From: jchappelow <140431406+jchappelow@users.noreply.github.com>
Date: Fri, 20 Sep 2024 18:13:01 -0500
Subject: [PATCH] ci: non-overlapping net for gh actions (#1006)

* ci: EXPERIMENT with non-overlapping net for gh actions
* no ipv6
---
 test/go.mod             |  2 +-
 test/utils/container.go | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/test/go.mod b/test/go.mod
index 3f7e72380..aa6149de9 100644
--- a/test/go.mod
+++ b/test/go.mod
@@ -12,6 +12,7 @@ replace (
 
 require (
 	github.com/cometbft/cometbft v0.38.12
+	github.com/docker/docker v26.1.5+incompatible
 	github.com/docker/go-connections v0.5.0
 	github.com/drhodes/golorem v0.0.0-20220328165741-da82e5b29246
 	github.com/ethereum/go-ethereum v1.14.8
@@ -91,7 +92,6 @@ require (
 	github.com/docker/cli v26.1.2+incompatible // indirect
 	github.com/docker/compose/v2 v2.27.0 // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/docker v26.1.5+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.8.1 // indirect
 	github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
diff --git a/test/utils/container.go b/test/utils/container.go
index f0e6733f2..62da234c2 100644
--- a/test/utils/container.go
+++ b/test/utils/container.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strings"
 
+	dockerNet "github.com/docker/docker/api/types/network"
 	"github.com/docker/go-connections/nat"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/network"
@@ -16,6 +17,15 @@ func EnsureNetworkExist(ctx context.Context, testName string) (
 	net, err := network.New(ctx,
 		network.WithCheckDuplicate(),
 		network.WithAttachable(),
+		network.WithIPAM(&dockerNet.IPAM{
+			Driver:  "default",
+			Options: map[string]string{},
+			Config: []dockerNet.IPAMConfig{
+				{
+					Subnet: "10.9.0.0/16",
+				},
+			},
+		}),
 		//network.WithInternal(), // we need to expose the network to the host
 		network.WithLabels(map[string]string{"test": "integration"}),
 		network.WithDriver("bridge"),