Cleanup

kalverra · kalverra · commit 8f3a11d2826a · 2024-10-28T14:12:40.000-04:00
diff --git a/lib/README.md b/lib/README.md
@@ -413,7 +413,7 @@ Basic and universal building blocks for TOML-based config are provided by `confi
 
 An ecr mirror can be used to push images used often in order to bypass rate limit issues from dockerhub. The list of image mirrors can be found in the [matrix here](./.github/workflows/update-internal-mirrors.yaml). This currently works with images with version numbers in dockerhub. Support for gcr is coming in the future. The images must also have a version number so putting `latest` will not work. We have a separate list for one offs we want that can be added to [here](./scripts/mirror.json) that does work with gcr and latest images. Note however for `latest` it will only pull it once and will not update it in our mirror if the latest on the public repository has changed, in this case it is preferable to update it manually when you know that you need the new latest and the update will not break your tests.
 
-For images in the mirrors you can use the INTERNAL_DOCKER_REPO environment variable when running tests and it will use that mirror in place of the public repository.
+For images in the mirrors you can use the TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX environment variable when running tests and it will use that mirror in place of the public repository.
 
 We have two ways to add new images to the ecr. The first two requirements are that you create the ecr repository with the same name as the one in dockerhub out in aws and then add that ecr to the infra permissions (ask TT if you don't know how to do this).
 
diff --git a/lib/docker/docker.go b/lib/docker/docker.go
@@ -1,51 +1,25 @@
 package docker
 
 import (
-	"fmt"
+	"context"
 	"strings"
 
-	"github.com/google/uuid"
 	"github.com/rs/zerolog"
 	tc "github.com/testcontainers/testcontainers-go"
+	tc_network "github.com/testcontainers/testcontainers-go/network"
 
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
 )
 
 const RetryAttempts = 3
-const defaultRyukImage = "testcontainers/ryuk:0.5.1"
 
 func CreateNetwork(l zerolog.Logger) (*tc.DockerNetwork, error) {
-	uuidObj, _ := uuid.NewRandom()
-	var networkName = fmt.Sprintf("network-%s", uuidObj.String())
-	ryukImage := mirror.AddMirrorToImageIfSet(defaultRyukImage)
-	// currently there's no way to use custom Ryuk image with testcontainers-go v0.28.0 :/
-	// but we can go around it, by setting TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX env var to
-	// our custom registry and then using the default Ryuk image
-	//nolint:staticcheck
-	reaperCO := tc.WithImageName(ryukImage)
-	f := false
-	//nolint:staticcheck
-	network, err := tc.GenericNetwork(testcontext.Get(nil), tc.GenericNetworkRequest{
-		//nolint:staticcheck
-		NetworkRequest: tc.NetworkRequest{
-			Name:           networkName,
-			CheckDuplicate: true,
-			EnableIPv6:     &f, // disabling due to https://github.com/moby/moby/issues/42442
-			ReaperOptions: []tc.ContainerOption{
-				reaperCO,
-			},
-		},
-	})
+	network, err := tc_network.New(context.Background())
 	if err != nil {
 		return nil, err
 	}
-	dockerNetwork, ok := network.(*tc.DockerNetwork)
-	if !ok {
-		return nil, fmt.Errorf("failed to cast network to *dockertest.Network")
-	}
-	l.Trace().Any("network", dockerNetwork).Msgf("created network")
-	return dockerNetwork, nil
+	l.Trace().Str("Name", network.Name).Msg("Created network")
+	return network, nil
 }
 
 type StartContainerRetrier func(l zerolog.Logger, startErr error, req tc.GenericContainerRequest) (tc.Container, error)
diff --git a/lib/docker/test_env/besu_eth1.go b/lib/docker/test_env/besu_eth1.go
@@ -17,7 +17,6 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/config"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker/ethereum"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/templates"
 )
 
@@ -46,9 +45,6 @@ func NewBesuEth1(networks []string, chainConfig *config.EthereumChainConfig, opt
 		g.EnvComponent.ContainerName = fmt.Sprintf("%s-%s-%s", "besu-eth1", strings.Replace(g.ContainerVersion, ".", "_", -1), uuid.NewString()[0:8])
 	}
 
-	// if the internal docker repo is set then add it to the version
-	g.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(g.EnvComponent.ContainerImage)
-
 	return g, nil
 }
 
diff --git a/lib/docker/test_env/besu_eth2.go b/lib/docker/test_env/besu_eth2.go
@@ -17,7 +17,6 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/config"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker/ethereum"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 	docker_utils "github.com/smartcontractkit/chainlink-testing-framework/lib/utils/docker"
 )
 
@@ -47,8 +46,6 @@ func NewBesuEth2(networks []string, chainConfig *config.EthereumChainConfig, gen
 		// set the container name again after applying functional options as version might have changed
 		g.EnvComponent.ContainerName = fmt.Sprintf("%s-%s-%s", "besu-eth2", strings.Replace(g.ContainerVersion, ".", "_", -1), uuid.NewString()[0:8])
 	}
-	// if the internal docker repo is set then add it to the version
-	g.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(g.EnvComponent.ContainerImage)
 
 	return g, nil
 }
diff --git a/lib/docker/test_env/erigon_eth1.go b/lib/docker/test_env/erigon_eth1.go
@@ -18,7 +18,6 @@ import (
 	config_types "github.com/smartcontractkit/chainlink-testing-framework/lib/config/types"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker/ethereum"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/templates"
 )
 
@@ -46,8 +45,6 @@ func NewErigonEth1(networks []string, chainConfig *config.EthereumChainConfig, o
 		// set the container name again after applying functional options as version might have changed
 		g.EnvComponent.ContainerName = fmt.Sprintf("%s-%s-%s", "erigon-eth1", strings.Replace(g.ContainerVersion, ".", "_", -1), uuid.NewString()[0:8])
 	}
-	// if the internal docker repo is set then add it to the version
-	g.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(g.EnvComponent.ContainerImage)
 	return g, nil
 }
 
diff --git a/lib/docker/test_env/erigon_eth2.go b/lib/docker/test_env/erigon_eth2.go
@@ -18,7 +18,6 @@ import (
 	config_types "github.com/smartcontractkit/chainlink-testing-framework/lib/config/types"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker/ethereum"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 )
 
 // NewErigonEth2 starts a new Erigon Eth2 node running in Docker
@@ -47,8 +46,6 @@ func NewErigonEth2(networks []string, chainConfig *config.EthereumChainConfig, g
 		// set the container name again after applying functional options as version might have changed
 		g.EnvComponent.ContainerName = fmt.Sprintf("%s-%s-%s", "erigon-eth2", strings.Replace(g.ContainerVersion, ".", "_", -1), uuid.NewString()[0:8])
 	}
-	// if the internal docker repo is set then add it to the version
-	g.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(g.EnvComponent.ContainerImage)
 	return g, nil
 }
 
diff --git a/lib/docker/test_env/genesis_generator.go b/lib/docker/test_env/genesis_generator.go
@@ -19,7 +19,6 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker/ethereum"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 )
 
 var generatorForkToImageMap = map[ethereum.Fork]string{
@@ -69,8 +68,6 @@ func NewEthGenesisGenerator(chainConfig config.EthereumChainConfig, generatedDat
 	for _, opt := range opts {
 		opt(&g.EnvComponent)
 	}
-	// if the internal docker repo is set then add it to the version
-	g.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(g.EnvComponent.ContainerImage)
 	return g, nil
 }
 
diff --git a/lib/docker/test_env/geth_eth1.go b/lib/docker/test_env/geth_eth1.go
@@ -18,7 +18,6 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/config"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker/ethereum"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/templates"
 )
 
@@ -46,8 +45,6 @@ func NewGethEth1(networks []string, chainConfig *config.EthereumChainConfig, opt
 		// set the container name again after applying functional options as version might have changed
 		g.EnvComponent.ContainerName = fmt.Sprintf("%s-%s-%s", "geth-eth1", strings.Replace(g.ContainerVersion, ".", "_", -1), uuid.NewString()[0:8])
 	}
-	// if the internal docker repo is set then add it to the version
-	g.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(g.EnvComponent.ContainerImage)
 	return g
 }
 
diff --git a/lib/docker/test_env/geth_eth2.go b/lib/docker/test_env/geth_eth2.go
@@ -19,7 +19,6 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/config"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker/ethereum"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 )
 
 // NewGethEth2 starts a new Geth Eth2 node running in Docker
@@ -48,8 +47,6 @@ func NewGethEth2(networks []string, chainConfig *config.EthereumChainConfig, gen
 		// set the container name again after applying functional options as version might have changed
 		g.EnvComponent.ContainerName = fmt.Sprintf("%s-%s-%s", "geth-eth2", strings.Replace(g.ContainerVersion, ".", "_", -1), uuid.NewString()[0:8])
 	}
-	// if the internal docker repo is set then add it to the version
-	g.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(g.EnvComponent.ContainerImage)
 	return g, nil
 }
 
diff --git a/lib/docker/test_env/kafka.go b/lib/docker/test_env/kafka.go
@@ -17,7 +17,6 @@ import (
 
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
 )
 
@@ -162,10 +161,9 @@ func (k *Kafka) CreateLocalTopics() error {
 }
 
 func (k *Kafka) getContainerRequest() (tc.ContainerRequest, error) {
-	kafkaImage := mirror.AddMirrorToImageIfSet(defaultKafkaImage)
 	return tc.ContainerRequest{
 		Name:         k.ContainerName,
-		Image:        kafkaImage,
+		Image:        defaultKafkaImage,
 		ExposedPorts: []string{"29092/tcp"},
 		Env:          k.EnvVars,
 		Networks:     k.Networks,
diff --git a/lib/docker/test_env/killgrave.go b/lib/docker/test_env/killgrave.go
@@ -19,7 +19,6 @@ import (
 	tc "github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
 
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/k8s/config"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
 )
@@ -148,14 +147,7 @@ func (k *Killgrave) StartContainer() error {
 
 func (k *Killgrave) getContainerRequest() (tc.ContainerRequest, error) {
 	// TT-1290 Temporary work around using fork of killgrave, uncomment line below when fork is merged
-	// killgraveImage := mirror.AddMirrorToImageIfSet(defaultKillgraveImage)
-	// TT-1290 Temporary code to set image to the fork or the ecr mirror depending on the config
 	killgraveImage := "tateexon/killgrave:v0.5.1-request-dump"
-	ecr := os.Getenv(config.EnvVarInternalDockerRepo)
-	if ecr != "" {
-		killgraveImage = fmt.Sprintf("%s/%s", ecr, defaultKillgraveImage)
-	}
-	// end temporary code
 
 	return tc.ContainerRequest{
 		Name:         k.ContainerName,
diff --git a/lib/docker/test_env/mockserver.go b/lib/docker/test_env/mockserver.go
@@ -16,7 +16,6 @@ import (
 	ctfClient "github.com/smartcontractkit/chainlink-testing-framework/lib/client"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
 )
 
@@ -110,11 +109,9 @@ func (ms *MockServer) StartContainer() error {
 }
 
 func (ms *MockServer) getContainerRequest() (tc.ContainerRequest, error) {
-	msImage := mirror.AddMirrorToImageIfSet(defaultMockServerImage)
-
 	return tc.ContainerRequest{
 		Name:         ms.ContainerName,
-		Image:        msImage,
+		Image:        defaultMockServerImage,
 		ExposedPorts: []string{"1080/tcp"},
 		Env: map[string]string{
 			"SERVER_PORT": "1080",
diff --git a/lib/docker/test_env/nethermind_eth1.go b/lib/docker/test_env/nethermind_eth1.go
@@ -18,7 +18,6 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/config"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker/ethereum"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/templates"
 )
 
@@ -46,8 +45,6 @@ func NewNethermindEth1(networks []string, chainConfig *config.EthereumChainConfi
 		// set the container name again after applying functional options as version might have changed
 		g.EnvComponent.ContainerName = fmt.Sprintf("%s-%s-%s", "nethermind-eth1", strings.Replace(g.ContainerVersion, ".", "_", -1), uuid.NewString()[0:8])
 	}
-	// if the internal docker repo is set then add it to the version
-	g.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(g.EnvComponent.ContainerImage)
 	return g, nil
 }
 
diff --git a/lib/docker/test_env/nethermind_eth2.go b/lib/docker/test_env/nethermind_eth2.go
@@ -17,7 +17,6 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/config"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker/ethereum"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 )
 
 // NewNethermindEth2 starts a new Nethermin Eth2 node running in Docker
@@ -46,8 +45,6 @@ func NewNethermindEth2(networks []string, chainConfig *config.EthereumChainConfi
 		// set the container name again after applying functional options as version might have changed
 		g.EnvComponent.ContainerName = fmt.Sprintf("%s-%s-%s", "nethermind-eth2", strings.Replace(g.ContainerVersion, ".", "_", -1), uuid.NewString()[0:8])
 	}
-	// if the internal docker repo is set then add it to the version
-	g.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(g.EnvComponent.ContainerImage)
 	return g, nil
 }
 
diff --git a/lib/docker/test_env/postgres.go b/lib/docker/test_env/postgres.go
@@ -22,7 +22,6 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logstream"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
 )
 
@@ -111,9 +110,6 @@ func NewPostgresDb(networks []string, opts ...PostgresDbOption) (*PostgresDb, er
 		opt(pg)
 	}
 
-	// if the internal docker repo is set then add it to the version
-	pg.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(pg.EnvComponent.ContainerImage)
-
 	// Set default container envs
 	pg.ContainerEnvs["POSTGRES_USER"] = pg.User
 	pg.ContainerEnvs["POSTGRES_DB"] = pg.DbName
diff --git a/lib/docker/test_env/prysm.go b/lib/docker/test_env/prysm.go
@@ -17,7 +17,6 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker/ethereum"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
 )
 
@@ -72,8 +71,6 @@ func NewPrysmBeaconChain(networks []string, chainConfig *config.EthereumChainCon
 	for _, opt := range opts {
 		opt(&g.EnvComponent)
 	}
-	// if the internal docker repo is set then add it to the version
-	g.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(g.EnvComponent.ContainerImage)
 	return g, nil
 }
 
@@ -210,8 +207,6 @@ func NewPrysmValidator(networks []string, chainConfig *config.EthereumChainConfi
 	for _, opt := range opts {
 		opt(&g.EnvComponent)
 	}
-	// if the internal docker repo is set then add it to the version
-	g.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(g.EnvComponent.ContainerImage)
 	return g, nil
 }
 
diff --git a/lib/docker/test_env/reth_eth2.go b/lib/docker/test_env/reth_eth2.go
@@ -19,7 +19,6 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/config"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker/ethereum"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 )
 
 // NewRethEth2 starts a new Reth Eth2 node running in Docker
@@ -49,8 +48,6 @@ func NewRethEth2(networks []string, chainConfig *config.EthereumChainConfig, gen
 		// set the container name again after applying functional options as version might have changed
 		g.EnvComponent.ContainerName = fmt.Sprintf("%s-%s-%s", "reth-eth2", strings.Replace(g.ContainerVersion, ".", "_", -1), uuid.NewString()[0:8])
 	}
-	// if the internal docker repo is set then add it to the version
-	g.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(g.EnvComponent.ContainerImage)
 	return g, nil
 }
 
diff --git a/lib/docker/test_env/schema_registry.go b/lib/docker/test_env/schema_registry.go
@@ -12,7 +12,6 @@ import (
 	tcwait "github.com/testcontainers/testcontainers-go/wait"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
 )
 
@@ -110,10 +109,9 @@ func (r *SchemaRegistry) StartContainer() error {
 }
 
 func (r *SchemaRegistry) getContainerRequest() (tc.ContainerRequest, error) {
-	schemaImage := mirror.AddMirrorToImageIfSet(defaultSchemaRegistryImage)
 	return tc.ContainerRequest{
 		Name:         r.ContainerName,
-		Image:        schemaImage,
+		Image:        defaultSchemaRegistryImage,
 		ExposedPorts: []string{"8081/tcp"},
 		Env:          r.EnvVars,
 		Networks:     r.Networks,
diff --git a/lib/docker/test_env/validator_keys_generator.go b/lib/docker/test_env/validator_keys_generator.go
@@ -16,7 +16,6 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/config"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"
 )
 
 const defaultEth2ValToolsImage = "protolambda/eth2-val-tools:latest"
@@ -48,9 +47,6 @@ func NewValKeysGeneretor(chainConfig *config.EthereumChainConfig, valKeysHostDat
 	for _, opt := range opts {
 		opt(&g.EnvComponent)
 	}
-
-	// if the internal docker repo is set then add it to the version
-	g.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(g.EnvComponent.ContainerImage)
 	return g, nil
 }
 
diff --git a/lib/docker/test_env/zookeeper.go b/lib/docker/test_env/zookeeper.go
diff --git a/lib/k8s/config/overrides.go b/lib/k8s/config/overrides.go
diff --git a/lib/k8s/environment/runner.go b/lib/k8s/environment/runner.go
diff --git a/lib/mirror/mirror.go b/lib/mirror/mirror.go

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ import (`
`17`	`17`	`"github.com/smartcontractkit/chainlink-testing-framework/lib/config"`
`18`	`18`	`"github.com/smartcontractkit/chainlink-testing-framework/lib/docker/ethereum"`
`19`	`19`	`"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"`
`20`		`- "github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"`
`21`	`20`	`"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/templates"`
`22`	`21`	`)`
`23`	`22`
`@@ -46,9 +45,6 @@ func NewBesuEth1(networks []string, chainConfig *config.EthereumChainConfig, opt`
`46`	`45`	`g.EnvComponent.ContainerName = fmt.Sprintf("%s-%s-%s", "besu-eth1", strings.Replace(g.ContainerVersion, ".", "_", -1), uuid.NewString()[0:8])`
`47`	`46`	`}`
`48`	`47`
`49`		`- // if the internal docker repo is set then add it to the version`
`50`		`- g.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(g.EnvComponent.ContainerImage)`
`51`		`-`
`52`	`48`	`return g, nil`
`53`	`49`	`}`
`54`	`50`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ import (`
`18`	`18`	`config_types "github.com/smartcontractkit/chainlink-testing-framework/lib/config/types"`
`19`	`19`	`"github.com/smartcontractkit/chainlink-testing-framework/lib/docker/ethereum"`
`20`	`20`	`"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"`
`21`		`- "github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"`
`22`	`21`	`"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/templates"`
`23`	`22`	`)`
`24`	`23`
`@@ -46,8 +45,6 @@ func NewErigonEth1(networks []string, chainConfig *config.EthereumChainConfig, o`
`46`	`45`	`// set the container name again after applying functional options as version might have changed`
`47`	`46`	`g.EnvComponent.ContainerName = fmt.Sprintf("%s-%s-%s", "erigon-eth1", strings.Replace(g.ContainerVersion, ".", "_", -1), uuid.NewString()[0:8])`
`48`	`47`	`}`
`49`		`- // if the internal docker repo is set then add it to the version`
`50`		`- g.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(g.EnvComponent.ContainerImage)`
`51`	`48`	`return g, nil`
`52`	`49`	`}`
`53`	`50`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ import (`
`19`	`19`	`"github.com/smartcontractkit/chainlink-testing-framework/lib/docker"`
`20`	`20`	`"github.com/smartcontractkit/chainlink-testing-framework/lib/docker/ethereum"`
`21`	`21`	`"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"`
`22`		`- "github.com/smartcontractkit/chainlink-testing-framework/lib/mirror"`
`23`	`22`	`)`
`24`	`23`
`25`	`24`	`var generatorForkToImageMap = map[ethereum.Fork]string{`
`@@ -69,8 +68,6 @@ func NewEthGenesisGenerator(chainConfig config.EthereumChainConfig, generatedDat`
`69`	`68`	`for _, opt := range opts {`
`70`	`69`	`opt(&g.EnvComponent)`
`71`	`70`	`}`
`72`		`- // if the internal docker repo is set then add it to the version`
`73`		`- g.EnvComponent.ContainerImage = mirror.AddMirrorToImageIfSet(g.EnvComponent.ContainerImage)`
`74`	`71`	`return g, nil`
`75`	`72`	`}`
`76`	`73`