1
0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-09-16 09:26:22 +02:00

fix: handle dockerImage from custom workflow inputs (#5460)

This commit is contained in:
maxcask
2025-08-27 10:38:10 +03:00
committed by GitHub
parent 81de448550
commit 88d899fe18

View File

@@ -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