Skip to content

Commit 3e12a7c

Browse files
committed
pass proxy config as build args - same as docker/buildx#959
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent 0c19799 commit 3e12a7c

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

pkg/compose/build.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"github.com/containerd/containerd/platforms"
2626
"github.com/docker/buildx/build"
2727
_ "github.com/docker/buildx/driver/docker" // required to get default driver registered
28+
"github.com/docker/buildx/store/storeutil"
2829
"github.com/docker/buildx/util/buildflags"
2930
xprogress "github.com/docker/buildx/util/progress"
3031
"github.com/docker/docker/builder/remotecontext/urlutil"
@@ -224,6 +225,12 @@ func (s *composeService) toBuildOptions(project *types.Project, service types.Se
224225

225226
buildArgs := flatten(service.Build.Args.Resolve(envResolver(project.Environment)))
226227

228+
for k, v := range storeutil.GetProxyConfig(s.dockerCli) {
229+
if _, ok := buildArgs[k]; !ok {
230+
buildArgs[k] = v
231+
}
232+
}
233+
227234
plats, err := addPlatforms(project, service)
228235
if err != nil {
229236
return build.Options{}, err

0 commit comments

Comments
 (0)