feat(kanikoExecute): add dockerfilePath param to multipleImages (#4569)

* add containerDockerfilePath param to multipleImages * rename ContainerDockerfilePath param to DockerfilePath * Fix trailing spaces --------- Co-authored-by: Egor Balakin <[email protected]> Co-authored-by: Vyacheslav Starostin <[email protected]>
SAP · Sep 28, 2023 · 4dec3c3 · 4dec3c3
1 parent b34ea9e
commit 4dec3c3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/cmd/kanikoExecute.go b/cmd/kanikoExecute.go
@@ -226,7 +226,13 @@ func runKanikoExecute(config *kanikoExecuteOptions, telemetryData *telemetry.Cus
 					"--context-sub-path", entry.ContextSubPath,
 					"--destination", fmt.Sprintf("%v/%v", containerRegistry, containerImageNameAndTag),
 				)
-				if err = runKaniko(config.DockerfilePath, buildOptions, config.ReadImageDigest, execRunner, fileUtils, commonPipelineEnvironment); err != nil {
+
+				dockerfilePath := config.DockerfilePath
+				if entry.DockerfilePath != "" {
+					dockerfilePath = entry.DockerfilePath
+				}
+
+				if err = runKaniko(dockerfilePath, buildOptions, config.ReadImageDigest, execRunner, fileUtils, commonPipelineEnvironment); err != nil {
 					return fmt.Errorf("multipleImages: failed to build image '%v' using '%v': %w", entry.ContainerImageName, config.DockerfilePath, err)
 				}
 
@@ -251,7 +257,13 @@ func runKanikoExecute(config *kanikoExecuteOptions, telemetryData *telemetry.Cus
 					"--context-sub-path", entry.ContextSubPath,
 					"--destination", entry.ContainerImage,
 				)
-				if err = runKaniko(config.DockerfilePath, buildOptions, config.ReadImageDigest, execRunner, fileUtils, commonPipelineEnvironment); err != nil {
+
+				dockerfilePath := config.DockerfilePath
+				if entry.DockerfilePath != "" {
+					dockerfilePath = entry.DockerfilePath
+				}
+
+				if err = runKaniko(dockerfilePath, buildOptions, config.ReadImageDigest, execRunner, fileUtils, commonPipelineEnvironment); err != nil {
 					return fmt.Errorf("multipleImages: failed to build image '%v' using '%v': %w", containerImageName, config.DockerfilePath, err)
 				}
 
@@ -405,6 +417,7 @@ func runKaniko(dockerFilepath string, buildOptions []string, readDigest bool, ex
 
 type multipleImageConf struct {
 	ContextSubPath     string `json:"contextSubPath,omitempty"`
+	DockerfilePath     string `json:"dockerfilePath,omitempty"`
 	ContainerImageName string `json:"containerImageName,omitempty"`
 	ContainerImageTag  string `json:"containerImageTag,omitempty"`
 	ContainerImage     string `json:"containerImage,omitempty"`

diff --git a/resources/metadata/kanikoExecute.yaml b/resources/metadata/kanikoExecute.yaml
@@ -158,6 +158,7 @@ spec:
 
           Array keys:
             contextSubPath - Set a context subpath.
+            dockerfilePath - Dockerfile path (optional). If empty, root will be used.
             containerImageName - Name of the container which will be built.
             containerImageTag - Tag of the container which will be built. If empty - root containerImageTag will be used.
             containerImage - Defines the full name of the Docker image to be created including registry.