jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-12-03 23:10:20 +02:00
Code Issues Releases Activity

Add Changes for value of docker image (#3303)

Browse Source 
* Add Changes for value of docker image

* Get docker image value

* Fix

* Fix unit

* Add chnages for kaniko and mta builds

* Fix

* Test changes

* Test

* Move func ResolveMetadata to stepmeta.go

* Fix

* Change getConfig.go

* Fix getting docker value for mta, npm and kaniko

* Fix according to suggestions

* Add func to get only value of docker image

* Test empty value of docker image

* Fix for getDockerImageValue

Co-authored-by: Oliver Nocon <33484802+OliverNocon@users.noreply.github.com>
This commit is contained in:
kingvvgo
2021-12-01 07:46:18 +01:00
committed by GitHub
parent 347ae68ea9
commit b29a2f2264
14 changed files with 159 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/npmExecuteScripts.go
View File

@@ -47,18 +47,25 @@ func runNpmExecuteScripts(npmExecutor npm.Executor, config *npmExecuteScriptsOpt
return err
}
log.Entry().Infof("creating build settings information...")
log.Entry().Debugf("creating build settings information...")
stepName := "npmExecuteScripts"
dockerImage, err := getDockerImageValue(stepName)
if err != nil {
return err
}
npmConfig := buildsettings.BuildOptions{
Publish: config.Publish,
CreateBOM: config.CreateBOM,
DefaultNpmRegistry: config.DefaultNpmRegistry,
BuildSettingsInfo: config.BuildSettingsInfo,
DockerImage: dockerImage,
}
builSettings, err := buildsettings.CreateBuildSettingsInfo(&npmConfig, "npmExecuteScripts")
buildSettingsInfo, err := buildsettings.CreateBuildSettingsInfo(&npmConfig, stepName)
if err != nil {
log.Entry().Warnf("failed to create build settings info : ''%v", err)
log.Entry().Warnf("failed to create build settings info: %v", err)
}
commonPipelineEnvironment.custom.buildSettingsInfo = builSettings
commonPipelineEnvironment.custom.buildSettingsInfo = buildSettingsInfo
if config.Publish {
packageJSONFiles, err := npmExecutor.FindPackageJSONFilesWithExcludes(config.BuildDescriptorExcludeList)