Skip to content

Commit 2caf407

Browse files
build-args fix (#5117)
1 parent 157de54 commit 2caf407

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

pkg/pipeline/types/CiCdConfig.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ type CiCdConfig struct {
6464
NatsServerHost string `env:"NATS_SERVER_HOST" envDefault:"nats://devtron-nats.devtroncd:4222"`
6565
ImageScanMaxRetries int `env:"IMAGE_SCAN_MAX_RETRIES" envDefault:"3"`
6666
ImageScanRetryDelay int `env:"IMAGE_SCAN_RETRY_DELAY" envDefault:"5"`
67+
ShowDockerBuildCmdInLogs bool `env:"SHOW_DOCKER_BUILD_ARGS" envDefault:"true"`
6768
// from CdConfig
6869
CdLimitCpu string `env:"CD_LIMIT_CI_CPU" envDefault:"0.5"`
6970
CdLimitMem string `env:"CD_LIMIT_CI_MEM" envDefault:"3G"`

pkg/pipeline/types/Workflow.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,8 @@ func (workflowRequest *WorkflowRequest) getContainerEnvVariables(config *CiCdCon
248248
containerEnvVariables = []v1.EnvVar{{Name: bean.IMAGE_SCANNER_ENDPOINT, Value: config.ImageScannerEndpoint}, {Name: "NATS_SERVER_HOST", Value: config.NatsServerHost}}
249249
eventEnv := v1.EnvVar{Name: "CI_CD_EVENT", Value: string(workflowJson)}
250250
inAppLoggingEnv := v1.EnvVar{Name: "IN_APP_LOGGING", Value: strconv.FormatBool(workflowRequest.InAppLoggingEnabled)}
251-
containerEnvVariables = append(containerEnvVariables, eventEnv, inAppLoggingEnv)
251+
showDockerBuildArgsEnv := v1.EnvVar{Name: "SHOW_DOCKER_BUILD_ARGS", Value: strconv.FormatBool(config.ShowDockerBuildCmdInLogs)}
252+
containerEnvVariables = append(containerEnvVariables, eventEnv, inAppLoggingEnv, showDockerBuildArgsEnv)
252253
return containerEnvVariables
253254
}
254255

0 commit comments

Comments
 (0)