From 88d899fe18f252a7e056c0279ba7a38fab6f4928 Mon Sep 17 00:00:00 2001
From: maxcask <bondarcask@gmail.com>
Date: Wed, 27 Aug 2025 10:38:10 +0300
Subject: [PATCH] fix: handle dockerImage from custom workflow inputs (#5460)

---
 pkg/buildsettings/buildSettings.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/buildsettings/buildSettings.go b/pkg/buildsettings/buildSettings.go
index 35f19ad8b..57ecb1bc0 100644
--- a/pkg/buildsettings/buildSettings.go
+++ b/pkg/buildsettings/buildSettings.go
@@ -2,6 +2,7 @@ package buildsettings
 
 import (
 	"encoding/json"
+	"os"
 	"reflect"
 
 	"github.com/SAP/jenkins-library/pkg/log"
@@ -32,6 +33,13 @@ type BuildOptions struct {
 }
 
 func CreateBuildSettingsInfo(config *BuildOptions, buildTool string) (string, error) {
+	// to have docker image from action inputs or env variable
+	dockerImage := config.DockerImage
+	if envDockerImage := os.Getenv("PIPER_dockerImage"); envDockerImage != "" {
+		log.Entry().Debugf("Overriding DockerImage from env PIPER_dockerImage: '%v'", envDockerImage)
+		dockerImage = envDockerImage
+	}
+
 	currentBuildSettingsInfo := BuildOptions{
 		CreateBOM:                   config.CreateBOM,
 		GlobalSettingsFile:          config.GlobalSettingsFile,
@@ -39,7 +47,7 @@ func CreateBuildSettingsInfo(config *BuildOptions, buildTool string) (string, er
 		Profiles:                    config.Profiles,
 		Publish:                     config.Publish,
 		DefaultNpmRegistry:          config.DefaultNpmRegistry,
-		DockerImage:                 config.DockerImage,
+		DockerImage:                 dockerImage,
 	}
 	var jsonMap map[string][]interface{}
 	var jsonResult []byte