simplify docker build logic

Author: skudasov

framework/README.md

@@ -28,5 +28,4 @@ This module includes the CTFv2 harness, a lightweight, modular, and data-driven
 |           LOKI_URL           |                                            URL to `Loki` push api, should be like`${host}/loki/api/v1/push`                                            |                      URL |    -    | If you use `Loki` then ✅ |
 |        LOKI_TENANT_ID        |                                                Streams all components logs to `Loki`, see params below                                                 |          `true`, `false` |    -    | If you use `Loki` then ✅ |
 | TESTCONTAINERS_RYUK_DISABLED |                                   Testcontainers-Go reaper container, removes all the containers after the test exit                                   |          `true`, `false` | `false` |            🚫            |
-|   CTF_BUILD_DOCKER_IMAGES    |                                              Rebuild and publish local docker images if there are changes                                              |          `true`, `false` | `false` |            🚫            |
 |         RESTY_DEBUG          |                                                            Log all Resty client HTTP calls                                                             |          `true`, `false` | `false` |            🚫            |

framework/clclient/client.go

@@ -57,8 +57,8 @@ func NewChainlinkClient(c *Config) (*ChainlinkClient, error) {
 	}, nil
 }
 
-// NewCLCDefaultlients connects all the clients using clnode.Output and default login/password
-func NewCLCDefaultlients(outs []*clnode.Output, l zerolog.Logger) ([]*ChainlinkClient, error) {
+// NewCLDefaultClients connects all the clients using clnode.Output and default login/password
+func NewCLDefaultClients(outs []*clnode.Output, l zerolog.Logger) ([]*ChainlinkClient, error) {
 	clients := make([]*ChainlinkClient, 0)
 	for _, out := range outs {
 		c, err := NewChainlinkClient(&Config{

framework/components/clnode/clnode.go

@@ -3,6 +3,7 @@ package clnode
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"github.com/docker/go-connections/nat"
 	"github.com/smartcontractkit/chainlink-testing-framework/framework"
@@ -217,12 +218,14 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
 		})
 	}
 	req.Files = append(req.Files, files...)
-	localImg, err := framework.RebuildDockerImage(once, in.Node.DockerFilePath, in.Node.DockerContext, in.Node.DockerImageName)
-	if err != nil {
-		return nil, err
-	}
-	if localImg != "" {
-		req.Image = localImg
+	if req.Image != "" && (in.Node.DockerFilePath != "" || in.Node.DockerContext != "" || in.Node.DockerImageName != "") {
+		return nil, errors.New("you provided both 'image' and one of 'docker_file', 'docker_ctx', 'docker_image_name' fields. Please provide either 'image' or params to build a local one")
+	}
+	if req.Image == "" {
+		req.Image, err = framework.RebuildDockerImage(once, in.Node.DockerFilePath, in.Node.DockerContext, in.Node.DockerImageName)
+		if err != nil {
+			return nil, err
+		}
 	}
 	c, err := tc.GenericContainer(ctx, tc.GenericContainerRequest{
 		ContainerRequest: req,

framework/config.go

@@ -29,7 +29,6 @@ const (
 	EnvVarTestConfigs       = "CTF_CONFIGS"
 	EnvVarLokiStream        = "CTF_LOKI_STREAM"
 	EnvVarAWSSecretsManager = "CTF_AWS_SECRETS_MANAGER"
-	EnvVarDockerImagesBuild = "CTF_BUILD_DOCKER_IMAGES"
 	// EnvVarCI this is a default env variable many CI runners use so code can detect we run in CI
 	EnvVarCI = "CI"
 )

framework/docker.go

@@ -51,6 +51,11 @@ func DefaultTCName(name string) string {
 func BuildAndPublishLocalDockerImage(once *sync.Once, dockerfile string, buildContext string, imageName string) error {
 	var retErr error
 	once.Do(func() {
+		L.Info().
+			Str("Dockerfile", dockerfile).
+			Str("Ctx", buildContext).
+			Str("ImageName", imageName).
+			Msg("Building local docker file")
 		registryRunning := isContainerRunning("local-registry")
 		if registryRunning {
 			fmt.Println("Local registry container is already running.")
@@ -64,7 +69,6 @@ func BuildAndPublishLocalDockerImage(once *sync.Once, dockerfile string, buildCo
 		}
 
 		img := fmt.Sprintf("localhost:5050/%s:latest", imageName)
-		L.Info().Str("DockerFile", dockerfile).Str("Context", buildContext).Msg("Building Docker image")
 		err := runCommand("docker", "build", "-t", fmt.Sprintf("localhost:5050/%s:latest", imageName), "-f", dockerfile, buildContext)
 		if err != nil {
 			retErr = fmt.Errorf("failed to build Docker image: %w", err)
@@ -102,7 +106,7 @@ func runCommand(name string, args ...string) error {
 
 // RebuildDockerImage rebuilds docker image if necessary
 func RebuildDockerImage(once *sync.Once, dockerfile string, buildContext string, imageName string) (string, error) {
-	if os.Getenv(EnvVarDockerImagesBuild) == "true" {
+	if dockerfile != "" || buildContext != "" || imageName != "" {
 		if dockerfile == "" {
 			return "", errors.New("docker_file path must be provided")
 		}