From e65d35c51d27c1bf0122b174b9b1cb5f5ffc3130 Mon Sep 17 00:00:00 2001 From: Bhupesh Varshney Date: Fri, 21 Aug 2026 13:46:49 +0530 Subject: [PATCH 1/2] feat: add support for extra build flags set --- ci-runner/helper/DockerHelper.go | 6 ++++++ ci-runner/helper/EventHelper.go | 3 +++ 2 files changed, 9 insertions(+) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index a62f34982..3e4e84081 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -489,10 +489,16 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest) (s dockerBuild = dockerBuildxBuild + " " } } + // if len(dockerBuildConfig.ExtraBuildFlags) > 0 && !useBuildx { + // return "", fmt.Errorf("extra build flags require buildx (UseBuildx=true); the classic docker build backend does not support them") + // } dockerBuildFlags := getDockerBuildFlagsMap(dockerBuildConfig) for key, value := range dockerBuildFlags { dockerBuild = dockerBuild + " " + key + value } + for _, flag := range dockerBuildConfig.ExtraBuildFlags { + dockerBuild = dockerBuild + " " + flag + } if !ciRequest.EnableBuildContext || dockerBuildConfig.BuildContext == "" { dockerBuildConfig.BuildContext = ROOT_PATH } diff --git a/ci-runner/helper/EventHelper.go b/ci-runner/helper/EventHelper.go index 66e0902c1..f4d7d5d30 100644 --- a/ci-runner/helper/EventHelper.go +++ b/ci-runner/helper/EventHelper.go @@ -74,6 +74,9 @@ type DockerBuildConfig struct { BuildxProvenanceMode string `json:"buildxProvenanceMode"` BuildxK8sDriverOptions []map[string]string `json:"buildxK8SDriverOptions"` + // ExtraBuildFlags is an opaque list of already-formatted docker build flags + ExtraBuildFlags []string `json:"extraBuildFlags,omitempty"` + //ent only BuildxDriverImage string `json:"buildxDriverImage"` } From a09bbd69cbcb6ed225f6cf1c671168a7832ed632 Mon Sep 17 00:00:00 2001 From: Bhupesh Varshney Date: Wed, 26 Aug 2026 11:37:35 +0530 Subject: [PATCH 2/2] fix: remove redundant code --- ci-runner/helper/DockerHelper.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 3e4e84081..3062714e0 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -489,9 +489,6 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest) (s dockerBuild = dockerBuildxBuild + " " } } - // if len(dockerBuildConfig.ExtraBuildFlags) > 0 && !useBuildx { - // return "", fmt.Errorf("extra build flags require buildx (UseBuildx=true); the classic docker build backend does not support them") - // } dockerBuildFlags := getDockerBuildFlagsMap(dockerBuildConfig) for key, value := range dockerBuildFlags { dockerBuild = dockerBuild + " " + key + value