build image with default name

Author: skudasov

framework/cmd/main.go

@@ -229,7 +229,7 @@ func observabilityUp() error {
 	fmt.Println()
 	framework.L.Info().Msgf("Loki: %s", LocalLogsURL)
 	framework.L.Info().Msgf("All logs: %s", "{job=\"ctf\"}")
-	framework.L.Info().Msgf("By log level: %s", "{job=\"ctf\", container=~\"clnode-.*\"} |= \"WARN|INFO|DEBUG\"")
+	framework.L.Info().Msgf("By log level: %s", "{job=\"ctf\", container=~\"node.*\"} |= \"WARN|INFO|DEBUG\"")
 	framework.L.Info().Msgf("Pyroscope: %s", LocalPyroScopeURL)
 	return nil
 }

framework/components/clnode/clnode.go

@@ -152,7 +152,7 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
 
 	req := tc.ContainerRequest{
 		AlwaysPullImage: in.Node.PullImage,
-		Image:           fmt.Sprintf("%s", in.Node.Image),
+		Image:           in.Node.Image,
 		Name:            containerName,
 		Labels:          framework.DefaultTCLabels(),
 		Networks:        []string{framework.DefaultNetworkName},
@@ -218,14 +218,15 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
 		})
 	}
 	req.Files = append(req.Files, files...)
-	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 != "" && (in.Node.DockerFilePath != "" || in.Node.DockerContext != "") {
+		return nil, errors.New("you provided both 'image' and one of 'docker_file', 'docker_ctx' 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
 		}
+		req.KeepImage = false
 	}
 	c, err := tc.GenericContainer(ctx, tc.GenericContainerRequest{
 		ContainerRequest: req,

framework/docker.go

@@ -106,20 +106,17 @@ 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 dockerfile != "" || buildContext != "" || imageName != "" {
-		if dockerfile == "" {
-			return "", errors.New("docker_file path must be provided")
-		}
-		if buildContext == "" {
-			return "", errors.New("docker_ctx path must be provided")
-		}
-		if imageName == "" {
-			return "", errors.New("docker_image_name must be provided")
-		}
-		if err := BuildAndPublishLocalDockerImage(once, dockerfile, buildContext, imageName); err != nil {
-			return "", err
-		}
-		return fmt.Sprintf("localhost:5050/%s:latest", imageName), nil
+	if dockerfile == "" {
+		return "", errors.New("docker_file path must be provided")
+	}
+	if buildContext == "" {
+		return "", errors.New("docker_ctx path must be provided")
+	}
+	if imageName == "" {
+		imageName = "ctftmp"
+	}
+	if err := BuildAndPublishLocalDockerImage(once, dockerfile, buildContext, imageName); err != nil {
+		return "", err
 	}
-	return "", nil
+	return fmt.Sprintf("localhost:5050/%s:latest", imageName), nil
 }